vtenc: Eliminate some needless complex code

We do not need a helper that takes a lock to fetch the values of these
properties. There is no race being prevented.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7232>
This commit is contained in:
Nirbheek Chauhan 2024-07-25 03:04:43 +05:30 committed by GStreamer Marge Bot
parent 3621b82c63
commit 2e39aefe22

View file

@ -526,18 +526,6 @@ gst_vtenc_finalize (GObject * obj)
G_OBJECT_CLASS (parent_class)->finalize (obj); G_OBJECT_CLASS (parent_class)->finalize (obj);
} }
static guint
gst_vtenc_get_bitrate (GstVTEnc * self)
{
guint result;
GST_OBJECT_LOCK (self);
result = self->bitrate;
GST_OBJECT_UNLOCK (self);
return result;
}
static void static void
gst_vtenc_set_bitrate (GstVTEnc * self, guint bitrate) gst_vtenc_set_bitrate (GstVTEnc * self, guint bitrate)
{ {
@ -551,18 +539,6 @@ gst_vtenc_set_bitrate (GstVTEnc * self, guint bitrate)
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
} }
static gboolean
gst_vtenc_get_allow_frame_reordering (GstVTEnc * self)
{
gboolean result;
GST_OBJECT_LOCK (self);
result = self->allow_frame_reordering;
GST_OBJECT_UNLOCK (self);
return result;
}
static void static void
gst_vtenc_set_allow_frame_reordering (GstVTEnc * self, gst_vtenc_set_allow_frame_reordering (GstVTEnc * self,
gboolean allow_frame_reordering) gboolean allow_frame_reordering)
@ -576,18 +552,6 @@ gst_vtenc_set_allow_frame_reordering (GstVTEnc * self,
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
} }
static gboolean
gst_vtenc_get_realtime (GstVTEnc * self)
{
gboolean result;
GST_OBJECT_LOCK (self);
result = self->realtime;
GST_OBJECT_UNLOCK (self);
return result;
}
static void static void
gst_vtenc_set_realtime (GstVTEnc * self, gboolean realtime) gst_vtenc_set_realtime (GstVTEnc * self, gboolean realtime)
{ {
@ -598,18 +562,6 @@ gst_vtenc_set_realtime (GstVTEnc * self, gboolean realtime)
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
} }
static gdouble
gst_vtenc_get_quality (GstVTEnc * self)
{
gdouble result;
GST_OBJECT_LOCK (self);
result = self->quality;
GST_OBJECT_UNLOCK (self);
return result;
}
static void static void
gst_vtenc_set_quality (GstVTEnc * self, gdouble quality) gst_vtenc_set_quality (GstVTEnc * self, gdouble quality)
{ {
@ -623,18 +575,6 @@ gst_vtenc_set_quality (GstVTEnc * self, gdouble quality)
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
} }
static gint
gst_vtenc_get_max_keyframe_interval (GstVTEnc * self)
{
gint result;
GST_OBJECT_LOCK (self);
result = self->max_keyframe_interval;
GST_OBJECT_UNLOCK (self);
return result;
}
static void static void
gst_vtenc_set_max_keyframe_interval (GstVTEnc * self, gint interval) gst_vtenc_set_max_keyframe_interval (GstVTEnc * self, gint interval)
{ {
@ -647,18 +587,6 @@ gst_vtenc_set_max_keyframe_interval (GstVTEnc * self, gint interval)
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
} }
static GstClockTime
gst_vtenc_get_max_keyframe_interval_duration (GstVTEnc * self)
{
GstClockTime result;
GST_OBJECT_LOCK (self);
result = self->max_keyframe_interval_duration;
GST_OBJECT_UNLOCK (self);
return result;
}
static void static void
gst_vtenc_set_max_keyframe_interval_duration (GstVTEnc * self, gst_vtenc_set_max_keyframe_interval_duration (GstVTEnc * self,
GstClockTime interval) GstClockTime interval)
@ -680,23 +608,22 @@ gst_vtenc_get_property (GObject * obj, guint prop_id, GValue * value,
switch (prop_id) { switch (prop_id) {
case PROP_BITRATE: case PROP_BITRATE:
g_value_set_uint (value, gst_vtenc_get_bitrate (self) / 1000); g_value_set_uint (value, self->bitrate / 1000);
break; break;
case PROP_ALLOW_FRAME_REORDERING: case PROP_ALLOW_FRAME_REORDERING:
g_value_set_boolean (value, gst_vtenc_get_allow_frame_reordering (self)); g_value_set_boolean (value, self->allow_frame_reordering);
break; break;
case PROP_REALTIME: case PROP_REALTIME:
g_value_set_boolean (value, gst_vtenc_get_realtime (self)); g_value_set_boolean (value, self->realtime);
break; break;
case PROP_QUALITY: case PROP_QUALITY:
g_value_set_double (value, gst_vtenc_get_quality (self)); g_value_set_double (value, self->quality);
break; break;
case PROP_MAX_KEYFRAME_INTERVAL: case PROP_MAX_KEYFRAME_INTERVAL:
g_value_set_int (value, gst_vtenc_get_max_keyframe_interval (self)); g_value_set_int (value, self->max_keyframe_interval);
break; break;
case PROP_MAX_KEYFRAME_INTERVAL_DURATION: case PROP_MAX_KEYFRAME_INTERVAL_DURATION:
g_value_set_uint64 (value, g_value_set_uint64 (value, self->max_keyframe_interval_duration);
gst_vtenc_get_max_keyframe_interval_duration (self));
break; break;
case PROP_PRESERVE_ALPHA: case PROP_PRESERVE_ALPHA:
g_value_set_boolean (value, self->preserve_alpha); g_value_set_boolean (value, self->preserve_alpha);
@ -1532,8 +1459,7 @@ gst_vtenc_create_session (GstVTEnc * self)
gst_vtenc_session_configure_max_keyframe_interval_duration (self, session, gst_vtenc_session_configure_max_keyframe_interval_duration (self, session,
self->max_keyframe_interval_duration / ((gdouble) GST_SECOND)); self->max_keyframe_interval_duration / ((gdouble) GST_SECOND));
gst_vtenc_session_configure_bitrate (self, session, gst_vtenc_session_configure_bitrate (self, session, self->bitrate);
gst_vtenc_get_bitrate (self));
} }
/* Force encoder to not preserve alpha with 4444(XQ) ProRes formats if /* Force encoder to not preserve alpha with 4444(XQ) ProRes formats if
@ -1584,10 +1510,9 @@ gst_vtenc_create_session (GstVTEnc * self)
g_assert_not_reached (); g_assert_not_reached ();
} }
gst_vtenc_session_configure_realtime (self, session, gst_vtenc_session_configure_realtime (self, session, self->realtime);
gst_vtenc_get_realtime (self));
gst_vtenc_session_configure_allow_frame_reordering (self, session, gst_vtenc_session_configure_allow_frame_reordering (self, session,
gst_vtenc_get_allow_frame_reordering (self)); self->allow_frame_reordering);
gst_vtenc_session_configure_property_double (self, session, gst_vtenc_session_configure_property_double (self, session,
kVTCompressionPropertyKey_Quality, self->quality); kVTCompressionPropertyKey_Quality, self->quality);