virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

cllc: simplify/fix swapped data buffer allocation.

Browse Source 
Using the malloc variant avoids pointless memcpy on size
increase and simplifies handling allocation failure.
Also change code to ensure that allocation, bswap and bitstream
reader all use the same size, even when the packet size is odd
for example.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-08-26 12:59:38 +02:00
parent 5cc5d9d5f7
commit 237f53ce85
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libavcodec/cllc.c
View File

@ -272,8 +272,8 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
CLLCContext *ctx = avctx->priv_data; CLLCContext *ctx = avctx->priv_data;
AVFrame *pic = avctx->coded_frame; AVFrame *pic = avctx->coded_frame;
uint8_t *src = avpkt->data; uint8_t *src = avpkt->data;
uint8_t *swapped_buf_new;
uint32_t info_tag, info_offset; uint32_t info_tag, info_offset;
int data_size;
GetBitContext gb; GetBitContext gb;
int coding_type, ret; int coding_type, ret;
@ -282,16 +282,6 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
pic->reference = 0; pic->reference = 0;
/* Make sure our bswap16'd buffer is big enough */
swapped_buf_new = av_fast_realloc(ctx->swapped_buf,
&ctx->swapped_buf_size, avpkt->size +
FF_INPUT_BUFFER_PADDING_SIZE);
if (!swapped_buf_new) {
av_log(avctx, AV_LOG_ERROR, "Could not realloc swapped buffer.\n");
return AVERROR(ENOMEM);
}
ctx->swapped_buf = swapped_buf_new;
/* Skip the INFO header if present */ /* Skip the INFO header if present */
info_offset = 0; info_offset = 0;
info_tag = AV_RL32(src); info_tag = AV_RL32(src);
@ -310,15 +300,21 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_DEBUG, "Skipping INFO chunk.\n"); av_log(avctx, AV_LOG_DEBUG, "Skipping INFO chunk.\n");
} }
data_size = (avpkt->size - info_offset) & ~1;
/* Make sure our bswap16'd buffer is big enough */
av_fast_padded_malloc(&ctx->swapped_buf,
&ctx->swapped_buf_size, data_size);
if (!ctx->swapped_buf) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate swapped buffer.\n");
return AVERROR(ENOMEM);
}
/* bswap16 the buffer since CLLC's bitreader works in 16-bit words */ /* bswap16 the buffer since CLLC's bitreader works in 16-bit words */
ctx->dsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src, ctx->dsp.bswap16_buf((uint16_t *) ctx->swapped_buf, (uint16_t *) src,
(avpkt->size - info_offset) / 2); data_size / 2);
/* Initialize padding to 0 */ init_get_bits(&gb, ctx->swapped_buf, data_size * 8);
memset(ctx->swapped_buf + avpkt->size - info_offset,
0, FF_INPUT_BUFFER_PADDING_SIZE);
init_get_bits(&gb, ctx->swapped_buf, (avpkt->size - info_offset) * 8);
/* /*
* Read in coding type. The types are as follows: * Read in coding type. The types are as follows: