From 7e50a49cb3e03df960313de95ab031240eb8885a Mon Sep 17 00:00:00 2001 From: Eunhye Choi Date: Thu, 23 Feb 2023 17:26:31 +0900 Subject: [PATCH] bad: fix svace issue - build option will be removed after contribution to upstream Change-Id: I6b99117c49dc76d7b1cb604359576347b6f6749f --- packaging/gstreamer.spec | 2 +- subprojects/gst-plugins-bad/ext/srt/gstsrtobject.c | 6 ++++++ .../gst-plugins-bad/ext/webrtc/gstwebrtcbin.c | 8 ++++++-- .../gst-plugins-bad/gst-libs/gst/webrtc/nice/nice.c | 4 ++++ subprojects/gst-plugins-bad/gst/id3tag/id3tag.c | 21 ++++++++++++++++++++- .../gst-plugins-bad/gst/jpegformat/gstjpegparse.c | 5 +++++ subprojects/gst-plugins-bad/meson.build | 1 + subprojects/gst-plugins-good/meson.build | 1 - .../gst-plugins-good/sys/v4l2/gstv4l2videodec.c | 7 ------- 9 files changed, 43 insertions(+), 12 deletions(-) diff --git a/packaging/gstreamer.spec b/packaging/gstreamer.spec index 353b9e4..eefdc22 100644 --- a/packaging/gstreamer.spec +++ b/packaging/gstreamer.spec @@ -62,7 +62,7 @@ Name: %{_name} Version: 1.22.0 -Release: 16 +Release: 17 Summary: Streaming-Media Framework Runtime License: LGPL-2.0+ Group: Multimedia/Framework diff --git a/subprojects/gst-plugins-bad/ext/srt/gstsrtobject.c b/subprojects/gst-plugins-bad/ext/srt/gstsrtobject.c index 93260a6..05adc36 100644 --- a/subprojects/gst-plugins-bad/ext/srt/gstsrtobject.c +++ b/subprojects/gst-plugins-bad/ext/srt/gstsrtobject.c @@ -430,6 +430,9 @@ gst_srt_object_set_property_helper (GstSRTObject * srtobject, break; case PROP_AUTHENTICATION: srtobject->authentication = g_value_get_boolean (value); +#ifdef TIZEN_FEATURE_BUG_FIX + break; +#endif case PROP_AUTO_RECONNECT: srtobject->auto_reconnect = g_value_get_boolean (value); break; @@ -547,6 +550,9 @@ gst_srt_object_get_property_helper (GstSRTObject * srtobject, break; case PROP_AUTHENTICATION: g_value_set_boolean (value, srtobject->authentication); +#ifdef TIZEN_FEATURE_BUG_FIX + break; +#endif case PROP_AUTO_RECONNECT: GST_OBJECT_LOCK (srtobject->element); g_value_set_boolean (value, srtobject->auto_reconnect); diff --git a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c index b7054fd..75ce250 100644 --- a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c +++ b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c @@ -5592,11 +5592,15 @@ ensure_rtx_hdr_ext (TransportStream * stream) g_warn_if_reached (); gst_rtp_header_extension_set_id (stream->rtxreceive_stream_id, stream->rtphdrext_id_stream_id); - +#ifdef TIZEN_FEATURE_BUG_FIX + GST_DEBUG_OBJECT (stream, "adding rtp header extension %" GST_PTR_FORMAT + " with id %u to %" GST_PTR_FORMAT, stream->rtxreceive_stream_id, + stream->rtphdrext_id_stream_id, stream->rtxreceive); +#else GST_DEBUG_OBJECT (stream, "adding rtp header extension %" GST_PTR_FORMAT " with id %u to %" GST_PTR_FORMAT, stream->rtxsend_stream_id, stream->rtphdrext_id_stream_id, stream->rtxreceive); - +#endif g_signal_emit_by_name (stream->rtxreceive, "add-extension", stream->rtxreceive_stream_id); } diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/nice/nice.c b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/nice/nice.c index 74e0d84..8ebfd74 100644 --- a/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/nice/nice.c +++ b/subprojects/gst-plugins-bad/gst-libs/gst/webrtc/nice/nice.c @@ -764,7 +764,11 @@ on_candidate_resolved (GstWebRTCICE * ice, GAsyncResult * res, rc->nice_stream_id, new_candidate); g_free (new_candidate); if (!cand) { +#ifdef TIZEN_FEATURE_BUG_FIX + GST_WARNING_OBJECT (ice, "Could not parse candidate"); +#else GST_WARNING_OBJECT (ice, "Could not parse candidate \'%s\'", new_candidate); +#endif return; } diff --git a/subprojects/gst-plugins-bad/gst/id3tag/id3tag.c b/subprojects/gst-plugins-bad/gst/id3tag/id3tag.c index c3251ee..0f65df2 100644 --- a/subprojects/gst-plugins-bad/gst/id3tag/id3tag.c +++ b/subprojects/gst-plugins-bad/gst/id3tag/id3tag.c @@ -709,7 +709,26 @@ add_comment_tag (GstId3v2Tag * id3v2tag, const GstTagList * list, desc = g_strdup ("Comment"); val = g_strdup (s); } +#ifdef TIZEN_FEATURE_BUG_FIX + /* If we don't have a valid language, match what taglib does for + unknown languages */ + if (!lang || strlen (lang) < 3) { + g_free (lang); + lang = g_strdup ("XXX"); + } + desclen = strlen (desc); + if (!g_utf8_validate (desc, desclen, NULL)) { + g_free (desc); + return; + } + + vallen = strlen (val); + if (!g_utf8_validate (val, vallen, NULL)) { + g_free (val); + return; + } +#else /* If we don't have a valid language, match what taglib does for unknown languages */ if (!lang || strlen (lang) < 3) @@ -719,7 +738,7 @@ add_comment_tag (GstId3v2Tag * id3v2tag, const GstTagList * list, g_return_if_fail (g_utf8_validate (desc, desclen, NULL)); vallen = strlen (val); g_return_if_fail (g_utf8_validate (val, vallen, NULL)); - +#endif GST_LOG ("%s[%u] = '%s' (%s|%s|%s)", tag, n, s, GST_STR_NULL (desc), GST_STR_NULL (lang), GST_STR_NULL (val)); diff --git a/subprojects/gst-plugins-bad/gst/jpegformat/gstjpegparse.c b/subprojects/gst-plugins-bad/gst/jpegformat/gstjpegparse.c index 81c31d7..5a645c2 100644 --- a/subprojects/gst-plugins-bad/gst/jpegformat/gstjpegparse.c +++ b/subprojects/gst-plugins-bad/gst/jpegformat/gstjpegparse.c @@ -614,8 +614,13 @@ gst_jpeg_parse_set_new_caps (GstJpegParse * parse) if (parse->width > 0) gst_caps_set_simple (caps, "width", G_TYPE_INT, parse->width, NULL); +#ifdef TIZEN_FEATURE_BUG_FIX + if (parse->height > 0) + gst_caps_set_simple (caps, "height", G_TYPE_INT, parse->height, NULL); +#else if (parse->width > 0) gst_caps_set_simple (caps, "height", G_TYPE_INT, parse->height, NULL); +#endif if (parse->sof >= 0) gst_caps_set_simple (caps, "sof-marker", G_TYPE_INT, parse->sof, NULL); if (parse->colorspace != GST_JPEG_COLORSPACE_NONE) { diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build index 9cd1106..af471bc 100644 --- a/subprojects/gst-plugins-bad/meson.build +++ b/subprojects/gst-plugins-bad/meson.build @@ -506,6 +506,7 @@ cdata.set('TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM', true) cdata.set('TIZEN_FEATURE_WEBRTC_SSRC_TIMEOUT_NOTIFICATION', true) cdata.set('TIZEN_FEATURE_PITCH_AUDIO_META', true) cdata.set('TIZEN_FEATURE_SRT_LATENCY', true) +cdata.set('TIZEN_FEATURE_BUG_FIX', true) if get_option('tv-profile') cdata.set('TIZEN_PROFILE_TV', true) cdata.set('TIZEN_FEATURE_TRUSTZONE', true) diff --git a/subprojects/gst-plugins-good/meson.build b/subprojects/gst-plugins-good/meson.build index 9c98039..c9725be 100644 --- a/subprojects/gst-plugins-good/meson.build +++ b/subprojects/gst-plugins-good/meson.build @@ -467,7 +467,6 @@ cdata.set('TIZEN_FEATURE_PULSE_MODIFICATION', true) cdata.set('TIZEN_FEATURE_V4L2_SKIP_ADD_COLORSPACE', true) cdata.set('TIZEN_FEATURE_GST_MUX_ENHANCEMENT', true) cdata.set('TIZEN_FEATURE_V4L2_DISABLE_COLORIMETRY', true) -cdata.set('TIZEN_FEATURE_V4L2_DECODER_DRC_SUPPORT', true) cdata.set('TIZEN_FEATURE_POST_VARIANT_INFO', true) if get_option('tv-profile') diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c index cfb95ae..9d2ae64 100644 --- a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c +++ b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2videodec.c @@ -833,13 +833,6 @@ gst_v4l2_video_dec_loop (GstVideoDecoder * decoder) return; } } while (ret == GST_V4L2_FLOW_CORRUPTED_BUFFER); -#ifdef TIZEN_FEATURE_V4L2_DECODER_DRC_SUPPORT - if (ret == GST_V4L2_FLOW_RESOLUTION_CHANGE) { - GST_WARNING_OBJECT (decoder, "Received resolution change"); - g_atomic_int_set (&self->capture_configuration_change, TRUE); - return; - } -#endif if (ret != GST_FLOW_OK) goto beach; -- 2.7.4