Skip to content

V
vlc-1.1
Commit feaa552c authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/demux/mp4/libmp4.c: no channelcount for AMR audio (3gpp AMRSpecificBox).

parent 02aeea03
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 1 deletion
modules/demux/mp4/libmp4.c
View file @ feaa552c
...@@ -1141,11 +1141,17 @@ static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -1141,11 +1141,17 @@ static int MP4_ReadBox_sample_soun( stream_t *p_stream, MP4_Box_t *p_box )
} }
} }
if( p_box->i_type == FOURCC_samr || p_box->i_type == FOURCC_sawb )
{
/* Ignore channelcount for AMR (3gpp AMRSpecificBox) */
p_box->data.p_sample_soun->i_channelcount = 1;
}
MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds */ MP4_ReadBoxContainerRaw( p_stream, p_box ); /* esds */
#ifdef MP4_VERBOSE #ifdef MP4_VERBOSE
msg_Dbg( p_stream, "read box: \"soun\" in stsd channel %d " msg_Dbg( p_stream, "read box: \"soun\" in stsd channel %d "
"sample size %d sampl rate %f", "sample size %d sample rate %f",
p_box->data.p_sample_soun->i_channelcount, p_box->data.p_sample_soun->i_channelcount,
p_box->data.p_sample_soun->i_samplesize, p_box->data.p_sample_soun->i_samplesize,
(float)p_box->data.p_sample_soun->i_sampleratehi + (float)p_box->data.p_sample_soun->i_sampleratehi +
......
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