Skip to content

V
vlc
Commit cdb14e56 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Fixed playing of some twos/sowt samples (close #1621)

parent ff396882
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
modules/demux/mp4/mp4.c
View file @ cdb14e56
...@@ -1392,7 +1392,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -1392,7 +1392,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
p_track->p_sample = p_sample; p_track->p_sample = p_sample;
if( p_track->fmt.i_cat == AUDIO_ES && p_track->i_sample_size == 1 ) if( p_track->fmt.i_cat == AUDIO_ES && ( p_track->i_sample_size == 1 || p_track->i_sample_size == 2 ) )
{ {
MP4_Box_data_sample_soun_t *p_soun; MP4_Box_data_sample_soun_t *p_soun;
...@@ -1427,6 +1427,11 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -1427,6 +1427,11 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
case VLC_FOURCC( 'u', 'l', 'a', 'w' ): case VLC_FOURCC( 'u', 'l', 'a', 'w' ):
p_soun->i_samplesize = 8; p_soun->i_samplesize = 8;
break; break;
case VLC_FOURCC( 't', 'w', 'o', 's' ):
case VLC_FOURCC( 's', 'o', 'w', 't' ):
/* What would be the fun if you could trust the .mov */
p_track->i_sample_size = ((p_soun->i_samplesize+7)/8) * p_soun->i_channelcount;
break;
default: default:
break; break;
} }
...@@ -1438,7 +1443,6 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track, ...@@ -1438,7 +1443,6 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
} }
} }
/* It's a little ugly but .. there are special cases */ /* It's a little ugly but .. there are special cases */
switch( p_sample->i_type ) switch( p_sample->i_type )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment