mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 03:31:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

va: encoder: Add in_info field to base encoder

Browse source 
When we consider the DMA kind caps as input, the input_state->info
only contains the video format of GST_VIDEO_FORMAT_DMA_DRM, which
is not enough for va plugins. The new info in base encoder contains
the correct video info after the DMA caps parsing.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5189>
This commit is contained in:
He Junyan 2023-08-15 21:25:41 +08:00 committed by GStreamer Marge Bot
parent 1e381dc1cc
commit 5e6c91579f
4 changed files with 55 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c
View file

@ -729,6 +729,9 @@ gst_va_base_enc_set_format (GstVideoEncoder * venc, GstVideoCodecState * state)
g_return_val_if_fail (state->caps != NULL, FALSE);
if (!gst_va_video_info_from_caps (&base->in_info, NULL, state->caps))
return FALSE;
if (base->input_state)
gst_video_codec_state_unref (base->input_state);
base->input_state = gst_video_codec_state_ref (state);
@ -879,6 +882,7 @@ gst_va_base_enc_init (GstVaBaseEnc * self)
g_queue_init (&self->reorder_list);
g_queue_init (&self->ref_list);
g_queue_init (&self->output_list);
gst_video_info_init (&self->in_info);
self->priv = gst_va_base_enc_get_instance_private (self);
}

1
subprojects/gst-plugins-bad/sys/va/gstvabaseenc.h
View file

@ -65,6 +65,7 @@ struct _GstVaBaseEnc
GQueue output_list;
GstVideoCodecState *input_state;
GstVideoInfo in_info;
/*< private >*/
GstVaBaseEncPrivate *priv;

42
subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
View file

@ -601,8 +601,8 @@ _ensure_rate_control (GstVaH264Enc * self)
factor = (guint64) self->mb_width * self->mb_height * bits_per_mb;
bitrate = gst_util_uint64_scale (factor,
GST_VIDEO_INFO_FPS_N (&base->input_state->info),
GST_VIDEO_INFO_FPS_D (&base->input_state->info)) / 1000;
GST_VIDEO_INFO_FPS_N (&base->in_info),
GST_VIDEO_INFO_FPS_D (&base->in_info)) / 1000;
GST_INFO_OBJECT (self, "target bitrate computed to %u kbps", bitrate);
}
@ -704,8 +704,8 @@ _calculate_level (GstVaH264Enc * self)
PicSizeMbs = self->mb_width * self->mb_height;
MaxDpbMbs = PicSizeMbs * (self->gop.num_ref_frames + 1);
MaxMBPS = gst_util_uint64_scale_int_ceil (PicSizeMbs,
GST_VIDEO_INFO_FPS_N (&base->input_state->info),
GST_VIDEO_INFO_FPS_D (&base->input_state->info));
GST_VIDEO_INFO_FPS_N (&base->in_info),
GST_VIDEO_INFO_FPS_D (&base->in_info));
for (i = 0; i < G_N_ELEMENTS (_va_h264_level_limits); i++) {
const GstVaH264LevelLimits *const limits = &_va_h264_level_limits[i];
@ -949,9 +949,9 @@ _generate_gop_structure (GstVaH264Enc * self)
/* If not set, generate a idr every second */
if (self->gop.idr_period == 0) {
self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->input_state->info)
+ GST_VIDEO_INFO_FPS_D (&base->input_state->info) - 1) /
GST_VIDEO_INFO_FPS_D (&base->input_state->info);
self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->in_info)
+ GST_VIDEO_INFO_FPS_D (&base->in_info) - 1) /
GST_VIDEO_INFO_FPS_D (&base->in_info);
}
/* Do not use a too huge GOP size. */
@ -1346,7 +1346,7 @@ _decide_profile (GstVaH264Enc * self, VAProfile * _profile, guint * _rt_format)
goto out;
}
in_format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
in_format = GST_VIDEO_INFO_FORMAT (&base->in_info);
rt_format = _get_rtformat (self, in_format);
if (!rt_format) {
GST_ERROR_OBJECT (self, "unsupported video format %s",
@ -1538,9 +1538,9 @@ gst_va_h264_enc_reconfig (GstVaBaseEnc * base)
guint max_ref_frames, max_surfaces = 0, rt_format = 0, codedbuf_size;
gint width, height;
width = GST_VIDEO_INFO_WIDTH (&base->input_state->info);
height = GST_VIDEO_INFO_HEIGHT (&base->input_state->info);
format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
width = GST_VIDEO_INFO_WIDTH (&base->in_info);
height = GST_VIDEO_INFO_HEIGHT (&base->in_info);
format = GST_VIDEO_INFO_FORMAT (&base->in_info);
codedbuf_size = base->codedbuf_size;
need_negotiation =
@ -1575,15 +1575,15 @@ gst_va_h264_enc_reconfig (GstVaBaseEnc * base)
self->mb_height = GST_ROUND_UP_16 (base->height) / 16;
/* Frame rate is needed for rate control and PTS setting. */
if (GST_VIDEO_INFO_FPS_N (&base->input_state->info) == 0
|| GST_VIDEO_INFO_FPS_D (&base->input_state->info) == 0) {
if (GST_VIDEO_INFO_FPS_N (&base->in_info) == 0
|| GST_VIDEO_INFO_FPS_D (&base->in_info) == 0) {
GST_INFO_OBJECT (self, "Unknown framerate, just set to 30 fps");
GST_VIDEO_INFO_FPS_N (&base->input_state->info) = 30;
GST_VIDEO_INFO_FPS_D (&base->input_state->info) = 1;
GST_VIDEO_INFO_FPS_N (&base->in_info) = 30;
GST_VIDEO_INFO_FPS_D (&base->in_info) = 1;
}
base->frame_duration = gst_util_uint64_scale (GST_SECOND,
GST_VIDEO_INFO_FPS_D (&base->input_state->info),
GST_VIDEO_INFO_FPS_N (&base->input_state->info));
GST_VIDEO_INFO_FPS_D (&base->in_info),
GST_VIDEO_INFO_FPS_N (&base->in_info));
GST_DEBUG_OBJECT (self, "resolution:%dx%d, MB size: %dx%d,"
" frame duration is %" GST_TIME_FORMAT,
@ -2180,10 +2180,10 @@ _fill_sequence_param (GstVaH264Enc * self,
},
.aspect_ratio_idc = 0xff,
/* FIXME: what if no framerate info is provided */
.sar_width = GST_VIDEO_INFO_PAR_N (&base->input_state->info),
.sar_height = GST_VIDEO_INFO_PAR_D (&base->input_state->info),
.num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->input_state->info),
.time_scale = GST_VIDEO_INFO_FPS_N (&base->input_state->info) * 2,
.sar_width = GST_VIDEO_INFO_PAR_N (&base->in_info),
.sar_height = GST_VIDEO_INFO_PAR_D (&base->in_info),
.num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->in_info),
.time_scale = GST_VIDEO_INFO_FPS_N (&base->in_info) * 2,
};
/* *INDENT-ON* */

