gst-plugins-bad: Rename some definitions for TIZEN

__TIZEN__ is renamed and deprecated.

Change-Id: Idcf8fd98c409eb52a61e4f8e7fbc16c92268b09a
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c
index 071a12f..116144c 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c
+++ b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.c
@@ -512,7 +512,7 @@ enum
   PROP_ICE_AGENT,
   PROP_LATENCY,
   PROP_SCTP_TRANSPORT,
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
   PROP_NETSIM,
   PROP_DROP_PROBABILITY_SENDER,
   PROP_DROP_PROBABILITY_RECEIVER
@@ -757,7 +757,7 @@ _remove_pad (GstWebRTCBin * webrtc, GstWebRTCBinPad * pad)
   _remove_pending_pad (webrtc, pad);
 
   gst_element_remove_pad (GST_ELEMENT (webrtc), GST_PAD (pad));
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
   GST_OBJECT_LOCK (webrtc);
   webrtc->priv->max_sink_pad_serial--;
   GST_OBJECT_UNLOCK (webrtc);
@@ -1303,7 +1303,7 @@ _collate_peer_connection_states (GstWebRTCBin * webrtc)
 #undef STATE
 }
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
 static void
 _update_and_notify_ice_gathering_state (GstWebRTCBin * webrtc, GstWebRTCICEGatheringState state)
 {
@@ -1332,7 +1332,7 @@ _update_and_notify_ice_gathering_state (GstWebRTCBin * webrtc, GstWebRTCICEGathe
 static GstStructure *
 _update_ice_gathering_state_task (GstWebRTCBin * webrtc, gpointer data)
 {
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_WEBRTC_MODIFICATION
   GstWebRTCICEGatheringState old_state = webrtc->ice_gathering_state;
 #endif
   GstWebRTCICEGatheringState new_state;
@@ -1347,7 +1347,7 @@ _update_ice_gathering_state_task (GstWebRTCBin * webrtc, gpointer data)
     ICE_LOCK (webrtc);
     if (webrtc->priv->pending_local_ice_candidates->len != 0) {
       /* ICE candidates queued for emissiong -> we're gathering, not complete */
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
       webrtc->pending_ice_gathering_state = GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE;
       GST_INFO_OBJECT (webrtc, "set pending_ice_gathering_state to (%u)",
           webrtc->pending_ice_gathering_state);
@@ -1361,7 +1361,7 @@ _update_ice_gathering_state_task (GstWebRTCBin * webrtc, gpointer data)
     ICE_UNLOCK (webrtc);
   }
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
   _update_and_notify_ice_gathering_state (webrtc, new_state);
 #else
   if (new_state != webrtc->ice_gathering_state) {
@@ -2208,7 +2208,7 @@ _create_webrtc_transceiver (GstWebRTCBin * webrtc,
   return trans;
 }
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
 static void
 _remove_webrtc_transceiver (GstWebRTCBin * webrtc,
     GstWebRTCRTPTransceiver * trans)
@@ -3182,7 +3182,7 @@ _create_offer_task (GstWebRTCBin * webrtc, const GstStructure * options,
 
     reserved_pts = gather_reserved_pts (webrtc);
     if (last_offer && _parse_bundle (last_offer, &last_bundle, NULL)
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_WEBRTC_MODIFICATION
         && last_bundle && last_bundle && last_bundle[0]
 #else
         && last_bundle && last_bundle[0]
@@ -4204,7 +4204,7 @@ out:
   return ret;
 }
 
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
 static void
 _insert_netsim_element_between (GstWebRTCBin * webrtc, GstElement * srcbin,
     const gchar * srcpadname, GstElement * sinkbin, const gchar * sinkpadname,
@@ -4302,7 +4302,7 @@ _connect_input_stream (GstWebRTCBin * webrtc, GstWebRTCBinPad * pad)
     gst_ghost_pad_set_target (GST_GHOST_PAD (pad), sinkpad);
 
     pad_name = g_strdup_printf ("send_rtp_src_%u", pad->trans->mline);
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
     if (webrtc->priv->netsim) {
       _insert_netsim_element_between (webrtc, GST_ELEMENT (webrtc->rtpbin), pad_name,
           GST_ELEMENT (trans->stream->send_bin), "rtp_sink", pad->trans->mline);
@@ -4311,7 +4311,7 @@ _connect_input_stream (GstWebRTCBin * webrtc, GstWebRTCBinPad * pad)
     if (!gst_element_link_pads (GST_ELEMENT (webrtc->rtpbin), pad_name,
             GST_ELEMENT (trans->stream->send_bin), "rtp_sink"))
       g_warn_if_reached ();
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
     }
 #endif
     g_free (pad_name);
@@ -4364,7 +4364,7 @@ _connect_output_stream (GstWebRTCBin * webrtc,
       session_id, stream);
 
   pad_name = g_strdup_printf ("recv_rtp_sink_%u", session_id);
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
   if (webrtc->priv->netsim) {
     _insert_netsim_element_between (webrtc, GST_ELEMENT (stream->receive_bin),
         "rtp_src", GST_ELEMENT (webrtc->rtpbin), pad_name, session_id);
@@ -4373,7 +4373,7 @@ _connect_output_stream (GstWebRTCBin * webrtc,
   if (!gst_element_link_pads (GST_ELEMENT (stream->receive_bin),
           "rtp_src", GST_ELEMENT (webrtc->rtpbin), pad_name))
     g_warn_if_reached ();
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
   }
 #endif
   g_free (pad_name);
@@ -4524,7 +4524,7 @@ _set_rtx_ptmap_from_stream (GstWebRTCBin * webrtc, TransportStream * stream)
       g_object_set (stream->rtxsend, "payload-type-map", pt_map, NULL);
 
     gst_structure_free (pt_map);
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_FIX_MEMORY_LEAK
     g_free (rtx_pt);
 #endif
   }
@@ -5011,7 +5011,7 @@ _connect_rtpfunnel (GstWebRTCBin * webrtc, guint session_id)
   gst_object_unref (rtp_sink);
 
   pad_name = g_strdup_printf ("send_rtp_src_%d", session_id);
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
   if (webrtc->priv->netsim) {
     _insert_netsim_element_between (webrtc, GST_ELEMENT (webrtc->rtpbin), pad_name,
           GST_ELEMENT (stream->send_bin), "rtp_sink", session_id);
@@ -5020,7 +5020,7 @@ _connect_rtpfunnel (GstWebRTCBin * webrtc, guint session_id)
   if (!gst_element_link_pads (GST_ELEMENT (webrtc->rtpbin), pad_name,
           GST_ELEMENT (stream->send_bin), "rtp_sink"))
     g_warn_if_reached ();
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
   }
 #endif
   g_free (pad_name);
@@ -5836,7 +5836,7 @@ _on_local_ice_candidate_task (GstWebRTCBin * webrtc)
   }
   g_array_free (items, TRUE);
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
   if (webrtc->pending_ice_gathering_state == GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE) {
     _update_and_notify_ice_gathering_state (webrtc, GST_WEBRTC_ICE_GATHERING_STATE_COMPLETE);
     webrtc->pending_ice_gathering_state = GST_WEBRTC_ICE_GATHERING_STATE_NEW;
@@ -6042,7 +6042,7 @@ gst_webrtc_bin_create_data_channel (GstWebRTCBin * webrtc, const gchar * label,
   g_return_val_if_fail (GST_IS_WEBRTC_BIN (webrtc), NULL);
   g_return_val_if_fail (label != NULL, NULL);
   g_return_val_if_fail (strlen (label) <= 65535, NULL);
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_WEBRTC_MODIFICATION
   g_return_val_if_fail (webrtc->priv->is_closed != TRUE, NULL);
 #endif
 
@@ -6280,7 +6280,7 @@ on_rtpbin_request_aux_sender (GstElement * rtpbin, guint session_id,
 {
   TransportStream *stream;
   gboolean have_rtx = FALSE;
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_WEBRTC_MODIFICATION
   GstStructure *pt_map = NULL;
 #endif
   GstElement *ret = NULL;
@@ -6290,7 +6290,7 @@ on_rtpbin_request_aux_sender (GstElement * rtpbin, guint session_id,
   if (stream)
     have_rtx = transport_stream_get_pt (stream, "RTX") != 0;
 
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_WEBRTC_MODIFICATION
   GST_LOG_OBJECT (webrtc, "requesting aux sender for stream %" GST_PTR_FORMAT
       " with pt map %" GST_PTR_FORMAT, stream, pt_map);
 #else
@@ -6347,7 +6347,7 @@ on_rtpbin_request_aux_sender (GstElement * rtpbin, guint session_id,
   }
 
 out:
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_WEBRTC_MODIFICATION
   if (pt_map)
     gst_structure_free (pt_map);
 
@@ -6799,7 +6799,7 @@ gst_webrtc_bin_change_state (GstElement * element, GstStateChange transition)
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
       _stop_thread (webrtc);
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
       webrtc->priv->need_negotiation = FALSE;
 #endif
       break;
@@ -7007,7 +7007,7 @@ gst_webrtc_bin_release_pad (GstElement * element, GstPad * pad)
    * a possibly dead transceiver */
   PC_LOCK (webrtc);
   if (webrtc_pad->trans)
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
     _remove_webrtc_transceiver (webrtc, webrtc_pad->trans);
 #else
     gst_object_unref (webrtc_pad->trans);
@@ -7046,7 +7046,7 @@ _update_rtpstorage_latency (GstWebRTCBin * webrtc)
   }
 }
 
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
 static void
 _update_drop_probability (GstWebRTCBin * webrtc, gfloat probability, gboolean sender)
 {
@@ -7100,7 +7100,7 @@ gst_webrtc_bin_set_property (GObject * object, guint prop_id,
       webrtc->priv->jb_latency = g_value_get_uint (value);
       _update_rtpstorage_latency (webrtc);
       break;
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
     case PROP_NETSIM:
       webrtc->priv->netsim = g_value_get_boolean (value);
       _update_drop_probability (webrtc, webrtc->priv->netsim ?
@@ -7194,7 +7194,7 @@ gst_webrtc_bin_get_property (GObject * object, guint prop_id,
     case PROP_SCTP_TRANSPORT:
       g_value_set_object (value, webrtc->priv->sctp_transport);
       break;
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
     case PROP_NETSIM:
       g_value_set_boolean (value, webrtc->priv->netsim);
       break;
@@ -7496,7 +7496,7 @@ gst_webrtc_bin_class_init (GstWebRTCBinClass * klass)
           GST_TYPE_WEBRTC_SCTP_TRANSPORT,
           G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
 
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
   g_object_class_install_property (gobject_class,
       PROP_NETSIM,
       g_param_spec_boolean ("netsim", "Use network simulator",

diff --git a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.h b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.h
index 4aa73cc..a46d0a3 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.h
+++ b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcbin.h
@@ -71,7 +71,7 @@ struct _GstWebRTCBin
 
   GstWebRTCSignalingState           signaling_state;
   GstWebRTCICEGatheringState        ice_gathering_state;
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
   GstWebRTCICEGatheringState        pending_ice_gathering_state;
 #endif
   GstWebRTCICEConnectionState       ice_connection_state;
@@ -145,7 +145,7 @@ struct _GstWebRTCBinPrivate
   GstWebRTCSessionDescription *last_generated_answer;
 
   gboolean tos_attached;
-#ifdef TIZEN_FEATURE_IMPORT_NETSIM
+#ifdef TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM
   gboolean netsim;
   gfloat drop_probability_sender;
   gfloat drop_probability_receiver;

diff --git a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c
index e39f6c0..92b5594 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c
+++ b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c
@@ -639,7 +639,7 @@ gst_webrtc_ice_add_candidate (GstWebRTCICE * ice, GstWebRTCICEStream * stream,
   if (!cand) {
     /* might be a .local candidate */
     char *prefix = NULL, *address = NULL, *postfix = NULL;
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_MEMORY_LEAK
     char *new_addr, *new_candidate;
 #else
     char *new_addr = NULL, *new_candidate = NULL;
@@ -675,7 +675,7 @@ gst_webrtc_ice_add_candidate (GstWebRTCICE * ice, GstWebRTCICEStream * stream,
     cand =
         nice_agent_parse_remote_candidate_sdp (ice->priv->nice_agent,
         item->nice_stream_id, new_candidate);
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_MEMORY_LEAK
     g_free (new_candidate);
 #endif
     if (!cand) {
@@ -684,21 +684,17 @@ gst_webrtc_ice_add_candidate (GstWebRTCICE * ice, GstWebRTCICEStream * stream,
       goto fail;
     }
 
-#ifdef __TIZEN__
-    g_free (new_addr);
-    g_free (new_candidate);
-    g_free (prefix);
+#ifdef TIZEN_FEATURE_MEMORY_LEAK
     g_free (address);
-    g_free (postfix);
-#else
+    g_free (new_candidate);
+#endif
     g_free (prefix);
     g_free (new_addr);
     g_free (postfix);
-#endif
 
     if (0) {
     fail:
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_MEMORY_LEAK
       g_free (new_addr);
       g_free (new_candidate);
 #endif
@@ -1217,7 +1213,7 @@ gst_webrtc_ice_init (GstWebRTCICE * ice)
       g_array_new (FALSE, TRUE, sizeof (struct NiceStreamItem));
   g_array_set_clear_func (ice->priv->nice_stream_map,
       (GDestroyNotify) _clear_ice_stream);
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_WEBRTC_MODIFICATION
   nice_debug_enable (FALSE);
 #endif
 }

diff --git a/subprojects/gst-plugins-bad/ext/webrtc/webrtcdatachannel.c b/subprojects/gst-plugins-bad/ext/webrtc/webrtcdatachannel.c
index 2098069..ffe182e 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/webrtc/webrtcdatachannel.c
+++ b/subprojects/gst-plugins-bad/ext/webrtc/webrtcdatachannel.c
@@ -820,7 +820,7 @@ webrtc_data_channel_send_string (GstWebRTCDataChannel * base_channel,
     ppid = DATA_CHANNEL_PPID_WEBRTC_STRING_EMPTY;
   } else {
     gsize size = strlen (str);
-#ifndef __TIZEN__
+#ifndef TIZEN_FEATURE_FIX_MEMORY_LEAK
     gchar *str_copy = g_strdup (str);
 #else
     gchar *str_copy;
@@ -837,7 +837,7 @@ webrtc_data_channel_send_string (GstWebRTCDataChannel * base_channel,
       return;
     }
 
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_FIX_MEMORY_LEAK
     str_copy = g_strdup (str);
 #endif
     buffer =

diff --git a/subprojects/gst-plugins-bad/ext/webrtc/webrtcsdp.c b/subprojects/gst-plugins-bad/ext/webrtc/webrtcsdp.c
index 4131a35..aa3b501 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/webrtc/webrtcsdp.c
+++ b/subprojects/gst-plugins-bad/ext/webrtc/webrtcsdp.c
@@ -569,7 +569,7 @@ _media_replace_setup (GstSDPMedia * media, GstWebRTCDTLSSetup setup)
       GST_TRACE ("replace setup:%s with setup:%s", attr->value, setup_str);
       gst_sdp_attribute_set (&new_attr, "setup", setup_str);
       gst_sdp_media_replace_attribute (media, i, &new_attr);
-#ifdef __TIZEN__
+#ifdef TIZEN_FEATURE_FIX_MEMORY_LEAK
       g_free (setup_str);
 #endif
       return;

diff --git a/subprojects/gst-plugins-bad/meson.build b/subprojects/gst-plugins-bad/meson.build
index 7409635..9780d25 100644 (file)
--- a/subprojects/gst-plugins-bad/meson.build
+++ b/subprojects/gst-plugins-bad/meson.build
@@ -430,6 +430,11 @@ if host_system == 'android'
 endif
 
 # TIZEN BUILD OPTION
+
+# TIZEN_FEATURE_XXX can be generally used for all of modules in this subproject
+cdata.set('TIZEN_FEATURE_FIX_MEMORY_LEAK', true)
+
+# TIZEN_FEATURE_[MODULE]_XXX should be used for a particular module
 cdata.set('TIZEN_FEATURE_ADAPTIVE_MODIFICATION', true)
 cdata.set('TIZEN_FEATURE_HLSDEMUX_PROPERTY', true)
 cdata.set('TIZEN_FEATURE_HLSDEMUX_EMPTY_VTT', true)
@@ -447,9 +452,10 @@ cdata.set('TIZEN_FEATURE_H264PARSE_MODIFICATION', true)
 cdata.set('TIZEN_FEATURE_AD', true)
 cdata.set('TIZEN_FEATURE_HLSDEMUX_LANG_TAG', true)
 cdata.set('TIZEN_FEATURE_HLSDEMUX_DISCONT', true)
-cdata.set('TIZEN_FEATURE_IMPORT_NETSIM', true)
+cdata.set('TIZEN_FEATURE_WEBRTC_MODIFICATION', true)
+cdata.set('TIZEN_FEATURE_WEBRTC_IMPORT_NETSIM', true)
 cdata.set('TIZEN_FEATURE_PITCH_AUDIO_META', true)
-cdata.set('__TIZEN__', true)
+
 # TIZEN BUILD OPTION end
 
 # Disable compiler warnings for unused variables and args if gst debug system is disabled