With this, if the eac3 dependent frame doesn't have coded downmix values when parsed by ff_eac3_parse_header(), it will inherit the coded ones from the core ac3 frame instead of ignoring them.
Unified · Split
| @@ -345,9 +345,11 @@ static int parse_frame_header(AC3DecodeContext *s) · 344 unmodified lines | |||
| 345 | s->frame_size = hdr.frame_size; | 345 | s->frame_size = hdr.frame_size; |
| 346 | s->superframe_size += hdr.frame_size; | 346 | s->superframe_size += hdr.frame_size; |
| 347 | s->preferred_downmix = AC3_DMIXMOD_NOTINDICATED; | 347 | s->preferred_downmix = AC3_DMIXMOD_NOTINDICATED; |
| 348 | s->center_mix_level = hdr.center_mix_level; | 348 | if (hdr.bitstream_id <= 10) { |
| 349 | s->center_mix_level = hdr.center_mix_level; | ||
| 350 | s->surround_mix_level = hdr.surround_mix_level; | ||
| 351 | } | ||
| 349 | s->center_mix_level_ltrt = 4; // -3.0dB | 352 | s->center_mix_level_ltrt = 4; // -3.0dB |
| 350 | s->surround_mix_level = hdr.surround_mix_level; | ||
| 351 | s->surround_mix_level_ltrt = 4; // -3.0dB | 353 | s->surround_mix_level_ltrt = 4; // -3.0dB |
| 352 | s->lfe_mix_level_exists = 0; | 354 | s->lfe_mix_level_exists = 0; |
| 353 | s->num_blocks = hdr.num_blocks; | 355 | s->num_blocks = hdr.num_blocks; |