encoder: fix and factor out check for supported rate-control modes.

Cache the first compatible GstVaapiProfile found if the encoder is not
configured yet. Next, factor out the code to check for the supported
rate-control modes by moving out vaGetConfigAttributes() to a separate
function, while also making sure that the attribute type is actually
supported by the encoder.

Also fix the default set of supported rate control modes to not the
"none" variant. It's totally useless to expose it at this point.

diff --git a/gst-libs/gst/vaapi/gstvaapiencoder.c b/gst-libs/gst/vaapi/gstvaapiencoder.c
index 8ec052c29c75b0a952881e5ce86e21e846ae11a3..550e3fa8b53cb35285db685e4aaa726f14d45610 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiencoder.c
+++ b/gst-libs/gst/vaapi/gstvaapiencoder.c
@@ -468,6 +468,72 @@ error_invalid_framerate:
   }
 }
 
+/* Gets a compatible profile for the active codec */
+static GstVaapiProfile
+get_compatible_profile (GstVaapiEncoder * encoder)
+{
+  const GstVaapiEncoderClassData *const cdata =
+      GST_VAAPI_ENCODER_GET_CLASS (encoder)->class_data;
+  GstVaapiProfile profile;
+  GArray *profiles;
+  guint i;
+
+  profiles = gst_vaapi_display_get_encode_profiles (encoder->display);
+  if (!profiles)
+    return GST_VAAPI_PROFILE_UNKNOWN;
+
+  // Pick a profile matching the class codec
+  for (i = 0; i < profiles->len; i++) {
+    profile = g_array_index (profiles, GstVaapiProfile, i);
+    if (gst_vaapi_profile_get_codec (profile) == cdata->codec)
+      break;
+  }
+  if (i == profiles->len)
+    profile = GST_VAAPI_PROFILE_UNKNOWN;
+
+  g_array_unref (profiles);
+  return profile;
+}
+
+/* Gets a supported profile for the active codec */
+static GstVaapiProfile
+get_profile (GstVaapiEncoder * encoder)
+{
+  if (!encoder->profile)
+    encoder->profile = get_compatible_profile (encoder);
+  return encoder->profile;
+}
+
+/* Gets config attribute for the supplied profile */
+static gboolean
+get_config_attribute (GstVaapiEncoder * encoder, VAConfigAttribType type,
+    guint32 * out_value_ptr)
+{
+  GstVaapiProfile profile;
+  VAConfigAttrib attrib;
+  VAStatus status;
+
+  profile = get_profile (encoder);
+  if (!profile)
+    return FALSE;
+
+  GST_VAAPI_DISPLAY_LOCK (encoder->display);
+  attrib.type = type;
+  status =
+      vaGetConfigAttributes (GST_VAAPI_DISPLAY_VADISPLAY (encoder->display),
+      gst_vaapi_profile_get_va_profile (profile), VAEntrypointEncSlice,
+      &attrib, 1);
+  GST_VAAPI_DISPLAY_UNLOCK (encoder->display);
+  if (!vaapi_check_status (status, "vaGetConfigAttributes()"))
+    return FALSE;
+  if (attrib.value == VA_ATTRIB_NOT_SUPPORTED)
+    return FALSE;
+
+  if (out_value_ptr)
+    *out_value_ptr = attrib.value;
+  return TRUE;
+}
+
 /* Determines the set of required packed headers */
 static void
 ensure_packed_headers (GstVaapiEncoder * encoder)
@@ -705,52 +771,26 @@ error_invalid_property:
 }
 
 /* Determine the supported rate control modes */
