Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

hw_base_encode: refactor picture allocation/freeing

Browse source 
This commit cleans up and refactors the mess of private state upon
private state that used to be.

Now, FFHWBaseEncodePicture is fully initialized upon call-time,
and, most importantly, this lets APIs which require initialization
data for frames (VkImageViews) to initialize this for both the
input image, and the reconstruction (DPB) image.

Signed-off-by: Tong Wu <wutong1208@outlook.com>
This commit is contained in:
Lynne 2024-08-21 23:27:15 +08:00
parent fdf8025eb6
commit 9db68ed042
No known key found for this signature in database
GPG key ID: A2FEA5F03F034464
14 changed files with 201 additions and 211 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libavcodec/vaapi_encode_vp8.c
View file

@ -74,9 +74,9 @@ static int vaapi_encode_vp8_init_sequence_params(AVCodecContext *avctx)
}
static int vaapi_encode_vp8_init_picture_params(AVCodecContext *avctx,
VAAPIEncodePicture *vaapi_pic)
FFHWBaseEncodePicture *pic)
{
const FFHWBaseEncodePicture *pic = &vaapi_pic->base;
VAAPIEncodePicture *vaapi_pic = pic->priv;
VAAPIEncodeVP8Context *priv = avctx->priv_data;
VAEncPictureParameterBufferVP8 *vpic = vaapi_pic->codec_picture_params;
int i;
@ -103,7 +103,7 @@ static int vaapi_encode_vp8_init_picture_params(AVCodecContext *avctx,
vpic->ref_last_frame =
vpic->ref_gf_frame =
vpic->ref_arf_frame =
((VAAPIEncodePicture *)pic->refs[0][0])->recon_surface;
((VAAPIEncodePicture *)pic->refs[0][0]->priv)->recon_surface;
break;
default:
av_assert0(0 && "invalid picture type");
@ -129,7 +129,7 @@ static int vaapi_encode_vp8_init_picture_params(AVCodecContext *avctx,
}
static int vaapi_encode_vp8_write_quant_table(AVCodecContext *avctx,
VAAPIEncodePicture *pic,
FFHWBaseEncodePicture *base_pic,
int index, int *type,
char *data, size_t *data_len)
{
@ -147,7 +147,7 @@ static int vaapi_encode_vp8_write_quant_table(AVCodecContext *avctx,
memset(&quant, 0, sizeof(quant));
if (pic->base.type == FF_HW_PICTURE_TYPE_P)
if (base_pic->type == FF_HW_PICTURE_TYPE_P)
q = priv->q_index_p;
else
q = priv->q_index_i;