[vlc-commits] demux: mp4: uncompressed samples
Francois Cartegnie
git at videolan.org
Tue Apr 28 15:28:55 CEST 2020
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Apr 28 13:04:42 2020 +0200| [4041919d0073d50ed8f4c08d1a42e28c581300b7] | committer: Francois Cartegnie
demux: mp4: uncompressed samples
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4041919d0073d50ed8f4c08d1a42e28c581300b7
---
modules/demux/mp4/mp4.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 8e6a59d4d3..47563f4076 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -3822,7 +3822,7 @@ static uint32_t MP4_TrackGetReadSize( mp4_track_t *p_track, uint32_t *pi_nb_samp
if( i_max_v0_samples > i_chunk_remaining_samples )
i_max_v0_samples = i_chunk_remaining_samples;
- if( i_samples_per_frame && i_bytes_per_frame )
+ if( i_samples_per_frame && i_bytes_per_frame && p_track->i_sample_size != 16 )
{
/* GSM, ADPCM, */
if( i_samples_per_frame > 64 &&
@@ -3895,7 +3895,7 @@ static uint64_t MP4_TrackGetPos( mp4_track_t *p_track )
MP4_Box_data_sample_soun_t *p_soun =
p_track->p_sample->data.p_sample_soun;
- if( p_soun->i_compressionid != 0xFFFE )
+ if( p_soun->i_compressionid != 0xFFFE && p_track->i_sample_size != 16 )
{
uint32_t i_bytes_per_frame;
uint32_t i_samples_per_frame = MP4_GetAudioFrameInfo( p_track, p_soun, &i_bytes_per_frame );
More information about the vlc-commits
mailing list