58
subprojects/gst-plugins-bad/sys/va/gstvah265enc.c
View file

@ -1415,11 +1415,11 @@ _h265_fill_sequence_parameter (GstVaH265Enc * self,
},
/* if (vui_fields.bits.aspect_ratio_info_present_flag) */
.aspect_ratio_idc = 0xff,
.sar_width = GST_VIDEO_INFO_PAR_N (&base->input_state->info),
.sar_height = GST_VIDEO_INFO_PAR_D (&base->input_state->info),
.sar_width = GST_VIDEO_INFO_PAR_N (&base->in_info),
.sar_height = GST_VIDEO_INFO_PAR_D (&base->in_info),
/* if (vui_fields.bits.vui_timing_info_present_flag) */
.vui_num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->input_state->info),
.vui_time_scale = GST_VIDEO_INFO_FPS_N (&base->input_state->info),
.vui_num_units_in_tick = GST_VIDEO_INFO_FPS_D (&base->in_info),
.vui_time_scale = GST_VIDEO_INFO_FPS_N (&base->in_info),
.scc_fields.bits.palette_mode_enabled_flag = _is_scc_enabled (self),
};
/* *INDENT-ON* */
@ -2662,7 +2662,7 @@ _h265_decide_profile (GstVaH265Enc * self, VAProfile * _profile,
goto out;
}
in_format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
in_format = GST_VIDEO_INFO_FORMAT (&base->in_info);
rt_format = _h265_get_rtformat (self, in_format, &depth, &chrome);
if (!rt_format) {
GST_ERROR_OBJECT (self, "unsupported video format %s",
@ -3330,7 +3330,7 @@ _h265_ensure_rate_control (GstVaH265Enc * self)
guint bits_per_pix;
if (!_h265_get_rtformat (self,
GST_VIDEO_INFO_FORMAT (&base->input_state->info), &depth, &chrome))
GST_VIDEO_INFO_FORMAT (&base->in_info), &depth, &chrome))
g_assert_not_reached ();
if (chrome == 3) {
@ -3344,8 +3344,8 @@ _h265_ensure_rate_control (GstVaH265Enc * self)
factor = (guint64) self->luma_width * self->luma_height * bits_per_pix / 16;
bitrate = gst_util_uint64_scale (factor,
GST_VIDEO_INFO_FPS_N (&base->input_state->info),
GST_VIDEO_INFO_FPS_D (&base->input_state->info)) / 1000;
GST_VIDEO_INFO_FPS_N (&base->in_info),
GST_VIDEO_INFO_FPS_D (&base->in_info)) / 1000;
GST_INFO_OBJECT (self, "target bitrate computed to %u kbps", bitrate);
@ -3423,8 +3423,8 @@ _h265_calculate_tier_level (GstVaH265Enc * self)
PicSizeInSamplesY = self->luma_width * self->luma_height;
LumaSr = gst_util_uint64_scale_int_ceil (PicSizeInSamplesY,
GST_VIDEO_INFO_FPS_N (&base->input_state->info),
GST_VIDEO_INFO_FPS_D (&base->input_state->info));
GST_VIDEO_INFO_FPS_N (&base->in_info),
GST_VIDEO_INFO_FPS_D (&base->in_info));
for (i = 0; i < G_N_ELEMENTS (_va_h265_level_limits); i++) {
const GstVaH265LevelLimits *const limits = &_va_h265_level_limits[i];
@ -3648,7 +3648,7 @@ _h265_calculate_coded_size (GstVaH265Enc * self)
guint chrome, depth;
if (!_h265_get_rtformat (self,
GST_VIDEO_INFO_FORMAT (&base->input_state->info), &depth, &chrome))
GST_VIDEO_INFO_FORMAT (&base->in_info), &depth, &chrome))
g_assert_not_reached ();
switch (chrome) {
@ -3734,9 +3734,9 @@ _h265_generate_gop_structure (GstVaH265Enc * self)
/* If not set, generate a idr every second */
if (self->gop.idr_period == 0) {
self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->input_state->info)
+ GST_VIDEO_INFO_FPS_D (&base->input_state->info) - 1) /
GST_VIDEO_INFO_FPS_D (&base->input_state->info);
self->gop.idr_period = (GST_VIDEO_INFO_FPS_N (&base->in_info)
+ GST_VIDEO_INFO_FPS_D (&base->in_info) - 1) /
GST_VIDEO_INFO_FPS_D (&base->in_info);
}
/* Do not use a too huge GOP size. */
@ -4410,9 +4410,9 @@ gst_va_h265_enc_reconfig (GstVaBaseEnc * base)
guint max_ref_frames, max_surfaces = 0, rt_format = 0, codedbuf_size;
gint width, height;
width = GST_VIDEO_INFO_WIDTH (&base->input_state->info);
height = GST_VIDEO_INFO_HEIGHT (&base->input_state->info);
format = GST_VIDEO_INFO_FORMAT (&base->input_state->info);
width = GST_VIDEO_INFO_WIDTH (&base->in_info);
height = GST_VIDEO_INFO_HEIGHT (&base->in_info);
format = GST_VIDEO_INFO_FORMAT (&base->in_info);
codedbuf_size = base->codedbuf_size;
need_negotiation =
@ -4452,7 +4452,7 @@ gst_va_h265_enc_reconfig (GstVaBaseEnc * base)
static const guint SubWidthC[] = { 1, 2, 2, 1 };
static const guint SubHeightC[] = { 1, 2, 1, 1 };
guint index = _get_chroma_format_idc (gst_va_chroma_from_video_format
(GST_VIDEO_INFO_FORMAT (&base->input_state->info)));
(GST_VIDEO_INFO_FORMAT (&base->in_info)));
self->conformance_window_flag = 1;
self->conf_win_left_offset = 0;
@ -4471,16 +4471,16 @@ gst_va_h265_enc_reconfig (GstVaBaseEnc * base)
return FALSE;
self->bits_depth_luma_minus8 =
GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 0);
GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 0);
self->bits_depth_luma_minus8 -= 8;
if (GST_VIDEO_FORMAT_INFO_N_COMPONENTS (base->input_state->info.finfo)) {
if (GST_VIDEO_FORMAT_INFO_N_COMPONENTS (base->in_info.finfo)) {
self->bits_depth_chroma_minus8 =
GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 1);
GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 1);
if (self->bits_depth_chroma_minus8 <
GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 2))
GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 2))
self->bits_depth_chroma_minus8 =
GST_VIDEO_FORMAT_INFO_DEPTH (base->input_state->info.finfo, 2);
GST_VIDEO_FORMAT_INFO_DEPTH (base->in_info.finfo, 2);
self->bits_depth_chroma_minus8 -= 8;
} else {
@ -4488,15 +4488,15 @@ gst_va_h265_enc_reconfig (GstVaBaseEnc * base)
}
/* Frame rate is needed for rate control and PTS setting. */
if (GST_VIDEO_INFO_FPS_N (&base->input_state->info) == 0
|| GST_VIDEO_INFO_FPS_D (&base->input_state->info) == 0) {
if (GST_VIDEO_INFO_FPS_N (&base->in_info) == 0
|| GST_VIDEO_INFO_FPS_D (&base->in_info) == 0) {
GST_INFO_OBJECT (self, "Unknown framerate, just set to 30 fps");
GST_VIDEO_INFO_FPS_N (&base->input_state->info) = 30;
GST_VIDEO_INFO_FPS_D (&base->input_state->info) = 1;
GST_VIDEO_INFO_FPS_N (&base->in_info) = 30;
GST_VIDEO_INFO_FPS_D (&base->in_info) = 1;
}
base->frame_duration = gst_util_uint64_scale (GST_SECOND,
GST_VIDEO_INFO_FPS_D (&base->input_state->info),
GST_VIDEO_INFO_FPS_N (&base->input_state->info));
GST_VIDEO_INFO_FPS_D (&base->in_info),
GST_VIDEO_INFO_FPS_N (&base->in_info));
GST_DEBUG_OBJECT (self, "resolution:%dx%d, CTU size: %dx%d,"
" frame duration is %" GST_TIME_FORMAT,