[vlc-commits] demux: mp4: only return 1 sample for compressed mpeg

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Oct 12 12:25:46 2016 +0200| [b58ca87ee13d8586e6699a181f0f954e07a93bd2] | committer: Francois Cartegnie

demux: mp4: only return 1 sample for compressed mpeg

avcodec can no longer handle multiple frames in mpegaudio.
esds over stsd v0 (which should be uncompressed)
are fixed frame size mpegaudio (otherwise would need
V1 + codec id -2).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b58ca87ee13d8586e6699a181f0f954e07a93bd2
---

 modules/demux/mp4/mp4.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index a4d797c..e559e42 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3399,6 +3399,11 @@ static uint32_t MP4_TrackGetReadSize( mp4_track_t *p_track, uint32_t *pi_nb_samp
             case VLC_CODEC_AMR_WB:
                 i_max_v0_samples = 16;
                 break;
+            case VLC_CODEC_MPGA:
+            case VLC_CODEC_MP2:
+            case VLC_CODEC_MP3:
+                i_max_v0_samples = 1;
+                break;
             default:
                 /* Read 25ms of samples (uncompressed) */
                 i_max_v0_samples = p_track->fmt.audio.i_rate / 40 *