Mercurial > libavcodec.hg
comparison mpegaudiodec.c @ 12282:f31ba4ca1397 libavcodec
Show correct bitrate for VBR MP3 files.
Patch by Alexander Kojevnikov, alexander kojevnikov com
| author | cehoyos |
|---|---|
| date | Tue, 27 Jul 2010 10:08:34 +0000 |
| parents | 06c7d6e5eeb6 |
| children |
comparison
equal
deleted
inserted
replaced
| 12281:bf51ca1aafb8 | 12282:f31ba4ca1397 |
|---|---|
| 2052 s->frame_size = -1; | 2052 s->frame_size = -1; |
| 2053 return -1; | 2053 return -1; |
| 2054 } | 2054 } |
| 2055 /* update codec info */ | 2055 /* update codec info */ |
| 2056 avctx->channels = s->nb_channels; | 2056 avctx->channels = s->nb_channels; |
| 2057 avctx->bit_rate = s->bit_rate; | 2057 if (!avctx->bit_rate) |
| 2058 avctx->bit_rate = s->bit_rate; | |
| 2058 avctx->sub_id = s->layer; | 2059 avctx->sub_id = s->layer; |
| 2059 | 2060 |
| 2060 if(*data_size < 1152*avctx->channels*sizeof(OUT_INT)) | 2061 if(*data_size < 1152*avctx->channels*sizeof(OUT_INT)) |
| 2061 return -1; | 2062 return -1; |
| 2062 *data_size = 0; | 2063 *data_size = 0; |
| 2120 | 2121 |
| 2121 ff_mpegaudio_decode_header((MPADecodeHeader *)s, header); | 2122 ff_mpegaudio_decode_header((MPADecodeHeader *)s, header); |
| 2122 /* update codec info */ | 2123 /* update codec info */ |
| 2123 avctx->sample_rate = s->sample_rate; | 2124 avctx->sample_rate = s->sample_rate; |
| 2124 avctx->channels = s->nb_channels; | 2125 avctx->channels = s->nb_channels; |
| 2125 avctx->bit_rate = s->bit_rate; | 2126 if (!avctx->bit_rate) |
| 2127 avctx->bit_rate = s->bit_rate; | |
| 2126 avctx->sub_id = s->layer; | 2128 avctx->sub_id = s->layer; |
| 2127 | 2129 |
| 2128 s->frame_size = len; | 2130 s->frame_size = len; |
| 2129 | 2131 |
| 2130 if (avctx->parse_only) { | 2132 if (avctx->parse_only) { |