-static gboolean
+static guint32
 get_rate_control_mask (GstVaapiEncoder * encoder)
 {
   const GstVaapiEncoderClassData *const cdata =
       GST_VAAPI_ENCODER_GET_CLASS (encoder)->class_data;
-  GstVaapiProfile profile;
-  GArray *profiles;
-  guint i, rate_control_mask = 0;
+  guint i, value, rate_control_mask = 0;
 
-  if (encoder->rate_control_mask)
+  if (encoder->got_rate_control_mask)
     return encoder->rate_control_mask;
 
-  profiles = gst_vaapi_display_get_encode_profiles (encoder->display);
-  if (!profiles)
-    goto cleanup;
-
-  // Pick a profile matching the class codec
-  for (i = 0; i < profiles->len; i++) {
-    profile = g_array_index (profiles, GstVaapiProfile, i);
-    if (gst_vaapi_profile_get_codec (profile) == cdata->codec)
-      break;
-  }
-
-  if (i != profiles->len) {
-    VAConfigAttrib attrib;
-    VAStatus status;
-
-    attrib.type = VAConfigAttribRateControl;
-    GST_VAAPI_DISPLAY_LOCK (encoder->display);
-    status =
-        vaGetConfigAttributes (GST_VAAPI_DISPLAY_VADISPLAY (encoder->display),
-        gst_vaapi_profile_get_va_profile (profile), VAEntrypointEncSlice,
-        &attrib, 1);
-    GST_VAAPI_DISPLAY_UNLOCK (encoder->display);
-    if (vaapi_check_status (status, "vaGetConfigAttributes()")) {
-      for (i = 0; i < 32; i++) {
-        if (!(attrib.value & (1 << i)))
-          continue;
-        rate_control_mask |= 1 << to_GstVaapiRateControl (1 << i);
-      }
+  if (get_config_attribute (encoder, VAConfigAttribRateControl, &value)) {
+    for (i = 0; i < 32; i++) {
+      if (!(value & (1U << i)))
+        continue;
+      rate_control_mask |= 1 << to_GstVaapiRateControl (1 << i);
     }
   }
-  g_array_unref (profiles);
   GST_INFO ("supported rate controls: 0x%08x", rate_control_mask);
 
-cleanup:
+  encoder->got_rate_control_mask = TRUE;
   encoder->rate_control_mask = cdata->rate_control_mask & rate_control_mask;
   return encoder->rate_control_mask;
 }

diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
index ec544daf772e8a1acfddb051dd494e018f4a5635..22845e6a263d016f70c93bb7995ed6f58daaf5a8 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_h264.c
@@ -53,8 +53,7 @@
 
 /* Supported set of VA rate controls, within this implementation */
 #define SUPPORTED_RATECONTROLS                          \
-  (GST_VAAPI_RATECONTROL_MASK (NONE) |                  \
-   GST_VAAPI_RATECONTROL_MASK (CQP)  |                  \
+  (GST_VAAPI_RATECONTROL_MASK (CQP)  |                  \
    GST_VAAPI_RATECONTROL_MASK (CBR)  |                  \
    GST_VAAPI_RATECONTROL_MASK (VBR)  |                  \
    GST_VAAPI_RATECONTROL_MASK (VBR_CONSTRAINED))

diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c b/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c
index 95c864de407e71cdb8b1bca04a3bb37f5481979b..d9938cb1841ea165ae8633811b13db26b969d622 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_mpeg2.c
@@ -43,8 +43,7 @@
 
 /* Supported set of VA rate controls, within this implementation */
 #define SUPPORTED_RATECONTROLS                  \
-  (GST_VAAPI_RATECONTROL_MASK (NONE) |          \
-   GST_VAAPI_RATECONTROL_MASK (CQP)  |          \
+  (GST_VAAPI_RATECONTROL_MASK (CQP)  |          \
    GST_VAAPI_RATECONTROL_MASK (CBR))
 
 /* Supported set of tuning options, within this implementation */

diff --git a/gst-libs/gst/vaapi/gstvaapiencoder_priv.h b/gst-libs/gst/vaapi/gstvaapiencoder_priv.h
index 61067588136169fdca071ce6f8e036961f994bdf..96b0d1e402bed6dcba6972ab66fb3f05cb304c72 100644 (file)
--- a/gst-libs/gst/vaapi/gstvaapiencoder_priv.h
+++ b/gst-libs/gst/vaapi/gstvaapiencoder_priv.h
@@ -224,6 +224,8 @@ struct _GstVaapiEncoder
   GstVaapiVideoPool *codedbuf_pool;
   GAsyncQueue *codedbuf_queue;
   guint32 num_codedbuf_queued;
+
+  guint got_rate_control_mask:1;
 };
 
 struct _GstVaapiEncoderClassData