virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-09 14:14:39 +02:00
Code Issues Releases Activity

remove unneeded variables from AC3HeaderInfo

Browse Source 
Originally committed as revision 11419 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-01-05 17:04:57 +00:00
parent 3eca1e6fad
commit 86ad4c7e1b
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/ac3.h
View File

@ -81,13 +81,8 @@ typedef struct {
uint16_t sync_word; uint16_t sync_word;
uint16_t crc1; uint16_t crc1;
uint8_t sr_code; uint8_t sr_code;
uint8_t frame_size_code;
uint8_t bitstream_id; uint8_t bitstream_id;
uint8_t bitstream_mode;
uint8_t channel_mode; uint8_t channel_mode;
uint8_t center_mix_level;
uint8_t surround_mix_level;
uint8_t dolby_surround_mode;
uint8_t lfe_on; uint8_t lfe_on;
/** @} */ /** @} */

17
libavcodec/ac3_parser.c
View File

@ -37,6 +37,7 @@ static const uint8_t eac3_blocks[4] = {
int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr) int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
{ {
GetBitContext gbc; GetBitContext gbc;
int frame_size_code;
memset(hdr, 0, sizeof(*hdr)); memset(hdr, 0, sizeof(*hdr));
@ -56,30 +57,30 @@ int ff_ac3_parse_header(const uint8_t buf[7], AC3HeaderInfo *hdr)
if(hdr->sr_code == 3) if(hdr->sr_code == 3)
return AC3_PARSE_ERROR_SAMPLE_RATE; return AC3_PARSE_ERROR_SAMPLE_RATE;
hdr->frame_size_code = get_bits(&gbc, 6); frame_size_code = get_bits(&gbc, 6);
if(hdr->frame_size_code > 37) if(frame_size_code > 37)
return AC3_PARSE_ERROR_FRAME_SIZE; return AC3_PARSE_ERROR_FRAME_SIZE;
skip_bits(&gbc, 5); // skip bsid, already got it skip_bits(&gbc, 5); // skip bsid, already got it
hdr->bitstream_mode = get_bits(&gbc, 3); skip_bits(&gbc, 3); // skip bitstream mode
hdr->channel_mode = get_bits(&gbc, 3); hdr->channel_mode = get_bits(&gbc, 3);
if((hdr->channel_mode & 1) && hdr->channel_mode != AC3_CHMODE_MONO) { if((hdr->channel_mode & 1) && hdr->channel_mode != AC3_CHMODE_MONO) {
hdr->center_mix_level = get_bits(&gbc, 2); skip_bits(&gbc, 2); // skip center mix level
} }
if(hdr->channel_mode & 4) { if(hdr->channel_mode & 4) {
hdr->surround_mix_level = get_bits(&gbc, 2); skip_bits(&gbc, 2); // skip surround mix level
} }
if(hdr->channel_mode == AC3_CHMODE_STEREO) { if(hdr->channel_mode == AC3_CHMODE_STEREO) {
hdr->dolby_surround_mode = get_bits(&gbc, 2); skip_bits(&gbc, 2); // skip dolby surround mode
} }
hdr->lfe_on = get_bits1(&gbc); hdr->lfe_on = get_bits1(&gbc);
hdr->sr_shift = FFMAX(hdr->bitstream_id, 8) - 8; hdr->sr_shift = FFMAX(hdr->bitstream_id, 8) - 8;
hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code] >> hdr->sr_shift; hdr->sample_rate = ff_ac3_sample_rate_tab[hdr->sr_code] >> hdr->sr_shift;
hdr->bit_rate = (ff_ac3_bitrate_tab[hdr->frame_size_code>>1] * 1000) >> hdr->sr_shift; hdr->bit_rate = (ff_ac3_bitrate_tab[frame_size_code>>1] * 1000) >> hdr->sr_shift;
hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on; hdr->channels = ff_ac3_channels_tab[hdr->channel_mode] + hdr->lfe_on;
hdr->frame_size = ff_ac3_frame_size_tab[hdr->frame_size_code][hdr->sr_code] * 2; hdr->frame_size = ff_ac3_frame_size_tab[frame_size_code][hdr->sr_code] * 2;
return 0; return 0;
} }

6
libavcodec/ac3dec.c
View File

@ -341,8 +341,6 @@ static int ac3_parse_header(AC3DecodeContext *s)
/* get decoding parameters from header info */ /* get decoding parameters from header info */
s->bit_alloc_params.sr_code = hdr.sr_code; s->bit_alloc_params.sr_code = hdr.sr_code;
s->channel_mode = hdr.channel_mode; s->channel_mode = hdr.channel_mode;
center_mix_level = gain_levels[center_levels[hdr.center_mix_level]];
surround_mix_level = gain_levels[surround_levels[hdr.surround_mix_level]];
s->lfe_on = hdr.lfe_on; s->lfe_on = hdr.lfe_on;
s->bit_alloc_params.sr_shift = hdr.sr_shift; s->bit_alloc_params.sr_shift = hdr.sr_shift;
s->sample_rate = hdr.sample_rate; s->sample_rate = hdr.sample_rate;
@ -367,9 +365,9 @@ static int ac3_parse_header(AC3DecodeContext *s)
skip_bits(gbc, 2); // skip dsurmod skip_bits(gbc, 2); // skip dsurmod
} else { } else {
if((s->channel_mode & 1) && s->channel_mode != AC3_CHMODE_MONO) if((s->channel_mode & 1) && s->channel_mode != AC3_CHMODE_MONO)
skip_bits(gbc, 2); // skip cmixlev center_mix_level = gain_levels[center_levels[get_bits(gbc, 2)]];
if(s->channel_mode & 4) if(s->channel_mode & 4)
skip_bits(gbc, 2); // skip surmixlev surround_mix_level = gain_levels[surround_levels[get_bits(gbc, 2)]];
} }
skip_bits1(gbc); // skip lfeon skip_bits1(gbc); // skip lfeon