typedef struct VAAPIEncodeVP9Context {
+ VAAPIEncodeContext common;
+
+ // User options.
+ int loop_filter_level;
+ int loop_filter_sharpness;
+
+ // Derived settings.
int q_idx_idr;
int q_idx_p;
int q_idx_b;
+ // Stream state.
+
// Reference direction for B-like frames:
// 0 - most recent P/IDR frame is last.
// 1 - most recent P frame is golden.
int last_ref_dir;
} VAAPIEncodeVP9Context;
-typedef struct VAAPIEncodeVP9Options {
- int loop_filter_level;
- int loop_filter_sharpness;
-} VAAPIEncodeVP9Options;
-
#define vseq_var(name) vseq->name, name
#define vseq_field(name) vseq->seq_fields.bits.name, name
static int vaapi_encode_vp9_init_picture_params(AVCodecContext *avctx,
VAAPIEncodePicture *pic)
{
- VAAPIEncodeContext *ctx = avctx->priv_data;
+ VAAPIEncodeVP9Context *priv = avctx->priv_data;
VAEncPictureParameterBufferVP9 *vpic = pic->codec_picture_params;
- VAAPIEncodeVP9Context *priv = ctx->priv_data;
- VAAPIEncodeVP9Options *opt = ctx->codec_options;
int i;
vpic->reconstructed_frame = pic->recon_surface;
vpic->chroma_ac_qindex_delta = 0;
vpic->chroma_dc_qindex_delta = 0;
- vpic->filter_level = opt->loop_filter_level;
- vpic->sharpness_level = opt->loop_filter_sharpness;
+ vpic->filter_level = priv->loop_filter_level;
+ vpic->sharpness_level = priv->loop_filter_sharpness;
if (avctx->max_b_frames > 0 && pic->type == PICTURE_TYPE_P)
priv->last_ref_dir = !priv->last_ref_dir;
static av_cold int vaapi_encode_vp9_configure(AVCodecContext *avctx)
{
- VAAPIEncodeContext *ctx = avctx->priv_data;
- VAAPIEncodeVP9Context *priv = ctx->priv_data;
+ VAAPIEncodeVP9Context *priv = avctx->priv_data;
priv->q_idx_p = av_clip(avctx->global_quality, 0, VP9_MAX_QUANT);
if (avctx->i_quant_factor > 0.0)
static const VAAPIEncodeType vaapi_encode_type_vp9 = {
.configure = &vaapi_encode_vp9_configure,
- .priv_data_size = sizeof(VAAPIEncodeVP9Context),
-
.sequence_params_size = sizeof(VAEncSequenceParameterBufferVP9),
.init_sequence_params = &vaapi_encode_vp9_init_sequence_params,
return ff_vaapi_encode_init(avctx);
}
-#define OFFSET(x) (offsetof(VAAPIEncodeContext, codec_options_data) + \
- offsetof(VAAPIEncodeVP9Options, x))
+#define OFFSET(x) offsetof(VAAPIEncodeVP9Context, x)
#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
static const AVOption vaapi_encode_vp9_options[] = {
{ "loop_filter_level", "Loop filter level",
.long_name = NULL_IF_CONFIG_SMALL("VP9 (VAAPI)"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_VP9,
- .priv_data_size = (sizeof(VAAPIEncodeContext) +
- sizeof(VAAPIEncodeVP9Options)),
+ .priv_data_size = sizeof(VAAPIEncodeVP9Context),
.init = &vaapi_encode_vp9_init,
.encode2 = &ff_vaapi_encode2,
.close = &ff_vaapi_encode_close,