diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-12-21 23:50:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-12-21 23:50:16 +0000 |
| commit | c96bd21227e594856f8fd0610fd213b002056383 (patch) | |
| tree | ab1101185b5e2e6c76c3124296dd34c2a9bf1284 /libavcodec | |
| parent | af4c0bcb6ed6f3d679dddfe9c4fd4f73f84fcabc (diff) | |
| download | ffmpeg-c96bd21227e594856f8fd0610fd213b002056383.tar.gz | |
Change mpeg audio parser so it only sets frame_size, channels and bit_rate
after it has a few valid frames.
Fixes issue762
Originally committed as revision 16259 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegaudio.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegaudio_parser.c | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h index 21de2da20d..33af18dc1a 100644 --- a/libavcodec/mpegaudio.h +++ b/libavcodec/mpegaudio.h @@ -128,7 +128,7 @@ typedef struct HuffTable { } HuffTable; int ff_mpa_l2_select_table(int bitrate, int nb_channels, int freq, int lsf); -int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate); +int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bitrate); void ff_mpa_synth_init(MPA_INT *window); void ff_mpa_synth_filter(MPA_INT *synth_buf_ptr, int *synth_buf_offset, MPA_INT *window, int *dither_state, diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index e7cb7439e5..e4b17b01e6 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -44,7 +44,7 @@ typedef struct MpegAudioParseContext { /* useful helper to get mpeg audio stream infos. Return -1 if error in header, otherwise the coded frame size in bytes */ -int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate) +int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate, int *channels, int *frame_size, int *bit_rate) { MPADecodeContext s1, *s = &s1; s1.avctx = avctx; @@ -58,23 +58,23 @@ int ff_mpa_decode_header(AVCodecContext *avctx, uint32_t head, int *sample_rate) switch(s->layer) { case 1: - avctx->frame_size = 384; + *frame_size = 384; break; case 2: - avctx->frame_size = 1152; + *frame_size = 1152; break; default: case 3: if (s->lsf) - avctx->frame_size = 576; + *frame_size = 576; else - avctx->frame_size = 1152; + *frame_size = 1152; break; } *sample_rate = s->sample_rate; - avctx->channels = s->nb_channels; - avctx->bit_rate = s->bit_rate; + *channels = s->nb_channels; + *bit_rate = s->bit_rate; avctx->sub_id = s->layer; return s->frame_size; } @@ -92,7 +92,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, const uint8_t *buf, int buf_size) { MpegAudioParseContext *s = s1->priv_data; - int len, ret, sr; + int len, ret, sr, channels, bit_rate, frame_size; uint32_t header; const uint8_t *buf_ptr; @@ -123,7 +123,7 @@ static int mpegaudio_parse(AVCodecParserContext *s1, got_header: header = AV_RB32(s->inbuf); - ret = ff_mpa_decode_header(avctx, header, &sr); + ret = ff_mpa_decode_header(avctx, header, &sr, &channels, &frame_size, &bit_rate); if (ret < 0) { s->header_count= -2; /* no sync found : move by one byte (inefficient, but simple!) */ @@ -146,8 +146,12 @@ static int mpegaudio_parse(AVCodecParserContext *s1, s->frame_size = -1; } #endif - if(s->header_count > 1) + if(s->header_count > 1){ avctx->sample_rate= sr; + avctx->channels = channels; + avctx->frame_size = frame_size; + avctx->bit_rate = bit_rate; + } } } } else |