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

avcodec/mpegvideo_dec: Move getting Picture slot into alloc_picture() 

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

59
libavcodec/mpegvideo_dec.c
View File

@ -235,12 +235,20 @@ int ff_mpv_common_frame_size_change(MpegEncContext *s)
return err; return err;
} }
static int alloc_picture(MpegEncContext *s, Picture *pic) static int alloc_picture(MpegEncContext *s, Picture **picp, int reference)
{ {
AVCodecContext *avctx = s->avctx; AVCodecContext *avctx = s->avctx;
int idx = ff_find_unused_picture(s->avctx, s->picture, 0);
Picture *pic;
int ret; int ret;
if (idx < 0)
return idx;
pic = &s->picture[idx];
pic->tf.f = pic->f; pic->tf.f = pic->f;
pic->reference = reference;
/* WM Image / Screen codecs allocate internal buffers with different /* WM Image / Screen codecs allocate internal buffers with different
* dimensions / colorspaces; ignore user-defined callbacks for these. */ * dimensions / colorspaces; ignore user-defined callbacks for these. */
@ -248,7 +256,7 @@ static int alloc_picture(MpegEncContext *s, Picture *pic)
avctx->codec_id != AV_CODEC_ID_VC1IMAGE && avctx->codec_id != AV_CODEC_ID_VC1IMAGE &&
avctx->codec_id != AV_CODEC_ID_MSS2) { avctx->codec_id != AV_CODEC_ID_MSS2) {
ret = ff_thread_get_ext_buffer(avctx, &pic->tf, ret = ff_thread_get_ext_buffer(avctx, &pic->tf,
pic->reference ? AV_GET_BUFFER_FLAG_REF : 0); reference ? AV_GET_BUFFER_FLAG_REF : 0);
} else { } else {
pic->f->width = avctx->width; pic->f->width = avctx->width;
pic->f->height = avctx->height; pic->f->height = avctx->height;
@ -262,9 +270,14 @@ static int alloc_picture(MpegEncContext *s, Picture *pic)
if (ret < 0) if (ret < 0)
goto fail; goto fail;
return ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, s->out_format, ret = ff_alloc_picture(s->avctx, pic, &s->me, &s->sc, 0, s->out_format,
s->mb_stride, s->mb_width, s->mb_height, s->b8_stride, s->mb_stride, s->mb_width, s->mb_height, s->b8_stride,
&s->linesize, &s->uvlinesize); &s->linesize, &s->uvlinesize);
if (ret < 0)
goto fail;
*picp = pic;
return 0;
fail: fail:
ff_mpeg_unref_picture(pic); ff_mpeg_unref_picture(pic);
return ret; return ret;
@ -272,27 +285,16 @@ fail:
static int av_cold alloc_dummy_frame(MpegEncContext *s, Picture **picp) static int av_cold alloc_dummy_frame(MpegEncContext *s, Picture **picp)
{ {
int idx = ff_find_unused_picture(s->avctx, s->picture, 0);
Picture *pic; Picture *pic;
int ret; int ret = alloc_picture(s, picp, 1);
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) if (ret < 0)
return ret; return ret;
pic = *picp;
ff_thread_report_progress(&pic->tf, INT_MAX, 0); ff_thread_report_progress(&pic->tf, INT_MAX, 0);
ff_thread_report_progress(&pic->tf, INT_MAX, 1); ff_thread_report_progress(&pic->tf, INT_MAX, 1);
*picp = pic;
return 0; return 0;
} }
@ -320,8 +322,7 @@ static void color_frame(AVFrame *frame, int luma)
*/ */
int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
{ {
Picture *pic; int ret;
int idx, ret;
s->mb_skipped = 0; s->mb_skipped = 0;
@ -351,23 +352,11 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx)
ff_mpeg_unref_picture(&s->last_picture); ff_mpeg_unref_picture(&s->last_picture);
ff_mpeg_unref_picture(&s->next_picture); ff_mpeg_unref_picture(&s->next_picture);
idx = ff_find_unused_picture(s->avctx, s->picture, 0); ret = alloc_picture(s, &s->current_picture_ptr,
if (idx < 0) { s->pict_type != AV_PICTURE_TYPE_B && !s->droppable);
av_log(s->avctx, AV_LOG_ERROR, "no frame buffer available\n"); if (ret < 0)
return idx; return ret;
}
pic = &s->picture[idx];
pic->reference = 0;
if (!s->droppable) {
if (s->pict_type != AV_PICTURE_TYPE_B)
pic->reference = 3;
}
if (alloc_picture(s, pic) < 0)
return -1;
s->current_picture_ptr = pic;
s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * !!s->top_field_first; s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_TOP_FIELD_FIRST * !!s->top_field_first;
s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_INTERLACED * (!s->progressive_frame && s->current_picture_ptr->f->flags |= AV_FRAME_FLAG_INTERLACED * (!s->progressive_frame &&
!s->progressive_sequence); !s->progressive_sequence);