From 7d62166098f86dd29befda652a7ed4f31d3263d6 Mon Sep 17 00:00:00 2001 From: Mengkejiergeli Ba Date: Tue, 9 Jan 2024 10:30:00 +0800 Subject: [PATCH] msdk: Remove useless function for vp8dec and vc1dec in windows path Part-of: --- .../gst-plugins-bad/sys/msdk/gstmsdkcaps.c | 20 ------------------- .../gst-plugins-bad/sys/msdk/gstmsdkcaps.h | 3 --- .../gst-plugins-bad/sys/msdk/gstmsdkvc1dec.c | 5 ----- .../gst-plugins-bad/sys/msdk/gstmsdkvp8dec.c | 6 ------ 4 files changed, 34 deletions(-) diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.c index 8c260db9ef..a68adedfc6 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.c +++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.c @@ -2044,26 +2044,6 @@ gst_msdkcaps_set_strings (GstCaps * caps, return TRUE; } -gboolean -gst_msdkcaps_remove_structure (GstCaps * caps, const gchar * features) -{ - guint size; - GstCapsFeatures *f; - - g_return_val_if_fail (GST_IS_CAPS (caps), FALSE); - g_return_val_if_fail (features != NULL, FALSE); - - size = gst_caps_get_size (caps); - f = gst_caps_features_from_string (features); - - for (guint i = 0; i < size; i++) { - if (gst_caps_features_is_equal (f, gst_caps_get_features (caps, i))) - gst_caps_remove_structure (caps, i); - } - - return TRUE; -} - gboolean gst_msdkcaps_video_info_from_caps (const GstCaps * caps, GstVideoInfo * info, guint64 * modifier) diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.h b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.h index b1955e838e..bfeeefbeff 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.h +++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkcaps.h @@ -78,9 +78,6 @@ gboolean gst_msdkcaps_set_strings (GstCaps * caps, const gchar * features, const char * field, const gchar * strings); -gboolean -gst_msdkcaps_remove_structure (GstCaps * caps, const gchar * features); - gboolean gst_msdkcaps_video_info_from_caps (const GstCaps * caps, GstVideoInfo * info, guint64 * modifier); diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvc1dec.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvc1dec.c index eb9b9d4479..78de761496 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvc1dec.c +++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvc1dec.c @@ -243,12 +243,7 @@ gst_msdkvc1dec_register (GstPlugin * plugin, cdata = g_new (MsdkDecCData, 1); cdata->sink_caps = gst_caps_ref (sink_caps); -#ifndef _WIN32 cdata->src_caps = gst_caps_ref (src_caps); -#else - cdata->src_caps = gst_caps_copy (src_caps); - gst_msdkcaps_remove_structure (cdata->src_caps, "memory:D3D11Memory"); -#endif GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED); diff --git a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvp8dec.c b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvp8dec.c index 22ebf76fa6..b509aaf312 100644 --- a/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvp8dec.c +++ b/subprojects/gst-plugins-bad/sys/msdk/gstmsdkvp8dec.c @@ -243,13 +243,7 @@ gst_msdkvp8dec_register (GstPlugin * plugin, cdata = g_new (MsdkDecCData, 1); cdata->sink_caps = gst_caps_ref (sink_caps); - cdata->src_caps = gst_caps_copy (src_caps); -#ifndef _WIN32 cdata->src_caps = gst_caps_ref (src_caps); -#else - cdata->src_caps = gst_caps_copy (src_caps); - gst_msdkcaps_remove_structure (cdata->src_caps, "memory:D3D11Memory"); -#endif GST_MINI_OBJECT_FLAG_SET (cdata->sink_caps, GST_MINI_OBJECT_FLAG_MAY_BE_LEAKED);