summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2020-05-20 10:50:05 +0200
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2020-05-21 13:10:57 +0200
commite68fece3e60678ae8def604aa6eaa6e2a1ab8b17 (patch)
tree66bef2e7a867c554757eebb2ffe44003321fe077 /gst
parentcab041f9949a22a6d0f58389b9fddd5bb9b3ea74 (diff)
vaapidecoder: h264: remove baseline as constrained property
From now on always the baseline is going to be treated as constrained without need of setting a property. Since the property was added along the development cycle (1.17 / commit 866a9f06) and never released, we assume that it is safe to remove it. Fixes: #252 Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-vaapi/-/merge_requests/328>
Diffstat (limited to 'gst')
-rw-r--r--gst/vaapi/gstvaapidecode.c10
-rw-r--r--gst/vaapi/gstvaapidecode_props.c18
-rw-r--r--gst/vaapi/gstvaapidecode_props.h1
3 files changed, 3 insertions, 26 deletions
diff --git a/gst/vaapi/gstvaapidecode.c b/gst/vaapi/gstvaapidecode.c
index 68de7e9d..4ce62f29 100644
--- a/gst/vaapi/gstvaapidecode.c
+++ b/gst/vaapi/gstvaapidecode.c
@@ -909,9 +909,6 @@ gst_vaapidecode_create (GstVaapiDecode * decode, GstCaps * caps)
(decode->decoder), priv->is_low_latency);
gst_vaapi_decoder_h264_set_base_only (GST_VAAPI_DECODER_H264
(decode->decoder), priv->base_only);
- gst_vaapi_decoder_h264_set_baseline_as_constrained
- (GST_VAAPI_DECODER_H264 (decode->decoder),
- priv->baseline_as_constrained);
}
}
break;
@@ -1233,8 +1230,6 @@ gst_vaapidecode_ensure_allowed_sinkpad_caps (GstVaapiDecode * decode)
gboolean have_high = FALSE;
gboolean have_mvc = FALSE;
gboolean have_svc = FALSE;
- GstVaapiDecodeH264Private *priv =
- gst_vaapi_decode_h264_get_instance_private (decode);
profiles = gst_vaapi_display_get_decode_profiles (display);
if (!profiles)
@@ -1303,8 +1298,9 @@ gst_vaapidecode_ensure_allowed_sinkpad_caps (GstVaapiDecode * decode)
have_svc |= is_svc_profile (profile);
have_high |= profile == GST_VAAPI_PROFILE_H264_HIGH;
- if (priv && priv->baseline_as_constrained &&
- profile == GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE)
+ /* XXX: artificially adding baseline if constrained_baseline is
+ * available. */
+ if (profile == GST_VAAPI_PROFILE_H264_CONSTRAINED_BASELINE)
allowed_sinkpad_caps =
add_h264_profile_in_caps (allowed_sinkpad_caps, "baseline");
}
diff --git a/gst/vaapi/gstvaapidecode_props.c b/gst/vaapi/gstvaapidecode_props.c
index 5ab28004..dc526776 100644
--- a/gst/vaapi/gstvaapidecode_props.c
+++ b/gst/vaapi/gstvaapidecode_props.c
@@ -30,7 +30,6 @@ enum
{
GST_VAAPI_DECODER_H264_PROP_FORCE_LOW_LATENCY = 1,
GST_VAAPI_DECODER_H264_PROP_BASE_ONLY,
- GST_VAAPI_DECODER_H264_PROP_BASELINE_AS_CONSTRAINED,
};
static gint h264_private_offset;
@@ -50,9 +49,6 @@ gst_vaapi_decode_h264_get_property (GObject * object, guint prop_id,
case GST_VAAPI_DECODER_H264_PROP_BASE_ONLY:
g_value_set_boolean (value, priv->base_only);
break;
- case GST_VAAPI_DECODER_H264_PROP_BASELINE_AS_CONSTRAINED:
- g_value_set_boolean (value, priv->baseline_as_constrained);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -81,13 +77,6 @@ gst_vaapi_decode_h264_set_property (GObject * object, guint prop_id,
if (decoder)
gst_vaapi_decoder_h264_set_base_only (decoder, priv->base_only);
break;
- case GST_VAAPI_DECODER_H264_PROP_BASELINE_AS_CONSTRAINED:
- priv->baseline_as_constrained = g_value_get_boolean (value);
- decoder = GST_VAAPI_DECODER_H264 (GST_VAAPIDECODE (object)->decoder);
- if (decoder)
- gst_vaapi_decoder_h264_set_baseline_as_constrained (decoder,
- priv->baseline_as_constrained);
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -114,13 +103,6 @@ gst_vaapi_decode_h264_install_properties (GObjectClass * klass)
g_param_spec_boolean ("base-only", "Decode base view only",
"Drop any NAL unit not defined in Annex.A", FALSE,
G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
-
- g_object_class_install_property (klass,
- GST_VAAPI_DECODER_H264_PROP_BASELINE_AS_CONSTRAINED,
- g_param_spec_boolean ("baseline-as-constrained",
- "Baseline as Constrained",
- "Assume all baseline content is also constrained.", FALSE,
- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
}
GstVaapiDecodeH264Private *
diff --git a/gst/vaapi/gstvaapidecode_props.h b/gst/vaapi/gstvaapidecode_props.h
index d644fded..b1f2fec6 100644
--- a/gst/vaapi/gstvaapidecode_props.h
+++ b/gst/vaapi/gstvaapidecode_props.h
@@ -34,7 +34,6 @@ struct _GstVaapiDecodeH264Private
{
gboolean is_low_latency;
gboolean base_only;
- gboolean baseline_as_constrained;
};
void