virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/mpegvideo_enc: Move copying properties to alloc_picture()

Browse Source 
This way said function sets everything (except for the actual
contents of the frame's data). Also rename it to prepare_picture()
given its new role.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-10-07 21:22:08 +02:00
parent 8225d2da73
commit 2dfe7c1e40
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/mpegvideo_enc.c
View File

@ -1091,7 +1091,11 @@ static int get_intra_count(MpegEncContext *s, const uint8_t *src,
return acc;
}
static int alloc_picture(MpegEncContext *s, AVFrame *f)
/**
* Allocates new buffers for an AVFrame and copies the properties
* from another AVFrame.
*/
static int prepare_picture(MpegEncContext *s, AVFrame *f, const AVFrame *props_frame)
{
AVCodecContext *avctx = s->avctx;
int ret;
@ -1116,6 +1120,10 @@ static int alloc_picture(MpegEncContext *s, AVFrame *f)
f->width = avctx->width;
f->height = avctx->height;
ret = av_frame_copy_props(f, props_frame);
if (ret < 0)
return ret;
return 0;
}
@ -1186,14 +1194,9 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
return ret;
pic->shared = 1;
} else {
ret = alloc_picture(s, pic->f);
ret = prepare_picture(s, pic->f, pic_arg);
if (ret < 0)
goto fail;
ret = av_frame_copy_props(pic->f, pic_arg);
if (ret < 0) {
ff_mpeg_unref_picture(pic);
return ret;
}
for (int i = 0; i < 3; i++) {
ptrdiff_t src_stride = pic_arg->linesize[i];
@ -1607,11 +1610,8 @@ no_output_pic:
// input is a shared pix, so we can't modify it -> allocate a new
// one & ensure that the shared one is reuseable
av_frame_move_ref(s->new_pic, s->reordered_input_picture[0]->f);
ret = alloc_picture(s, s->reordered_input_picture[0]->f);
if (ret < 0)
goto fail;
ret = av_frame_copy_props(s->reordered_input_picture[0]->f, s->new_pic);
ret = prepare_picture(s, s->reordered_input_picture[0]->f, s->new_pic);
if (ret < 0)
goto fail;
} else {