Commit 880de6b0 authored by Timofei V. Bondarenko's avatar Timofei V. Bondarenko Committed by Diego Biurrun

Remove unnecessary guarding &=0x0f around adpcm_ima_compress_sample().

patch by Timofei, tim ipi.ac ru
Date: Mon, 15 Oct 2007 19:55:29 +0400
Subject: [FFmpeg-devel] [PATCH] adpcm-ima-wav header and codec

Originally committed as revision 10773 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9c05103f
...@@ -483,17 +483,17 @@ static int adpcm_encode_frame(AVCodecContext *avctx, ...@@ -483,17 +483,17 @@ static int adpcm_encode_frame(AVCodecContext *avctx,
} }
} else } else
for (; n>0; n--) { for (; n>0; n--) {
*dst = adpcm_ima_compress_sample(&c->status[0], samples[0]) & 0x0F; *dst = adpcm_ima_compress_sample(&c->status[0], samples[0]);
*dst |= (adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels]) << 4) & 0xF0; *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels]) << 4;
dst++; dst++;
*dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 2]) & 0x0F; *dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 2]);
*dst |= (adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 3]) << 4) & 0xF0; *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 3]) << 4;
dst++; dst++;
*dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 4]) & 0x0F; *dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 4]);
*dst |= (adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 5]) << 4) & 0xF0; *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 5]) << 4;
dst++; dst++;
*dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 6]) & 0x0F; *dst = adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 6]);
*dst |= (adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 7]) << 4) & 0xF0; *dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels * 7]) << 4;
dst++; dst++;
/* right channel */ /* right channel */
if (avctx->channels == 2) { if (avctx->channels == 2) {
...@@ -544,9 +544,9 @@ static int adpcm_encode_frame(AVCodecContext *avctx, ...@@ -544,9 +544,9 @@ static int adpcm_encode_frame(AVCodecContext *avctx,
} }
} else { } else {
for (i=1; i<avctx->frame_size; i++) { for (i=1; i<avctx->frame_size; i++) {
put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels*i]) & 0xF); put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels*i]));
if (avctx->channels == 2) if (avctx->channels == 2)
put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[1], samples[2*i+1]) & 0xF); put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[1], samples[2*i+1]));
} }
} }
flush_put_bits(&pb); flush_put_bits(&pb);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment