Merge branch 'move_subdir_bad' into tizen_gst_1.19.2_mono

[platform/upstream/gstreamer.git] / subprojects / gst-plugins-bad / ext / webrtc / gstwebrtcice.c

diff --git a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c
index 84c4e07..e39f6c0 100644 (file)
--- a/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c
+++ b/subprojects/gst-plugins-bad/ext/webrtc/gstwebrtcice.c
@@ -639,7 +639,11 @@ 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__
     char *new_addr, *new_candidate;
+#else
+    char *new_addr = NULL, *new_candidate = NULL;
+#endif
     char *new_candv[4] = { NULL, };
 
     if (!get_candidate_address (candidate, &prefix, &address, &postfix)) {
@@ -671,19 +675,33 @@ 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__
     g_free (new_candidate);
+#endif
     if (!cand) {
       GST_WARNING_OBJECT (ice, "Could not parse candidate \'%s\'",
           new_candidate);
       goto fail;
     }
 
+#ifdef __TIZEN__
+    g_free (new_addr);
+    g_free (new_candidate);
+    g_free (prefix);
+    g_free (address);
+    g_free (postfix);
+#else
     g_free (prefix);
     g_free (new_addr);
     g_free (postfix);
+#endif
 
     if (0) {
     fail:
+#ifdef __TIZEN__
+      g_free (new_addr);
+      g_free (new_candidate);
+#endif
       g_free (prefix);
       g_free (address);
       g_free (postfix);
@@ -1199,6 +1217,9 @@ 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__
+  nice_debug_enable (FALSE);
+#endif
 }
 
 GstWebRTCICE *