Mercurial > libavcodec.hg

comparison aac_ac3_parser.c @ 11357:3b06c3d9e72d libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cosmetics: Re-indent after last commit.
author alexc
date Thu, 04 Mar 2010 02:32:48 +0000
parents 9056fd765255
children
comparison
equal deleted inserted replaced
11356:9056fd765255 11357:3b06c3d9e72d
79 reliable. Bit rate is still accurate because the total frame duration in 79 reliable. Bit rate is still accurate because the total frame duration in
80 seconds is still correct (as is the number of bits in the frame). */ 80 seconds is still correct (as is the number of bits in the frame). */
81 if (avctx->codec_id != CODEC_ID_AAC) { 81 if (avctx->codec_id != CODEC_ID_AAC) {
82 avctx->sample_rate = s->sample_rate; 82 avctx->sample_rate = s->sample_rate;
83 83
84 /* allow downmixing to stereo (or mono for AC-3) */ 84 /* allow downmixing to stereo (or mono for AC-3) */
85 if(avctx->request_channels > 0 && 85 if(avctx->request_channels > 0 &&
86 avctx->request_channels < s->channels && 86 avctx->request_channels < s->channels &&
87 (avctx->request_channels <= 2 || 87 (avctx->request_channels <= 2 ||
88 (avctx->request_channels == 1 && 88 (avctx->request_channels == 1 &&
89 (avctx->codec_id == CODEC_ID_AC3 || 89 (avctx->codec_id == CODEC_ID_AC3 ||
90 avctx->codec_id == CODEC_ID_EAC3)))) { 90 avctx->codec_id == CODEC_ID_EAC3)))) {
91 avctx->channels = avctx->request_channels; 91 avctx->channels = avctx->request_channels;
92 } else { 92 } else {
93 avctx->channels = s->channels; 93 avctx->channels = s->channels;
94 avctx->channel_layout = s->channel_layout; 94 avctx->channel_layout = s->channel_layout;
95 } 95 }
96 avctx->frame_size = s->samples; 96 avctx->frame_size = s->samples;
97 } 97 }
98 98
99 avctx->bit_rate = s->bit_rate; 99 avctx->bit_rate = s->bit_rate;
100 100
101 return i; 101 return i;