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

Fix buffer_size argument to init_put_bits() in multiple encoders.

Browse Source 
Several encoders were multiplying the buffer size by 8, in order to get
a bit size. However, the buffer_size argument is for the byte size of
the buffer. We had experienced crashes encoding prores (Anatoliy) at
size 4096x4096.
This commit is contained in:
Dyami Caliri 2015-02-26 10:17:01 -08:00 committed by Michael Niedermayer
parent b851bc20c6
commit 50833c9f7b
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacenc.c
View File

@ -165,7 +165,7 @@ static void put_audio_specific_config(AVCodecContext *avctx)
PutBitContext pb; PutBitContext pb;
AACEncContext *s = avctx->priv_data; AACEncContext *s = avctx->priv_data;
init_put_bits(&pb, avctx->extradata, avctx->extradata_size*8); init_put_bits(&pb, avctx->extradata, avctx->extradata_size);
put_bits(&pb, 5, 2); //object type - AAC-LC put_bits(&pb, 5, 2); //object type - AAC-LC
put_bits(&pb, 4, s->samplerate_index); //sample rate index put_bits(&pb, 4, s->samplerate_index); //sample rate index
put_bits(&pb, 4, s->channels); put_bits(&pb, 4, s->channels);

4
libavcodec/adpcmenc.c
View File

@ -541,7 +541,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
case AV_CODEC_ID_ADPCM_IMA_QT: case AV_CODEC_ID_ADPCM_IMA_QT:
{ {
PutBitContext pb; PutBitContext pb;
init_put_bits(&pb, dst, pkt_size * 8); init_put_bits(&pb, dst, pkt_size);
for (ch = 0; ch < avctx->channels; ch++) { for (ch = 0; ch < avctx->channels; ch++) {
ADPCMChannelStatus *status = &c->status[ch]; ADPCMChannelStatus *status = &c->status[ch];
@ -571,7 +571,7 @@ static int adpcm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
case AV_CODEC_ID_ADPCM_SWF: case AV_CODEC_ID_ADPCM_SWF:
{ {
PutBitContext pb; PutBitContext pb;
init_put_bits(&pb, dst, pkt_size * 8); init_put_bits(&pb, dst, pkt_size);
n = frame->nb_samples - 1; n = frame->nb_samples - 1;

2
libavcodec/faxcompr.c
View File

@ -251,7 +251,7 @@ static void put_line(uint8_t *dst, int size, int width, const int *runs)
PutBitContext pb; PutBitContext pb;
int run, mode = ~0, pix_left = width, run_idx = 0; int run, mode = ~0, pix_left = width, run_idx = 0;
init_put_bits(&pb, dst, size * 8); init_put_bits(&pb, dst, size);
while (pix_left > 0) { while (pix_left > 0) {
run = runs[run_idx++]; run = runs[run_idx++];
mode = ~mode; mode = ~mode;

2
libavcodec/flashsv2enc.c
View File

@ -287,7 +287,7 @@ static int write_header(FlashSV2Context * s, uint8_t * buf, int buf_size)
if (buf_size < 5) if (buf_size < 5)
return -1; return -1;
init_put_bits(&pb, buf, buf_size * 8); init_put_bits(&pb, buf, buf_size);
put_bits(&pb, 4, (s->block_width >> 4) - 1); put_bits(&pb, 4, (s->block_width >> 4) - 1);
put_bits(&pb, 12, s->image_width); put_bits(&pb, 12, s->image_width);

2
libavcodec/flashsvenc.c
View File

@ -151,7 +151,7 @@ static int encode_bitstream(FlashSVContext *s, const AVFrame *p, uint8_t *buf,
int buf_pos, res; int buf_pos, res;
int pred_blocks = 0; int pred_blocks = 0;
init_put_bits(&pb, buf, buf_size * 8); init_put_bits(&pb, buf, buf_size);
put_bits(&pb, 4, block_width / 16 - 1); put_bits(&pb, 4, block_width / 16 - 1);
put_bits(&pb, 12, s->image_width); put_bits(&pb, 12, s->image_width);

2
libavcodec/nellymoserenc.c
View File

@ -308,7 +308,7 @@ static void encode_block(NellyMoserEncodeContext *s, unsigned char *output, int
apply_mdct(s); apply_mdct(s);
init_put_bits(&pb, output, output_size * 8); init_put_bits(&pb, output, output_size);
i = 0; i = 0;
for (band = 0; band < NELLY_BANDS; band++) { for (band = 0; band < NELLY_BANDS; band++) {

2
libavcodec/proresenc_anatoliy.c
View File

@ -304,7 +304,7 @@ static int encode_slice_plane(AVCodecContext *avctx, int mb_count,
} }
blocks_per_slice = mb_count << (2 - chroma); blocks_per_slice = mb_count << (2 - chroma);
init_put_bits(&pb, buf, buf_size << 3); init_put_bits(&pb, buf, buf_size);
encode_dc_coeffs(&pb, blocks, blocks_per_slice, qmat); encode_dc_coeffs(&pb, blocks, blocks_per_slice, qmat);
encode_ac_coeffs(avctx, &pb, blocks, blocks_per_slice, qmat); encode_ac_coeffs(avctx, &pb, blocks, blocks_per_slice, qmat);

2
libavcodec/proresenc_kostya.c
View File

@ -1057,7 +1057,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
slice_hdr = pkt->data + (slice_hdr - start); slice_hdr = pkt->data + (slice_hdr - start);
tmp = pkt->data + (tmp - start); tmp = pkt->data + (tmp - start);
} }
init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)) * 8); init_put_bits(&pb, buf, (pkt_size - (buf - orig_buf)));
ret = encode_slice(avctx, pic, &pb, sizes, x, y, q, ret = encode_slice(avctx, pic, &pb, sizes, x, y, q,
mbs_per_slice); mbs_per_slice);
if (ret < 0) if (ret < 0)

2
libavcodec/s302menc.c
View File

@ -82,7 +82,7 @@ static int s302m_encode2_frame(AVCodecContext *avctx, AVPacket *avpkt,
return ret; return ret;
o = avpkt->data; o = avpkt->data;
init_put_bits(&pb, o, buf_size * 8); init_put_bits(&pb, o, buf_size);
put_bits(&pb, 16, buf_size - AES3_HEADER_LEN); put_bits(&pb, 16, buf_size - AES3_HEADER_LEN);
put_bits(&pb, 2, (avctx->channels - 2) >> 1); // number of channels put_bits(&pb, 2, (avctx->channels - 2) >> 1); // number of channels
put_bits(&pb, 8, 0); // channel ID put_bits(&pb, 8, 0); // channel ID