virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

correctly patch syncword for samples rates < 16000, decoder now fully support all iso ref files

Browse Source 
Originally committed as revision 12992 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-04-26 14:18:29 +00:00
parent f0f53c83ba
commit 9f95bfe2b9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/mpegaudiodec.c
View File

@ -62,6 +62,7 @@
typedef struct MP3On4DecodeContext { typedef struct MP3On4DecodeContext {
int frames; ///< number of mp3 frames per block (number of mp3 decoder instances) int frames; ///< number of mp3 frames per block (number of mp3 decoder instances)
int chan_cfg; ///< channel config number int chan_cfg; ///< channel config number
int syncword; ///< syncword patch
MPADecodeContext *mp3decctx[5]; ///< MPADecodeContext for every decoder instance MPADecodeContext *mp3decctx[5]; ///< MPADecodeContext for every decoder instance
} MP3On4DecodeContext; } MP3On4DecodeContext;
@ -2513,6 +2514,11 @@ static int decode_init_mp3on4(AVCodecContext * avctx)
s->frames = mp3Frames[s->chan_cfg]; s->frames = mp3Frames[s->chan_cfg];
avctx->channels = ff_mpeg4audio_channels[s->chan_cfg]; avctx->channels = ff_mpeg4audio_channels[s->chan_cfg];
if (cfg.sample_rate < 16000)
s->syncword = 0xffe00000;
else
s->syncword = 0xfff00000;
/* Init the first mp3 decoder in standard way, so that all tables get builded /* Init the first mp3 decoder in standard way, so that all tables get builded
* We replace avctx->priv_data with the context of the first decoder so that * We replace avctx->priv_data with the context of the first decoder so that
* decode_init() does not have to be changed. * decode_init() does not have to be changed.
@ -2586,8 +2592,7 @@ static int decode_frame_mp3on4(AVCodecContext * avctx,
m = s->mp3decctx[fr]; m = s->mp3decctx[fr];
assert (m != NULL); assert (m != NULL);
// Get header header = (AV_RB32(buf) & 0x000fffff) | s->syncword; // patch header
header = AV_RB32(buf) | 0xfff00000;
if (ff_mpa_check_header(header) < 0) { // Bad header, discard block if (ff_mpa_check_header(header) < 0) { // Bad header, discard block
*data_size = 0; *data_size = 0;