har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/proresenc_aw : move picture encoding after frame header write

Browse Source
This commit is contained in:
Martin Vignali 2019-02-09 18:16:50 +01:00
parent 6cc8cfe30c
commit 2016f9c3bc
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/proresenc_anatoliy.c
View File

@ -683,7 +683,7 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
ProresContext *ctx = avctx->priv_data; ProresContext *ctx = avctx->priv_data;
int header_size = 148; int header_size = 148;
uint8_t *buf; uint8_t *buf;
int pic_size, ret; int compress_frame_size, pic_size, ret;
uint8_t frame_flags; uint8_t frame_flags;
int frame_size = FFALIGN(avctx->width, 16) * FFALIGN(avctx->height, 16)*16 + 500 + AV_INPUT_BUFFER_MIN_SIZE; //FIXME choose tighter limit int frame_size = FFALIGN(avctx->width, 16) * FFALIGN(avctx->height, 16)*16 + 500 + AV_INPUT_BUFFER_MIN_SIZE; //FIXME choose tighter limit
@ -692,13 +692,9 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
return ret; return ret;
buf = pkt->data; buf = pkt->data;
pic_size = prores_encode_picture(avctx, pict, buf + header_size + 8, compress_frame_size = 8 + header_size;
pkt->size - header_size - 8);
if (pic_size < 0) {
return pic_size;
}
bytestream_put_be32(&buf, pic_size + 8 + header_size); bytestream_put_be32(&buf, compress_frame_size);/* frame size will be update after picture(s) encoding */
bytestream_put_buffer(&buf, "icpf", 4); bytestream_put_buffer(&buf, "icpf", 4);
bytestream_put_be16(&buf, header_size); bytestream_put_be16(&buf, header_size);
@ -730,8 +726,16 @@ static int prores_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
bytestream_put_buffer(&buf, QMAT_LUMA[avctx->profile], 64); bytestream_put_buffer(&buf, QMAT_LUMA[avctx->profile], 64);
bytestream_put_buffer(&buf, QMAT_CHROMA[avctx->profile], 64); bytestream_put_buffer(&buf, QMAT_CHROMA[avctx->profile], 64);
pic_size = prores_encode_picture(avctx, pict, buf,
pkt->size - compress_frame_size);
if (pic_size < 0) {
return pic_size;
}
compress_frame_size += pic_size;
AV_WB32(pkt->data, compress_frame_size);/* update frame size */
pkt->flags |= AV_PKT_FLAG_KEY; pkt->flags |= AV_PKT_FLAG_KEY;
pkt->size = pic_size + 8 + header_size; pkt->size = compress_frame_size;
*got_packet = 1; *got_packet = 1;
return 0; return 0;