RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/mpegvideo_dec: Factor allocating dummy frame out 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2023-10-14 23:00:42 +02:00
parent b00c697654
commit b7cf2d0efc
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
libavcodec/mpegvideo_dec.c
View File

@ -270,6 +270,32 @@ fail:
return ret; return ret;
} }
static int av_cold alloc_dummy_frame(MpegEncContext *s, Picture **picp)
{
int idx = ff_find_unused_picture(s->avctx, s->picture, 0);
Picture *pic;
int ret;
if (idx < 0)
return idx;
pic = &s->picture[idx];
pic->reference = 3;
pic->f->pict_type = AV_PICTURE_TYPE_P;
ret = alloc_picture(s, pic);
if (ret < 0)
return ret;
ff_thread_report_progress(&pic->tf, INT_MAX, 0);
ff_thread_report_progress(&pic->tf, INT_MAX, 1);
*picp = pic;
return 0;
}
static void color_frame(AVFrame *frame, int luma) static void color_frame(AVFrame *frame, int luma)
{ {
int h_chroma_shift, v_chroma_shift; int h_chroma_shift, v_chroma_shift;
@ -379,48 +405,22 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
"warning: first frame is no keyframe\n"); "warning: first frame is no keyframe\n");
/* Allocate a dummy frame */ /* Allocate a dummy frame */
idx = ff_find_unused_picture(s->avctx, s->picture, 0); ret = alloc_dummy_frame(s, &s->last_picture_ptr);
if (idx < 0) { if (ret < 0)
av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); return ret;
return idx;
}
s->last_picture_ptr = &s->picture[idx];
s->last_picture_ptr->reference = 3;
s->last_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P;
if (alloc_picture(s, s->last_picture_ptr) < 0) {
s->last_picture_ptr = NULL;
return -1;
}
if (!avctx->hwaccel) { if (!avctx->hwaccel) {
int luma_val = s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263 ? 16 : 0x80; int luma_val = s->codec_id == AV_CODEC_ID_FLV1 || s->codec_id == AV_CODEC_ID_H263 ? 16 : 0x80;
color_frame(s->last_picture_ptr->f, luma_val); color_frame(s->last_picture_ptr->f, luma_val);
} }
ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 0);
ff_thread_report_progress(&s->last_picture_ptr->tf, INT_MAX, 1);
} }
if ((!s->next_picture_ptr || !s->next_picture_ptr->f->buf[0]) && if ((!s->next_picture_ptr || !s->next_picture_ptr->f->buf[0]) &&
s->pict_type == AV_PICTURE_TYPE_B) { s->pict_type == AV_PICTURE_TYPE_B) {
/* Allocate a dummy frame */ /* Allocate a dummy frame */
idx = ff_find_unused_picture(s->avctx, s->picture, 0); ret = alloc_dummy_frame(s, &s->next_picture_ptr);
if (idx < 0) { if (ret < 0)
av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); return ret;
return idx;
}
s->next_picture_ptr = &s->picture[idx];
s->next_picture_ptr->reference = 3;
s->next_picture_ptr->f->pict_type = AV_PICTURE_TYPE_P;
if (alloc_picture(s, s->next_picture_ptr) < 0) {
s->next_picture_ptr = NULL;
return -1;
}
ff_thread_report_progress(&s->next_picture_ptr->tf, INT_MAX, 0);
ff_thread_report_progress(&s->next_picture_ptr->tf, INT_MAX, 1);
} }
if (s->last_picture_ptr) { if (s->last_picture_ptr) {