generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc/aac_ac3_parser: reindent

Browse Source
This commit is contained in:
Rodger Combs 2015-11-25 14:53:06 -06:00
parent 9f5baf9085
commit f0ea536c47
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
libavcodec/aac_ac3_parser.c
View File

@ -79,31 +79,32 @@ get_next:
avctx->codec_id = s->codec_id; avctx->codec_id = s->codec_id;
if (got_frame) { if (got_frame) {
/* Due to backwards compatible HE-AAC the sample rate, channel count, /* Due to backwards compatible HE-AAC the sample rate, channel count,
and total number of samples found in an AAC ADTS header are not and total number of samples found in an AAC ADTS header are not
reliable. Bit rate is still accurate because the total frame duration in reliable. Bit rate is still accurate because the total frame
seconds is still correct (as is the number of bits in the frame). */ duration in seconds is still correct (as is the number of bits in
if (avctx->codec_id != AV_CODEC_ID_AAC) { the frame). */
avctx->sample_rate = s->sample_rate; if (avctx->codec_id != AV_CODEC_ID_AAC) {
avctx->sample_rate = s->sample_rate;
/* (E-)AC-3: allow downmixing to stereo or mono */ /* (E-)AC-3: allow downmixing to stereo or mono */
if (s->channels > 1 && if (s->channels > 1 &&
avctx->request_channel_layout == AV_CH_LAYOUT_MONO) { avctx->request_channel_layout == AV_CH_LAYOUT_MONO) {
avctx->channels = 1; avctx->channels = 1;
avctx->channel_layout = AV_CH_LAYOUT_MONO; avctx->channel_layout = AV_CH_LAYOUT_MONO;
} else if (s->channels > 2 && } else if (s->channels > 2 &&
avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) { avctx->request_channel_layout == AV_CH_LAYOUT_STEREO) {
avctx->channels = 2; avctx->channels = 2;
avctx->channel_layout = AV_CH_LAYOUT_STEREO; avctx->channel_layout = AV_CH_LAYOUT_STEREO;
} else { } else {
avctx->channels = s->channels; avctx->channels = s->channels;
avctx->channel_layout = s->channel_layout; avctx->channel_layout = s->channel_layout;
}
s1->duration = s->samples;
avctx->audio_service_type = s->service_type;
} }
s1->duration = s->samples;
avctx->audio_service_type = s->service_type;
}
avctx->bit_rate = s->bit_rate; avctx->bit_rate = s->bit_rate;
} }
return i; return i;