From 3c479d38e8ab4bc7f49f91438c64495dbd8f0997 Mon Sep 17 00:00:00 2001 From: Eunhye Choi Date: Mon, 26 Jun 2023 21:13:55 +0900 Subject: [PATCH] decodebin3: remove force_sw_decoder property - sync with upstream - force_sw_decoder property has been removed and tizen use other property to control the each stream type - the new interface to select codec type will be added at 1.24 Change-Id: I3b0ae87813a4705acef065a4d7cc8482c9f0da83 --- packaging/gstreamer.spec | 2 +- .../gst-plugins-base/gst/playback/gstdecodebin3.c | 35 ---------------------- .../gst/playback/gsturidecodebin3.c | 30 ------------------- 3 files changed, 1 insertion(+), 66 deletions(-) diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec index 3a0fc3f..fe69ab8 100644 --- a/packaging/gstreamer.spec +++ b/packaging/gstreamer.spec @@ -62,7 +62,7 @@ Name: %{_name} Version: 1.22.0 -Release: 30 +Release: 31 Summary: Streaming-Media Framework Runtime License: LGPL-2.0+ Group: Multimedia/Framework diff --git a/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c b/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c index 9c184ae..061ea30 100644 --- a/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c +++ b/subprojects/gst-plugins-base/gst/playback/gstdecodebin3.c @@ -267,8 +267,6 @@ struct _GstDecodebin3 #ifdef TIZEN_FEATURE_FORCE_SW_DECODER gboolean force_sw_decoders_for_video; gboolean force_sw_decoders_for_audio; -#else - gboolean force_sw_decoders; #endif }; @@ -378,8 +376,6 @@ enum #ifdef TIZEN_FEATURE_FORCE_SW_DECODER PROP_FORCE_SW_DECODERS_FOR_VIDEO, PROP_FORCE_SW_DECODERS_FOR_AUDIO, -#else - PROP_FORCE_SW_DECODERS, #endif }; @@ -610,20 +606,6 @@ gst_decodebin3_class_init (GstDecodebin3Class * klass) "Use only sofware decoders for audio to process streams", DEFAULT_FORCE_SW_DECODERS, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); -#else - /** - * GstDecodeBin::force-sw-decoders: - * - * While auto-plugging, if set to %TRUE, those decoders within - * "Hardware" klass will be ignored. Otherwise they will be tried. - * - * Since: 1.18 - */ - g_object_class_install_property (gobject_klass, PROP_FORCE_SW_DECODERS, - g_param_spec_boolean ("force-sw-decoders", "Software Decoders Only", - "Use only sofware decoders to process streams", - DEFAULT_FORCE_SW_DECODERS, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); #endif /** @@ -723,8 +705,6 @@ gst_decodebin3_init (GstDecodebin3 * dbin) #ifdef TIZEN_FEATURE_FORCE_SW_DECODER dbin->force_sw_decoders_for_video = DEFAULT_FORCE_SW_DECODERS; dbin->force_sw_decoders_for_audio = DEFAULT_FORCE_SW_DECODERS; -#else - dbin->force_sw_decoders = DEFAULT_FORCE_SW_DECODERS; #endif GST_OBJECT_FLAG_SET (dbin, GST_BIN_FLAG_STREAMS_AWARE); @@ -856,10 +836,6 @@ gst_decodebin3_set_property (GObject * object, guint prop_id, case PROP_FORCE_SW_DECODERS_FOR_AUDIO: dbin->force_sw_decoders_for_audio = g_value_get_boolean (value); break; -#else - case PROP_FORCE_SW_DECODERS: - dbin->force_sw_decoders = g_value_get_boolean (value); - break; #endif default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -886,10 +862,6 @@ gst_decodebin3_get_property (GObject * object, guint prop_id, GValue * value, case PROP_FORCE_SW_DECODERS_FOR_AUDIO: g_value_set_boolean (value, dbin->force_sw_decoders_for_audio); break; -#else - case PROP_FORCE_SW_DECODERS: - g_value_set_boolean (value, dbin->force_sw_decoders); - break; #endif default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); @@ -1638,13 +1610,6 @@ gst_decode_bin_update_factories_list (GstDecodebin3 * dbin) } else { GST_WARNING("%s is skipped", GST_OBJECT_NAME(fact)); } -#else - if (!(dbin->force_sw_decoders - && gst_element_factory_list_is_type (fact, - GST_ELEMENT_FACTORY_TYPE_HARDWARE))) { - dbin->decoder_factories = - g_list_append (dbin->decoder_factories, fact); - } #endif } else { dbin->decodable_factories = diff --git a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c index 7a4a2cb..b12407c 100644 --- a/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c +++ b/subprojects/gst-plugins-base/gst/playback/gsturidecodebin3.c @@ -224,7 +224,6 @@ struct _GstURIDecodeBin3 guint buffer_size; /* When buffering, buffer size (bytes) */ gboolean download; gboolean use_buffering; - gboolean force_sw_decoders; guint64 ring_buffer_max_size; gboolean instant_uri; /* Whether URI changes should be applied immediately or not */ @@ -299,7 +298,6 @@ enum #define DEFAULT_BUFFER_SIZE -1 #define DEFAULT_DOWNLOAD FALSE #define DEFAULT_USE_BUFFERING FALSE -#define DEFAULT_FORCE_SW_DECODERS FALSE #define DEFAULT_RING_BUFFER_MAX_SIZE 0 #define DEFAULT_INSTANT_URI FALSE @@ -316,7 +314,6 @@ enum PROP_BUFFER_DURATION, PROP_DOWNLOAD, PROP_USE_BUFFERING, - PROP_FORCE_SW_DECODERS, PROP_RING_BUFFER_MAX_SIZE, PROP_CAPS, PROP_INSTANT_URI @@ -488,21 +485,6 @@ gst_uri_decode_bin3_class_init (GstURIDecodeBin3Class * klass) DEFAULT_USE_BUFFERING, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); /** - * GstURIDecodeBin3::force-sw-decoders: - * - * While auto-plugging, if set to %TRUE, those decoders within - * "Hardware" klass will by tried. Otherwise they will be ignored. - * - * Since: 1.18 - */ - g_object_class_install_property (gobject_class, PROP_FORCE_SW_DECODERS, - g_param_spec_boolean ("force-sw-decoders", "Software Decoders Only", - "Use only sofware decoders to process streams", - DEFAULT_FORCE_SW_DECODERS, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - - /** * GstURIDecodeBin3::ring-buffer-max-size * * The maximum size of the ring buffer in kilobytes. If set to 0, the ring @@ -1539,12 +1521,6 @@ gst_uri_decode_bin3_set_property (GObject * object, guint prop_id, case PROP_USE_BUFFERING: dec->use_buffering = g_value_get_boolean (value); break; - case PROP_FORCE_SW_DECODERS: - if (dec->decodebin) { - g_object_set_property (G_OBJECT (dec->decodebin), "force-sw-decoders", - value); - } - break; case PROP_RING_BUFFER_MAX_SIZE: dec->ring_buffer_max_size = g_value_get_uint64 (value); break; @@ -1639,12 +1615,6 @@ gst_uri_decode_bin3_get_property (GObject * object, guint prop_id, case PROP_USE_BUFFERING: g_value_set_boolean (value, dec->use_buffering); break; - case PROP_FORCE_SW_DECODERS: - if (dec->decodebin) { - g_object_get_property (G_OBJECT (dec->decodebin), "force-sw-decoders", - value); - } - break; case PROP_RING_BUFFER_MAX_SIZE: g_value_set_uint64 (value, dec->ring_buffer_max_size); break; -- 2.7.4