mirror of
https://git.videolan.org/git/ffmpeg.git
synced 2024-09-06 16:10:09 +02:00
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
This commit is contained in:
parent
9c05103fe3
commit
880de6b0be
@ -483,17 +483,17 @@ static int adpcm_encode_frame(AVCodecContext *avctx,
|
||||
}
|
||||
} else
|
||||
for (; n>0; n--) {
|
||||
*dst = adpcm_ima_compress_sample(&c->status[0], samples[0]) & 0x0F;
|
||||
*dst |= (adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels]) << 4) & 0xF0;
|
||||
*dst = adpcm_ima_compress_sample(&c->status[0], samples[0]);
|
||||
*dst |= adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels]) << 4;
|
||||
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 * 3]) << 4) & 0xF0;
|
||||
*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;
|
||||
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 * 5]) << 4) & 0xF0;
|
||||
*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;
|
||||
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 * 7]) << 4) & 0xF0;
|
||||
*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;
|
||||
dst++;
|
||||
/* right channel */
|
||||
if (avctx->channels == 2) {
|
||||
@ -544,9 +544,9 @@ static int adpcm_encode_frame(AVCodecContext *avctx,
|
||||
}
|
||||
} else {
|
||||
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)
|
||||
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);
|
||||
|
Loading…
Reference in New Issue
Block a user