Mercurial > libavcodec.hg

comparison ac3dec.c @ 6093:5562b898db5b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: rename sampling_rate to sample_rate
author jbr
date Sun, 30 Dec 2007 21:26:30 +0000
parents 42bdc549a500
children 07fc769bf4e2
comparison
equal deleted inserted replaced
6092:42bdc549a500 6093:5562b898db5b
143 int dba_nsegs[AC3_MAX_CHANNELS]; ///< number of delta segments 143 int dba_nsegs[AC3_MAX_CHANNELS]; ///< number of delta segments
144 uint8_t dba_offsets[AC3_MAX_CHANNELS][8]; ///< delta segment offsets 144 uint8_t dba_offsets[AC3_MAX_CHANNELS][8]; ///< delta segment offsets
145 uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths 145 uint8_t dba_lengths[AC3_MAX_CHANNELS][8]; ///< delta segment lengths
146 uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment 146 uint8_t dba_values[AC3_MAX_CHANNELS][8]; ///< delta values for each segment
147 147
148 int sampling_rate; ///< sample frequency, in Hz 148 int sample_rate; ///< sample frequency, in Hz
149 int bit_rate; ///< stream bit rate, in bits-per-second 149 int bit_rate; ///< stream bit rate, in bits-per-second
150 int frame_size; ///< current frame size, in bytes 150 int frame_size; ///< current frame size, in bytes
151 151
152 int channels; ///< number of total channels 152 int channels; ///< number of total channels
153 int fbw_channels; ///< number of full-bandwidth channels 153 int fbw_channels; ///< number of full-bandwidth channels
335 s->channel_mode = hdr.channel_mode; 335 s->channel_mode = hdr.channel_mode;
336 center_mix_level = gain_levels[center_levels[hdr.center_mix_level]]; 336 center_mix_level = gain_levels[center_levels[hdr.center_mix_level]];
337 surround_mix_level = gain_levels[surround_levels[hdr.surround_mix_level]]; 337 surround_mix_level = gain_levels[surround_levels[hdr.surround_mix_level]];
338 s->lfe_on = hdr.lfe_on; 338 s->lfe_on = hdr.lfe_on;
339 s->bit_alloc_params.sr_shift = hdr.sr_shift; 339 s->bit_alloc_params.sr_shift = hdr.sr_shift;
340 s->sampling_rate = hdr.sample_rate; 340 s->sample_rate = hdr.sample_rate;
341 s->bit_rate = hdr.bit_rate; 341 s->bit_rate = hdr.bit_rate;
342 s->channels = hdr.channels; 342 s->channels = hdr.channels;
343 s->fbw_channels = s->channels - s->lfe_on; 343 s->fbw_channels = s->channels - s->lfe_on;
344 s->lfe_ch = s->fbw_channels + 1; 344 s->lfe_ch = s->fbw_channels + 1;
345 s->frame_size = hdr.frame_size; 345 s->frame_size = hdr.frame_size;
1101 break; 1101 break;
1102 } 1102 }
1103 return -1; 1103 return -1;
1104 } 1104 }
1105 1105
1106 avctx->sample_rate = s->sampling_rate; 1106 avctx->sample_rate = s->sample_rate;
1107 avctx->bit_rate = s->bit_rate; 1107 avctx->bit_rate = s->bit_rate;
1108 1108
1109 /* check that reported frame size fits in input buffer */ 1109 /* check that reported frame size fits in input buffer */
1110 if(s->frame_size > buf_size) { 1110 if(s->frame_size > buf_size) {
1111 av_log(avctx, AV_LOG_ERROR, "incomplete frame\n"); 1111 av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");