RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

dpcm: factor out the stereo flag calculation

This commit is contained in:
Justin Ruggles 2011-09-11 11:19:00 -04:00
parent b09c7eefb7
commit 3db8db406f
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libavcodec/dpcm.c
View File

@ -169,6 +169,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
int in, out = 0; int in, out = 0;
int predictor[2]; int predictor[2];
int ch = 0; int ch = 0;
int stereo = s->channels - 1;
short *output_samples = data; short *output_samples = data;
int shift[2]; int shift[2];
unsigned char byte; unsigned char byte;
@ -184,11 +185,11 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
switch(avctx->codec->id) { switch(avctx->codec->id) {
case CODEC_ID_ROQ_DPCM: case CODEC_ID_ROQ_DPCM:
if (s->channels == 1) if (stereo) {
predictor[0] = AV_RL16(&buf[6]);
else {
predictor[0] = buf[7] << 8; predictor[0] = buf[7] << 8;
predictor[1] = buf[6] << 8; predictor[1] = buf[6] << 8;
} else {
predictor[0] = AV_RL16(&buf[6]);
} }
SE_16BIT(predictor[0]); SE_16BIT(predictor[0]);
SE_16BIT(predictor[1]); SE_16BIT(predictor[1]);
@ -200,7 +201,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
output_samples[out] = predictor[ch]; output_samples[out] = predictor[ch];
/* toggle channel */ /* toggle channel */
ch ^= s->channels - 1; ch ^= stereo;
} }
break; break;
@ -210,7 +211,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
in += 2; in += 2;
SE_16BIT(predictor[0]) SE_16BIT(predictor[0])
output_samples[out++] = predictor[0]; output_samples[out++] = predictor[0];
if (s->channels == 2) { if (stereo) {
predictor[1] = AV_RL16(&buf[in]); predictor[1] = AV_RL16(&buf[in]);
in += 2; in += 2;
SE_16BIT(predictor[1]) SE_16BIT(predictor[1])
@ -223,7 +224,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
output_samples[out++] = predictor[ch]; output_samples[out++] = predictor[ch];
/* toggle channel */ /* toggle channel */
ch ^= s->channels - 1; ch ^= stereo;
} }
break; break;
@ -234,7 +235,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
predictor[0] = AV_RL16(&buf[in]); predictor[0] = AV_RL16(&buf[in]);
in += 2; in += 2;
SE_16BIT(predictor[0]); SE_16BIT(predictor[0]);
if (s->channels == 2) { if (stereo) {
predictor[1] = AV_RL16(&buf[in]); predictor[1] = AV_RL16(&buf[in]);
in += 2; in += 2;
SE_16BIT(predictor[1]); SE_16BIT(predictor[1]);
@ -258,7 +259,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
output_samples[out++] = predictor[ch]; output_samples[out++] = predictor[ch];
/* toggle channel */ /* toggle channel */
ch ^= s->channels - 1; ch ^= stereo;
} }
break; break;
case CODEC_ID_SOL_DPCM: case CODEC_ID_SOL_DPCM:
@ -274,10 +275,10 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
if (s->sample[0] < 0) s->sample[0] = 0; if (s->sample[0] < 0) s->sample[0] = 0;
if (s->sample[0] > 255) s->sample[0] = 255; if (s->sample[0] > 255) s->sample[0] = 255;
output_samples[out++] = (s->sample[0] - 128) << 8; output_samples[out++] = (s->sample[0] - 128) << 8;
s->sample[s->channels - 1] += s->sol_table[n2]; s->sample[stereo] += s->sol_table[n2];
if (s->sample[s->channels - 1] < 0) s->sample[s->channels - 1] = 0; if (s->sample[stereo] < 0) s->sample[stereo] = 0;
if (s->sample[s->channels - 1] > 255) s->sample[s->channels - 1] = 255; if (s->sample[stereo] > 255) s->sample[stereo] = 255;
output_samples[out++] = (s->sample[s->channels - 1] - 128) << 8; output_samples[out++] = (s->sample[stereo] - 128) << 8;
} }
} else { } else {
while (in < buf_size) { while (in < buf_size) {
@ -288,7 +289,7 @@ static int dpcm_decode_frame(AVCodecContext *avctx,
s->sample[ch] = av_clip_int16(s->sample[ch]); s->sample[ch] = av_clip_int16(s->sample[ch]);
output_samples[out++] = s->sample[ch]; output_samples[out++] = s->sample[ch];
/* toggle channel */ /* toggle channel */
ch ^= s->channels - 1; ch ^= stereo;
} }
} }
break; break;