generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

flacdec: cosmetics: rename 'decorrelation' to 'ch_mode'

Browse Source 
Originally committed as revision 18084 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2009-03-21 00:47:04 +00:00
parent ad52941faa
commit 2a34672500
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/flacdec.c
View File

@ -56,7 +56,7 @@ typedef struct FLACContext {
int curr_bps; ///< bps for current subframe, adjusted for channel correlation and wasted bits int curr_bps; ///< bps for current subframe, adjusted for channel correlation and wasted bits
int sample_shift; ///< shift required to make output samples 16-bit or 32-bit int sample_shift; ///< shift required to make output samples 16-bit or 32-bit
int is32; ///< flag to indicate if output should be 32-bit instead of 16-bit int is32; ///< flag to indicate if output should be 32-bit instead of 16-bit
int decorrelation; ///< channel decorrelation type in the current frame int ch_mode; ///< channel decorrelation type in the current frame
int got_streaminfo; ///< indicates if the STREAMINFO has been read int got_streaminfo; ///< indicates if the STREAMINFO has been read
int32_t *decoded[FLAC_MAX_CHANNELS]; ///< decoded samples int32_t *decoded[FLAC_MAX_CHANNELS]; ///< decoded samples
@ -438,10 +438,10 @@ static inline int decode_subframe(FLACContext *s, int channel)
s->curr_bps = s->bps; s->curr_bps = s->bps;
if (channel == 0) { if (channel == 0) {
if (s->decorrelation == FLAC_CHMODE_RIGHT_SIDE) if (s->ch_mode == FLAC_CHMODE_RIGHT_SIDE)
s->curr_bps++; s->curr_bps++;
} else { } else {
if (s->decorrelation == FLAC_CHMODE_LEFT_SIDE || s->decorrelation == FLAC_CHMODE_MID_SIDE) if (s->ch_mode == FLAC_CHMODE_LEFT_SIDE || s->ch_mode == FLAC_CHMODE_MID_SIDE)
s->curr_bps++; s->curr_bps++;
} }
@ -493,7 +493,7 @@ static inline int decode_subframe(FLACContext *s, int channel)
static int decode_frame(FLACContext *s, int alloc_data_size) static int decode_frame(FLACContext *s, int alloc_data_size)
{ {
int blocksize_code, sample_rate_code, sample_size_code, assignment, i, crc8; int blocksize_code, sample_rate_code, sample_size_code, assignment, i, crc8;
int decorrelation, bps, blocksize, samplerate; int ch_mode, bps, blocksize, samplerate;
blocksize_code = get_bits(&s->gb, 4); blocksize_code = get_bits(&s->gb, 4);
@ -501,9 +501,9 @@ static int decode_frame(FLACContext *s, int alloc_data_size)
assignment = get_bits(&s->gb, 4); /* channel assignment */ assignment = get_bits(&s->gb, 4); /* channel assignment */
if (assignment < FLAC_MAX_CHANNELS && s->channels == assignment+1) if (assignment < FLAC_MAX_CHANNELS && s->channels == assignment+1)
decorrelation = FLAC_CHMODE_INDEPENDENT; ch_mode = FLAC_CHMODE_INDEPENDENT;
else if (assignment >= FLAC_MAX_CHANNELS && assignment < 11 && s->channels == 2) else if (assignment >= FLAC_MAX_CHANNELS && assignment < 11 && s->channels == 2)
decorrelation = assignment; ch_mode = assignment;
else { else {
av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n", av_log(s->avctx, AV_LOG_ERROR, "unsupported channel assignment %d (channels=%d)\n",
assignment, s->channels); assignment, s->channels);
@ -587,7 +587,7 @@ static int decode_frame(FLACContext *s, int alloc_data_size)
s->blocksize = blocksize; s->blocksize = blocksize;
s->samplerate = samplerate; s->samplerate = samplerate;
s->bps = bps; s->bps = bps;
s->decorrelation= decorrelation; s->ch_mode = ch_mode;
// dump_headers(s->avctx, (FLACStreaminfo *)s); // dump_headers(s->avctx, (FLACStreaminfo *)s);
@ -702,7 +702,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
}\ }\
break; break;
switch (s->decorrelation) { switch (s->ch_mode) {
case FLAC_CHMODE_INDEPENDENT: case FLAC_CHMODE_INDEPENDENT:
for (j = 0; j < s->blocksize; j++) { for (j = 0; j < s->blocksize; j++) {
for (i = 0; i < s->channels; i++) { for (i = 0; i < s->channels; i++) {