diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2020-05-20 10:50:05 +0200 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2020-05-21 13:10:57 +0200 |
| commit | e68fece3e60678ae8def604aa6eaa6e2a1ab8b17 (patch) | |
| tree | 66bef2e7a867c554757eebb2ffe44003321fe077 /gst-libs | |
| parent | cab041f9949a22a6d0f58389b9fddd5bb9b3ea74 (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-libs')
| -rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder_h264.c | 29 | ||||
| -rw-r--r-- | gst-libs/gst/vaapi/gstvaapidecoder_h264.h | 4 |
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 |