highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apedec: do not unnecessarily zero output samples for mono frames

Browse Source
This commit is contained in:
Justin Ruggles 2012-02-06 16:34:50 -05:00
parent 1d3c672d27
commit 39575eead2
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/apedec.c
View File

@ -474,16 +474,10 @@ static void entropy_decode(APEContext *ctx, int blockstodecode, int stereo)
int32_t *decoded0 = ctx->decoded[0]; int32_t *decoded0 = ctx->decoded[0];
int32_t *decoded1 = ctx->decoded[1]; int32_t *decoded1 = ctx->decoded[1];
if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) { while (blockstodecode--) {
/* We are pure silence, just memset the output buffer. */ *decoded0++ = ape_decode_value(ctx, &ctx->riceY);
memset(decoded0, 0, blockstodecode * sizeof(*decoded0)); if (stereo)
memset(decoded1, 0, blockstodecode * sizeof(*decoded1)); *decoded1++ = ape_decode_value(ctx, &ctx->riceX);
} else {
while (blockstodecode--) {
*decoded0++ = ape_decode_value(ctx, &ctx->riceY);
if (stereo)
*decoded1++ = ape_decode_value(ctx, &ctx->riceX);
}
} }
} }
@ -778,7 +772,6 @@ static int init_frame_decoder(APEContext *ctx)
static void ape_unpack_mono(APEContext *ctx, int count) static void ape_unpack_mono(APEContext *ctx, int count)
{ {
if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) { if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
entropy_decode(ctx, count, 0);
/* We are pure silence, so we're done. */ /* We are pure silence, so we're done. */
av_log(ctx->avctx, AV_LOG_DEBUG, "pure silence mono\n"); av_log(ctx->avctx, AV_LOG_DEBUG, "pure silence mono\n");
return; return;