highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vp9: Inline function with only one caller into it

Browse Source 
The split into vp9_decode_init() and init_frames() is a remnant
of using init_thread_copy() for frame-threading; the latter has
been removed, so there is no reason for init_frames() not be part
of vp9_decode_init().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-05-05 21:27:21 +02:00
parent 7aa8c95f47
commit 4818ea69d2
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
libavcodec/vp9.c
View File

@ -1790,26 +1790,6 @@ static void vp9_decode_flush(AVCodecContext *avctx)
ff_thread_release_buffer(avctx, &s->s.refs[i]);
}
static int init_frames(AVCodecContext *avctx)
{
VP9Context *s = avctx->priv_data;
int i;
for (i = 0; i < 3; i++) {
s->s.frames[i].tf.f = av_frame_alloc();
if (!s->s.frames[i].tf.f)
return AVERROR(ENOMEM);
}
for (i = 0; i < 8; i++) {
s->s.refs[i].f = av_frame_alloc();
s->next_refs[i].f = av_frame_alloc();
if (!s->s.refs[i].f || !s->next_refs[i].f)
return AVERROR(ENOMEM);
}
return 0;
}
static av_cold int vp9_decode_init(AVCodecContext *avctx)
{
VP9Context *s = avctx->priv_data;
@ -1817,7 +1797,18 @@ static av_cold int vp9_decode_init(AVCodecContext *avctx)
s->last_bpp = 0;
s->s.h.filter.sharpness = -1;
return init_frames(avctx);
for (int i = 0; i < 3; i++) {
s->s.frames[i].tf.f = av_frame_alloc();
if (!s->s.frames[i].tf.f)
return AVERROR(ENOMEM);
}
for (int i = 0; i < 8; i++) {
s->s.refs[i].f = av_frame_alloc();
s->next_refs[i].f = av_frame_alloc();
if (!s->s.refs[i].f || !s->next_refs[i].f)
return AVERROR(ENOMEM);
}
return 0;
}
#if HAVE_THREADS