2 files changed, 5 insertions, 28 deletions
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
index 48f72d20..4c64d5e4 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.c
@@ -537,7 +537,6 @@ struct _GstVaapiDecoderH264Private
 
   gboolean force_low_latency;
   gboolean base_only;
-  gboolean baseline_as_constrained;
 };
 
 /**
@@ -1474,11 +1473,11 @@ get_profile (GstVaapiDecoderH264 * decoder, GstH264SPS * sps, guint dpb_size)
   fill_profiles (profiles, &n_profiles, profile);
   switch (profile) {
     case GST_VAAPI_PROFILE_H264_BASELINE:
-      if (priv->baseline_as_constrained || sps->constraint_set1_flag) { // A.2.2 (main profile)
-        fill_profiles (profiles, &n_profiles,
-            GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE);
-        fill_profiles (profiles, &n_profiles, GST_VAAPI_PROFILE_H264_MAIN);
-      }
+      GST_INFO ("Baseline stream to be processed as Constrained-Baseline or "
+          "Main");
+      fill_profiles (profiles, &n_profiles,
+          GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE);
+      fill_profiles (profiles, &n_profiles, GST_VAAPI_PROFILE_H264_MAIN);
       break;
     case GST_VAAPI_PROFILE_H264_EXTENDED:
       if (sps->constraint_set1_flag) {  // A.2.2 (main profile)
@@ -4802,24 +4801,6 @@ gst_vaapi_decoder_h264_set_base_only (GstVaapiDecoderH264 * decoder,
 }
 
 /**
- * gst_vaapi_decoder_h264_set_baseline_as_constrained:
- * @decoder: a #GstVaapiDecoderH264
- * @baseline_as_constrained: %TRUE to assume all baseline is constrained
- *
- * This is a small hack that makes the decoder assumes that baseline contents
- * is already constrained. This may allow decoding some streams that would
- * otherwise fails to negotiation.
- */
-void
-gst_vaapi_decoder_h264_set_baseline_as_constrained (GstVaapiDecoderH264 *
-    decoder, gboolean baseline_as_constrained)
-{
-  g_return_if_fail (decoder != NULL);
-
-  decoder->priv.baseline_as_constrained = baseline_as_constrained;
-}
-
-/**
  * gst_vaapi_decoder_h264_set_low_latency:
  * @decoder: a #GstVaapiDecoderH264
  * @force_low_latency: %TRUE if force low latency
diff --git a/gst-libs/gst/vaapi/gstvaapidecoder_h264.h b/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
index 08ce6faa..fd3f6c4b 100644
--- a/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
+++ b/gst-libs/gst/vaapi/gstvaapidecoder_h264.h
@@ -73,10 +73,6 @@ void
 gst_vaapi_decoder_h264_set_base_only(GstVaapiDecoderH264 * decoder,
     gboolean base_only);
 
-void
-gst_vaapi_decoder_h264_set_baseline_as_constrained(GstVaapiDecoderH264 * decoder,
-    gboolean baseline_as_constrained);
-
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(GstVaapiDecoderH264, gst_object_unref)
 
 G_END_DECLS