opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-01 05:31:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

apedec: remove unneeded entropy decoder normalization.

Browse Source 
The decoder already skips data at the end of the packet without this.
Also remove 2 APEContext fields that were only used for the end-of-frame
normalization.
This commit is contained in:
Justin Ruggles
2011-10-31 14:57:04 -04:00
parent 59f4d1b8bb
commit ad17207b51
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/apedec.c
View File

@ -140,8 +140,6 @@ typedef struct APEContext {
uint32_t CRC; ///< frame CRC uint32_t CRC; ///< frame CRC
int frameflags; ///< frame flags int frameflags; ///< frame flags
int currentframeblocks; ///< samples (per channel) in current frame
int blocksdecoded; ///< count of decoded samples in current frame
APEPredictor predictor; ///< predictor used for final reconstruction APEPredictor predictor; ///< predictor used for final reconstruction
int32_t decoded0[BLOCKS_PER_LOOP]; ///< decoded data for the first channel int32_t decoded0[BLOCKS_PER_LOOP]; ///< decoded data for the first channel
@ -457,8 +455,6 @@ static void entropy_decode(APEContext *ctx, int blockstodecode, int stereo)
int32_t *decoded0 = ctx->decoded0; int32_t *decoded0 = ctx->decoded0;
int32_t *decoded1 = ctx->decoded1; int32_t *decoded1 = ctx->decoded1;
ctx->blocksdecoded = blockstodecode;
if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) { if (ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
/* We are pure silence, just memset the output buffer. */ /* We are pure silence, just memset the output buffer. */
memset(decoded0, 0, blockstodecode * sizeof(int32_t)); memset(decoded0, 0, blockstodecode * sizeof(int32_t));
@ -470,9 +466,6 @@ static void entropy_decode(APEContext *ctx, int blockstodecode, int stereo)
*decoded1++ = ape_decode_value(ctx, &ctx->riceX); *decoded1++ = ape_decode_value(ctx, &ctx->riceX);
} }
} }
if (ctx->blocksdecoded == ctx->currentframeblocks)
range_dec_normalize(ctx); /* normalize to use up all bytes */
} }
static int init_entropy_decoder(APEContext *ctx) static int init_entropy_decoder(APEContext *ctx)
@ -492,9 +485,6 @@ static int init_entropy_decoder(APEContext *ctx)
ctx->frameflags = bytestream_get_be32(&ctx->ptr); ctx->frameflags = bytestream_get_be32(&ctx->ptr);
} }
/* Keep a count of the blocks decoded in this frame */
ctx->blocksdecoded = 0;
/* Initialize the rice structs */ /* Initialize the rice structs */
ctx->riceX.k = 10; ctx->riceX.k = 10;
ctx->riceX.ksum = (1 << ctx->riceX.k) * 16; ctx->riceX.ksum = (1 << ctx->riceX.k) * 16;
@ -873,7 +863,7 @@ static int ape_decode_frame(AVCodecContext *avctx,
av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks); av_log(avctx, AV_LOG_ERROR, "Invalid sample count: %u.\n", nblocks);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
s->currentframeblocks = s->samples = nblocks; s->samples = nblocks;
memset(s->decoded0, 0, sizeof(s->decoded0)); memset(s->decoded0, 0, sizeof(s->decoded0));
memset(s->decoded1, 0, sizeof(s->decoded1)); memset(s->decoded1, 0, sizeof(s->decoded1));