CodedBitstreamFragment *frag,
int type, void *header)
{
- VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
int err;
- err = ff_cbs_insert_unit_content(priv->cbc, frag, -1, type, header, NULL);
+ err = ff_cbs_insert_unit_content(frag, -1, type, header, NULL);
if (err < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to add header: "
"type = %d.\n", type);
err = vaapi_encode_mpeg2_write_fragment(avctx, data, data_len, frag);
fail:
- ff_cbs_fragment_reset(priv->cbc, frag);
+ ff_cbs_fragment_reset(frag);
return 0;
}
err = vaapi_encode_mpeg2_write_fragment(avctx, data, data_len, frag);
fail:
- ff_cbs_fragment_reset(priv->cbc, frag);
+ ff_cbs_fragment_reset(frag);
return 0;
}
priv->sequence_display_extension.extension_start_code_identifier =
MPEG2_EXTENSION_SEQUENCE_DISPLAY;
+ // Unspecified video format, from table 6-6.
sde->video_format = 5;
- if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED ||
+
+ sde->colour_primaries = avctx->color_primaries;
+ sde->transfer_characteristics = avctx->color_trc;
+ sde->matrix_coefficients = avctx->colorspace;
+ sde->colour_description =
+ avctx->color_primaries != AVCOL_PRI_UNSPECIFIED ||
avctx->color_trc != AVCOL_TRC_UNSPECIFIED ||
- avctx->colorspace != AVCOL_SPC_UNSPECIFIED) {
- sde->colour_description = 1;
- sde->colour_primaries = avctx->color_primaries;
- sde->transfer_characteristics = avctx->color_trc;
- sde->matrix_coefficients = avctx->colorspace;
- } else {
- sde->colour_description = 0;
- }
+ avctx->colorspace != AVCOL_SPC_UNSPECIFIED;
sde->display_horizontal_size = avctx->width;
sde->display_vertical_size = avctx->height;
ctx->nb_slices = ctx->slice_block_rows;
ctx->slice_size = 1;
+ ctx->roi_quant_range = 31;
+
return 0;
}
{
VAAPIEncodeMPEG2Context *priv = avctx->priv_data;
- ff_cbs_fragment_free(priv->cbc, &priv->current_fragment);
+ ff_cbs_fragment_free(&priv->current_fragment);
ff_cbs_close(&priv->cbc);
return ff_vaapi_encode_close(avctx);
.version = LIBAVUTIL_VERSION_INT,
};
-AVCodec ff_mpeg2_vaapi_encoder = {
+const AVCodec ff_mpeg2_vaapi_encoder = {
.name = "mpeg2_vaapi",
.long_name = NULL_IF_CONFIG_SMALL("MPEG-2 (VAAPI)"),
.type = AVMEDIA_TYPE_VIDEO,
.id = AV_CODEC_ID_MPEG2VIDEO,
.priv_data_size = sizeof(VAAPIEncodeMPEG2Context),
.init = &vaapi_encode_mpeg2_init,
- .send_frame = &ff_vaapi_encode_send_frame,
.receive_packet = &ff_vaapi_encode_receive_packet,
.close = &vaapi_encode_mpeg2_close,
.priv_class = &vaapi_encode_mpeg2_class,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
+ AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
.defaults = vaapi_encode_mpeg2_defaults,
.pix_fmts = (const enum AVPixelFormat[]) {
AV_PIX_FMT_VAAPI,
AV_PIX_FMT_NONE,
},
+ .hw_configs = ff_vaapi_encode_hw_configs,
.wrapper_name = "vaapi",
};