Mercurial > libavcodec.hg
comparison ac3dec.c @ 6116:4f8fcb40bf2c libavcodec
remove unneeded variables from AC3HeaderInfo
author | jbr |
---|---|
date | Sat, 05 Jan 2008 17:04:57 +0000 |
parents | 5e7585cd5fd3 |
children | 01b1342e717b |
comparison
equal
deleted
inserted
replaced
6115:98be2e14e5d6 | 6116:4f8fcb40bf2c |
---|---|
339 return err; | 339 return err; |
340 | 340 |
341 /* get decoding parameters from header info */ | 341 /* get decoding parameters from header info */ |
342 s->bit_alloc_params.sr_code = hdr.sr_code; | 342 s->bit_alloc_params.sr_code = hdr.sr_code; |
343 s->channel_mode = hdr.channel_mode; | 343 s->channel_mode = hdr.channel_mode; |
344 center_mix_level = gain_levels[center_levels[hdr.center_mix_level]]; | |
345 surround_mix_level = gain_levels[surround_levels[hdr.surround_mix_level]]; | |
346 s->lfe_on = hdr.lfe_on; | 344 s->lfe_on = hdr.lfe_on; |
347 s->bit_alloc_params.sr_shift = hdr.sr_shift; | 345 s->bit_alloc_params.sr_shift = hdr.sr_shift; |
348 s->sample_rate = hdr.sample_rate; | 346 s->sample_rate = hdr.sample_rate; |
349 s->bit_rate = hdr.bit_rate; | 347 s->bit_rate = hdr.bit_rate; |
350 s->channels = hdr.channels; | 348 s->channels = hdr.channels; |
365 skip_bits(gbc, 11); // skip bsid, bsmod, and acmod | 363 skip_bits(gbc, 11); // skip bsid, bsmod, and acmod |
366 if(s->channel_mode == AC3_CHMODE_STEREO) { | 364 if(s->channel_mode == AC3_CHMODE_STEREO) { |
367 skip_bits(gbc, 2); // skip dsurmod | 365 skip_bits(gbc, 2); // skip dsurmod |
368 } else { | 366 } else { |
369 if((s->channel_mode & 1) && s->channel_mode != AC3_CHMODE_MONO) | 367 if((s->channel_mode & 1) && s->channel_mode != AC3_CHMODE_MONO) |
370 skip_bits(gbc, 2); // skip cmixlev | 368 center_mix_level = gain_levels[center_levels[get_bits(gbc, 2)]]; |
371 if(s->channel_mode & 4) | 369 if(s->channel_mode & 4) |
372 skip_bits(gbc, 2); // skip surmixlev | 370 surround_mix_level = gain_levels[surround_levels[get_bits(gbc, 2)]]; |
373 } | 371 } |
374 skip_bits1(gbc); // skip lfeon | 372 skip_bits1(gbc); // skip lfeon |
375 | 373 |
376 /* read the rest of the bsi. read twice for dual mono mode. */ | 374 /* read the rest of the bsi. read twice for dual mono mode. */ |
377 i = !(s->channel_mode); | 375 i = !(s->channel_mode); |