mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-03 13:16:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

vah264enc: Support default and none rate control.

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/2522>
This commit is contained in:
Víctor Manuel Jáquez Leal 2022-05-30 10:20:11 +02:00 committed by GStreamer Marge Bot
parent e27ad1a273
commit 261714e25d
2 changed files with 24 additions and 15 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

@ -923,7 +923,7 @@ gst_va_base_enc_add_rate_control_parameter (GstVaBaseEnc * base,
VAEncMiscParameterRateControl rate_control; VAEncMiscParameterRateControl rate_control;
} rate_control; } rate_control;
if (rc_mode == VA_RC_CQP) if (rc_mode == VA_RC_NONE || rc_mode == VA_RC_CQP)
return TRUE; return TRUE;
window_size = rc_mode == VA_RC_VBR ? max_bitrate_bits / 2 : max_bitrate_bits; window_size = rc_mode == VA_RC_VBR ? max_bitrate_bits / 2 : max_bitrate_bits;
@ -1027,7 +1027,7 @@ gst_va_base_enc_add_hrd_parameter (GstVaBaseEnc * base,
}; };
/* *INDENT-ON* */ /* *INDENT-ON* */
if (rc_mode == VA_RC_CQP || rc_mode == VA_RC_VCM) if (rc_mode == VA_RC_NONE || rc_mode == VA_RC_CQP || rc_mode == VA_RC_VCM)
return TRUE; return TRUE;
if (!gst_va_encoder_add_param (base->encoder, picture, if (!gst_va_encoder_add_param (base->encoder, picture,

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

@ -494,18 +494,22 @@ _ensure_rate_control (GstVaH264Enc * self)
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TARGET_USAGE]); g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TARGET_USAGE]);
} }
/* TODO: find a better heuristics to infer a nearer control mode */ if (self->prop.rc_ctrl != VA_RC_NONE) {
rc_mode = gst_va_encoder_get_rate_control_mode (base->encoder, rc_mode = gst_va_encoder_get_rate_control_mode (base->encoder,
base->profile, base->entrypoint); base->profile, base->entrypoint);
if (!(rc_mode & self->prop.rc_ctrl)) { if (!(rc_mode & self->prop.rc_ctrl)) {
GST_INFO_OBJECT (self, "The rate control mode %s is not supported, " guint32 defval =
"fallback to %s mode", G_PARAM_SPEC_ENUM (properties[PROP_RATE_CONTROL])->default_value;
_rate_control_get_name (self->prop.rc_ctrl), GST_INFO_OBJECT (self, "The rate control mode %s is not supported, "
_rate_control_get_name (VA_RC_CQP)); "fallback to %s mode",
self->rc.rc_ctrl_mode = VA_RC_CQP; _rate_control_get_name (self->prop.rc_ctrl),
_rate_control_get_name (defval));
self->prop.rc_ctrl = self->rc.rc_ctrl_mode; self->rc.rc_ctrl_mode = defval;
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_RATE_CONTROL]); self->prop.rc_ctrl = self->rc.rc_ctrl_mode;
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_RATE_CONTROL]);
}
} else {
self->rc.rc_ctrl_mode = VA_RC_NONE;
} }
if (self->rc.min_qp > self->rc.max_qp) { if (self->rc.min_qp > self->rc.max_qp) {
@ -3038,7 +3042,12 @@ gst_va_h264_enc_init (GTypeInstance * instance, gpointer g_class)
self->prop.bitrate = 0; self->prop.bitrate = 0;
self->prop.target_percentage = 66; self->prop.target_percentage = 66;
self->prop.target_usage = 4; self->prop.target_usage = 4;
self->prop.rc_ctrl = VA_RC_CBR; if (properties[PROP_RATE_CONTROL]) {
self->prop.rc_ctrl =
G_PARAM_SPEC_ENUM (properties[PROP_RATE_CONTROL])->default_value;
} else {
self->prop.rc_ctrl = VA_RC_NONE;
}
self->prop.cpb_size = 0; self->prop.cpb_size = 0;
} }