Commit c985e796 authored by Gildas Bazin's avatar Gildas Bazin

* modules/demux/mp4/*: bug fix for MP4_TrackNextSample() + added fourcc for amr-wb.

parent 9029e6b6
......@@ -2142,6 +2142,7 @@ static struct
{ FOURCC_MAC6, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
{ FOURCC_Qclp, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
{ FOURCC_samr, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
{ FOURCC_sawb, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
{ FOURCC_OggS, MP4_ReadBox_sample_soun, MP4_FreeBox_sample_soun },
{ FOURCC_vide, MP4_ReadBox_sample_vide, MP4_FreeBox_sample_vide },
......
......@@ -110,6 +110,7 @@
#define FOURCC_ulaw VLC_FOURCC( 'u', 'l', 'a', 'w' )
#define FOURCC_Qclp VLC_FOURCC( 'Q', 'c', 'l', 'p' )
#define FOURCC_samr VLC_FOURCC( 's', 'a', 'm', 'r' )
#define FOURCC_sawb VLC_FOURCC( 's', 'a', 'w', 'b' )
#define FOURCC_OggS VLC_FOURCC( 'O', 'g', 'g', 'S' )
#define FOURCC_zlib VLC_FOURCC( 'z', 'l', 'i', 'b' )
......
......@@ -1986,8 +1986,7 @@ static uint64_t MP4_TrackGetPos( mp4_track_t *p_track )
return( i_pos );
}
static int MP4_TrackNextSample( demux_t *p_demux,
mp4_track_t *p_track )
static int MP4_TrackNextSample( demux_t *p_demux, mp4_track_t *p_track )
{
if( p_track->fmt.i_cat == AUDIO_ES &&
......@@ -1997,7 +1996,11 @@ static int MP4_TrackNextSample( demux_t *p_demux,
p_soun = p_track->p_sample->data.p_sample_soun;
if( p_soun->i_qt_version == 1 )
if( p_track->i_sample_size != 1 )
{
p_track->i_sample += 1;
}
else if( p_soun->i_qt_version == 1 )
{
/* chunk by chunk */
p_track->i_sample =
......
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