mirror of https://git.ffmpeg.org/ffmpeg.git
set default mix levels regardless of bitstream id
Originally committed as revision 13693 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
4921bbbae5
commit
30cc3ac20e
|
@ -63,6 +63,10 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
|
||||||
|
|
||||||
hdr->num_blocks = 6;
|
hdr->num_blocks = 6;
|
||||||
|
|
||||||
|
/* set default mix levels */
|
||||||
|
hdr->center_mix_level = 3; // -4.5dB
|
||||||
|
hdr->surround_mix_level = 4; // -6.0dB
|
||||||
|
|
||||||
if(hdr->bitstream_id <= 10) {
|
if(hdr->bitstream_id <= 10) {
|
||||||
/* Normal AC-3 */
|
/* Normal AC-3 */
|
||||||
hdr->crc1 = get_bits(gbc, 16);
|
hdr->crc1 = get_bits(gbc, 16);
|
||||||
|
@ -79,10 +83,6 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr)
|
||||||
skip_bits(gbc, 3); // skip bitstream mode
|
skip_bits(gbc, 3); // skip bitstream mode
|
||||||
hdr->channel_mode = get_bits(gbc, 3);
|
hdr->channel_mode = get_bits(gbc, 3);
|
||||||
|
|
||||||
/* set default mix levels */
|
|
||||||
hdr->center_mix_level = 3; // -4.5dB
|
|
||||||
hdr->surround_mix_level = 4; // -6.0dB
|
|
||||||
|
|
||||||
if(hdr->channel_mode == AC3_CHMODE_STEREO) {
|
if(hdr->channel_mode == AC3_CHMODE_STEREO) {
|
||||||
skip_bits(gbc, 2); // skip dsurmod
|
skip_bits(gbc, 2); // skip dsurmod
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue