webrtc/webrtc_source: Print webrtc handle pointer address

[Version] 0.2.121
[Issue Type] Log

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

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index 02acb1d8492c06dd8bda38705355fc1be29c173a..4e25790bc527c41fffa1ae629ca98b76ce232697 100644 (file)
--- a/packaging/capi-media-webrtc.spec
+++ b/packaging/capi-media-webrtc.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-webrtc
 Summary:    A WebRTC library in Tizen Native API
-Version:    0.2.120
+Version:    0.2.121
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc.c b/src/webrtc.c
index a045a8e9ad5a9cc34c836f1e8b34d3d6c1d538f6..822fc9c60879ba82443e73783c47b96a51efd3fa 100644 (file)
--- a/src/webrtc.c
+++ b/src/webrtc.c
@@ -41,7 +41,7 @@ int webrtc_set_error_cb(webrtc_h webrtc, webrtc_error_cb callback, void *user_da
        _webrtc->error_cb.callback = callback;
        _webrtc->error_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -59,8 +59,8 @@ int webrtc_unset_error_cb(webrtc_h webrtc)
 
        RET_VAL_IF(_webrtc->error_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->error_cb.callback, _webrtc->error_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->error_cb.callback, _webrtc->error_cb.user_data);
 
        _webrtc->error_cb.callback = NULL;
        _webrtc->error_cb.user_data = NULL;
@@ -208,7 +208,7 @@ int webrtc_set_state_changed_cb(webrtc_h webrtc, webrtc_state_changed_cb callbac
        _webrtc->state_changed_cb.callback = callback;
        _webrtc->state_changed_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -226,8 +226,8 @@ int webrtc_unset_state_changed_cb(webrtc_h webrtc)
 
        RET_VAL_IF(_webrtc->state_changed_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->state_changed_cb.callback, _webrtc->state_changed_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->state_changed_cb.callback, _webrtc->state_changed_cb.user_data);
 
        _webrtc->state_changed_cb.callback = NULL;
        _webrtc->state_changed_cb.user_data = NULL;
@@ -246,7 +246,7 @@ int webrtc_get_state(webrtc_h webrtc, webrtc_state_e *state)
 
        *state = _webrtc->state;
 
-       LOG_INFO("state[%d]", *state);
+       LOG_INFO("webrtc[%p] state[%d]", webrtc, *state);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -276,7 +276,7 @@ int webrtc_add_media_source(webrtc_h webrtc, webrtc_media_source_type_e type, un
 
        ret = _add_media_source(webrtc, type, source_id);
        if (ret == WEBRTC_ERROR_NONE)
-               LOG_INFO("source_id[%u]", *source_id);
+               LOG_INFO("webrtc[%p] source_id[%u]", webrtc, *source_id);
 
        return ret;
 }
@@ -295,7 +295,7 @@ int webrtc_remove_media_source(webrtc_h webrtc, unsigned int source_id)
 
        ret = _remove_media_source(webrtc, source_id);
        if (ret == WEBRTC_ERROR_NONE)
-               LOG_INFO("source_id[%u]", source_id);
+               LOG_INFO("webrtc[%p] source_id[%u]", webrtc, source_id);
 
        return ret;
 }
@@ -314,7 +314,7 @@ int webrtc_media_source_set_transceiver_direction(webrtc_h webrtc, unsigned int
 
        ret = _set_transceiver_direction(webrtc, source_id, media_type, direction);
        if (ret == WEBRTC_ERROR_NONE)
-               LOG_INFO("source_id[%u] media_type[%d] direction[%d]", source_id, media_type, direction);
+               LOG_INFO("webrtc[%p] source_id[%u] media_type[%d] direction[%d]", webrtc, source_id, media_type, direction);
 
        return ret;
 }
@@ -331,7 +331,7 @@ int webrtc_media_source_get_transceiver_direction(webrtc_h webrtc, unsigned int
 
        ret = _get_transceiver_direction(webrtc, source_id, media_type, direction);
        if (ret == WEBRTC_ERROR_NONE)
-               LOG_INFO("source_id[%u] media_type[%d] direction[%d]", source_id, media_type, *direction);
+               LOG_INFO("webrtc[%p] source_id[%u] media_type[%d] direction[%d]", webrtc, source_id, media_type, *direction);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -397,9 +397,6 @@ int webrtc_media_source_set_mute(webrtc_h webrtc, unsigned int source_id, webrtc
 
        g_mutex_unlock(&_webrtc->mutex);
 
-       if (ret != WEBRTC_ERROR_NONE)
-               LOG_ERROR("fail to set media source mute. source_id[%u] media_type[%d] mute[%d]", source_id, media_type, mute);
-
        return ret;
 }
 
@@ -429,9 +426,6 @@ int webrtc_media_source_get_mute(webrtc_h webrtc, unsigned int source_id, webrtc
 
        g_mutex_unlock(&_webrtc->mutex);
 
-       if (ret != WEBRTC_ERROR_NONE)
-               LOG_ERROR("fail to get media source muted. source_id[%u] media_type[%d]", source_id, media_type);
-
        return ret;
 }
 
@@ -511,7 +505,7 @@ int webrtc_media_packet_source_set_buffer_state_changed_cb(webrtc_h webrtc, unsi
        source->buffer_state_changed_cb.callback = callback;
        source->buffer_state_changed_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -534,8 +528,8 @@ int webrtc_media_packet_source_unset_buffer_state_changed_cb(webrtc_h webrtc, un
        RET_VAL_IF(source->buffer_state_changed_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION,
                "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               source->buffer_state_changed_cb.callback, source->buffer_state_changed_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, source->buffer_state_changed_cb.callback, source->buffer_state_changed_cb.user_data);
 
        source->buffer_state_changed_cb.callback = NULL;
        source->buffer_state_changed_cb.user_data = NULL;
@@ -558,7 +552,7 @@ int webrtc_media_packet_source_set_format(webrtc_h webrtc, unsigned int source_i
 
        ret = _set_media_format(_webrtc, source_id, format);
        if (ret == WEBRTC_ERROR_NONE)
-               LOG_INFO("source_id[%u] format[%p]", source_id, format);
+               LOG_INFO("webrtc[%p] source_id[%u] format[%p]", webrtc, source_id, format);
 
        return ret;
 }
@@ -734,7 +728,7 @@ int webrtc_set_encoded_audio_frame_cb(webrtc_h webrtc, webrtc_encoded_frame_cb c
        _webrtc->encoded_audio_frame_cb.callback = callback;
        _webrtc->encoded_audio_frame_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -751,8 +745,8 @@ int webrtc_unset_encoded_audio_frame_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->encoded_audio_frame_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
        RET_VAL_IF(_webrtc->state == WEBRTC_STATE_PLAYING, WEBRTC_ERROR_INVALID_STATE, "the state should NOT be PLAYING");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->encoded_audio_frame_cb.callback, _webrtc->encoded_audio_frame_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->encoded_audio_frame_cb.callback, _webrtc->encoded_audio_frame_cb.user_data);
 
        _webrtc->encoded_audio_frame_cb.callback = NULL;
        _webrtc->encoded_audio_frame_cb.user_data = NULL;
@@ -777,7 +771,7 @@ int webrtc_set_encoded_video_frame_cb(webrtc_h webrtc, webrtc_encoded_frame_cb c
        _webrtc->encoded_video_frame_cb.callback = callback;
        _webrtc->encoded_video_frame_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -794,8 +788,8 @@ int webrtc_unset_encoded_video_frame_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->encoded_video_frame_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
        RET_VAL_IF(_webrtc->state == WEBRTC_STATE_PLAYING, WEBRTC_ERROR_INVALID_STATE, "the state should NOT be PLAYING");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->encoded_video_frame_cb.callback, _webrtc->encoded_video_frame_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->encoded_video_frame_cb.callback, _webrtc->encoded_video_frame_cb.user_data);
 
        _webrtc->encoded_video_frame_cb.callback = NULL;
        _webrtc->encoded_video_frame_cb.user_data = NULL;
@@ -858,7 +852,7 @@ int webrtc_set_stun_server(webrtc_h webrtc, const char *stun_server)
        _webrtc->stun_server_url = g_strdup(stun_server);
        g_object_set(G_OBJECT(_webrtc->gst.webrtcbin), "stun-server", _webrtc->stun_server_url, NULL);
 
-       LOG_INFO("stun_server[%s]", stun_server);
+       LOG_INFO("webrtc[%p] stun_server[%s]", webrtc, stun_server);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -877,7 +871,7 @@ int webrtc_get_stun_server(webrtc_h webrtc, char **stun_server)
        else
                *stun_server = strdup(_webrtc->stun_server_url);
 
-       LOG_INFO("stun_server[%s]", *stun_server);
+       LOG_INFO("webrtc[%p] stun_server[%s]", webrtc, *stun_server);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -902,7 +896,7 @@ int webrtc_add_turn_server(webrtc_h webrtc, const char *turn_server)
 
        _webrtc->turn_server_urls = g_list_append(_webrtc->turn_server_urls, g_strdup(turn_server));
 
-       LOG_INFO("turn_server[%s]", turn_server);
+       LOG_INFO("webrtc[%p] turn_server[%s]", webrtc, turn_server);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -916,7 +910,7 @@ int webrtc_foreach_turn_server(webrtc_h webrtc, webrtc_turn_server_cb callback,
        RET_VAL_IF(_webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
        RET_VAL_IF(callback == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "callback is NULL");
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        g_mutex_lock(&_webrtc->mutex);
 
@@ -948,7 +942,7 @@ int webrtc_set_ice_transport_policy(webrtc_h webrtc, webrtc_ice_transport_policy
 
        g_object_set(G_OBJECT(_webrtc->gst.webrtcbin), "ice-transport-policy", (GstWebRTCICETransportPolicy)policy, NULL);
 
-       LOG_INFO("policy[%s]", (policy == WEBRTC_ICE_TRANSPORT_POLICY_ALL) ? "all" : "relay");
+       LOG_INFO("webrtc[%p] policy[%s]", webrtc, (policy == WEBRTC_ICE_TRANSPORT_POLICY_ALL) ? "all" : "relay");
 
        return WEBRTC_ERROR_NONE;
 }
@@ -967,7 +961,7 @@ int webrtc_get_ice_transport_policy(webrtc_h webrtc, webrtc_ice_transport_policy
 
        *policy = (webrtc_ice_transport_policy_e)_policy;
 
-       LOG_INFO("policy[%s]", (*policy == WEBRTC_ICE_TRANSPORT_POLICY_ALL) ? "all" : "relay");
+       LOG_INFO("webrtc[%p] policy[%s]", webrtc, (*policy == WEBRTC_ICE_TRANSPORT_POLICY_ALL) ? "all" : "relay");
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -991,7 +985,7 @@ int webrtc_set_peer_connection_state_change_cb(webrtc_h webrtc, webrtc_peer_conn
        _webrtc->peer_connection_state_change_cb.callback = callback;
        _webrtc->peer_connection_state_change_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1008,8 +1002,8 @@ int webrtc_unset_peer_connection_state_change_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_IDLE, WEBRTC_ERROR_INVALID_STATE, "the state should be IDLE");
        RET_VAL_IF(_webrtc->peer_connection_state_change_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->peer_connection_state_change_cb.callback, _webrtc->peer_connection_state_change_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->peer_connection_state_change_cb.callback, _webrtc->peer_connection_state_change_cb.user_data);
 
        _webrtc->peer_connection_state_change_cb.callback = NULL;
        _webrtc->peer_connection_state_change_cb.user_data = NULL;
@@ -1028,7 +1022,7 @@ int webrtc_get_peer_connection_state(webrtc_h webrtc, webrtc_peer_connection_sta
 
        *state = _webrtc->negotiation_states.peer_connection_state;
 
-       LOG_INFO("state[%d]", *state);
+       LOG_INFO("webrtc[%p] state[%d]", webrtc, *state);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -1052,7 +1046,7 @@ int webrtc_set_signaling_state_change_cb(webrtc_h webrtc, webrtc_signaling_state
        _webrtc->signaling_state_change_cb.callback = callback;
        _webrtc->signaling_state_change_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1069,8 +1063,8 @@ int webrtc_unset_signaling_state_change_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_IDLE, WEBRTC_ERROR_INVALID_STATE, "the state should be IDLE");
        RET_VAL_IF(_webrtc->signaling_state_change_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->signaling_state_change_cb.callback, _webrtc->signaling_state_change_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->signaling_state_change_cb.callback, _webrtc->signaling_state_change_cb.user_data);
 
        _webrtc->signaling_state_change_cb.callback = NULL;
        _webrtc->signaling_state_change_cb.user_data = NULL;
@@ -1089,7 +1083,7 @@ int webrtc_get_signaling_state(webrtc_h webrtc, webrtc_signaling_state_e *state)
 
        *state = _webrtc->negotiation_states.signaling_state;
 
-       LOG_INFO("state[%d]", *state);
+       LOG_INFO("webrtc[%p] state[%d]", webrtc, *state);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -1113,7 +1107,7 @@ int webrtc_set_ice_gathering_state_change_cb(webrtc_h webrtc, webrtc_ice_gatheri
        _webrtc->ice_gathering_state_change_cb.callback = callback;
        _webrtc->ice_gathering_state_change_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1130,8 +1124,8 @@ int webrtc_unset_ice_gathering_state_change_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_IDLE, WEBRTC_ERROR_INVALID_STATE, "the state should be IDLE");
        RET_VAL_IF(_webrtc->ice_gathering_state_change_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->ice_gathering_state_change_cb.callback, _webrtc->ice_gathering_state_change_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->ice_gathering_state_change_cb.callback, _webrtc->ice_gathering_state_change_cb.user_data);
 
        _webrtc->ice_gathering_state_change_cb.callback = NULL;
        _webrtc->ice_gathering_state_change_cb.user_data = NULL;
@@ -1150,7 +1144,7 @@ int webrtc_get_ice_gathering_state(webrtc_h webrtc, webrtc_ice_gathering_state_e
 
        *state = _webrtc->negotiation_states.ice_gathering_state;
 
-       LOG_INFO("state[%d]", *state);
+       LOG_INFO("webrtc[%p] state[%d]", webrtc, *state);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -1174,7 +1168,7 @@ int webrtc_set_ice_connection_state_change_cb(webrtc_h webrtc, webrtc_ice_connec
        _webrtc->ice_connection_state_change_cb.callback = callback;
        _webrtc->ice_connection_state_change_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1191,8 +1185,8 @@ int webrtc_unset_ice_connection_state_change_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_IDLE, WEBRTC_ERROR_INVALID_STATE, "the state should be IDLE");
        RET_VAL_IF(_webrtc->ice_connection_state_change_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->ice_connection_state_change_cb.callback, _webrtc->ice_connection_state_change_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->ice_connection_state_change_cb.callback, _webrtc->ice_connection_state_change_cb.user_data);
 
        _webrtc->ice_connection_state_change_cb.callback = NULL;
        _webrtc->ice_connection_state_change_cb.user_data = NULL;
@@ -1211,7 +1205,7 @@ int webrtc_get_ice_connection_state(webrtc_h webrtc, webrtc_ice_connection_state
 
        *state = _webrtc->negotiation_states.ice_connection_state;
 
-       LOG_INFO("state[%d]", *state);
+       LOG_INFO("webrtc[%p] state[%d]", webrtc, *state);
 
        g_mutex_unlock(&_webrtc->mutex);
 
@@ -1235,7 +1229,7 @@ int webrtc_set_negotiation_needed_cb(webrtc_h webrtc, webrtc_negotiation_needed_
        _webrtc->negotiation_needed_cb.callback = callback;
        _webrtc->negotiation_needed_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1252,8 +1246,8 @@ int webrtc_unset_negotiation_needed_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_IDLE, WEBRTC_ERROR_INVALID_STATE, "the state should be IDLE");
        RET_VAL_IF(_webrtc->negotiation_needed_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->negotiation_needed_cb.callback, _webrtc->negotiation_needed_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->negotiation_needed_cb.callback, _webrtc->negotiation_needed_cb.user_data);
 
        _webrtc->negotiation_needed_cb.callback = NULL;
        _webrtc->negotiation_needed_cb.user_data = NULL;
@@ -1278,7 +1272,7 @@ int webrtc_set_ice_candidate_cb(webrtc_h webrtc, webrtc_ice_candidate_cb callbac
        _webrtc->ice_candidate_cb.callback = callback;
        _webrtc->ice_candidate_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1295,8 +1289,8 @@ int webrtc_unset_ice_candidate_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_IDLE, WEBRTC_ERROR_INVALID_STATE, "the state should be IDLE");
        RET_VAL_IF(_webrtc->ice_candidate_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->ice_candidate_cb.callback, _webrtc->ice_candidate_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->ice_candidate_cb.callback, _webrtc->ice_candidate_cb.user_data);
 
        _webrtc->ice_candidate_cb.callback = NULL;
        _webrtc->ice_candidate_cb.user_data = NULL;
@@ -1321,7 +1315,7 @@ int webrtc_set_track_added_cb(webrtc_h webrtc, webrtc_track_added_cb callback, v
        _webrtc->track_added_cb.callback = callback;
        _webrtc->track_added_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1337,8 +1331,8 @@ int webrtc_unset_track_added_cb(webrtc_h webrtc)
 
        RET_VAL_IF(_webrtc->track_added_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->track_added_cb.callback, _webrtc->track_added_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->track_added_cb.callback, _webrtc->track_added_cb.user_data);
 
        _webrtc->track_added_cb.callback = NULL;
        _webrtc->track_added_cb.user_data = NULL;
@@ -1358,7 +1352,7 @@ int webrtc_create_offer(webrtc_h webrtc, bundle *options, char **offer)
 
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_NEGOTIATING, WEBRTC_ERROR_INVALID_STATE, "the state should be NEGOTIATING");
 
-       LOG_INFO("offer[%p]", offer);
+       LOG_INFO("webrtc[%p] offer[%p]", webrtc, offer);
 
        return _webrtcbin_create_session_description(webrtc, true, offer);
 }
@@ -1376,7 +1370,7 @@ int webrtc_create_answer(webrtc_h webrtc, bundle *options, char **answer)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_NEGOTIATING, WEBRTC_ERROR_INVALID_STATE, "the state should be NEGOTIATING");
        RET_VAL_IF(!_webrtcbin_have_remote_offer(_webrtc), WEBRTC_ERROR_INVALID_STATE, "remote offer should be set");
 
-       LOG_INFO("answer[%p]", answer);
+       LOG_INFO("webrtc[%p] answer[%p]", webrtc, answer);
 
        return _webrtcbin_create_session_description(webrtc, false, answer);
 }
@@ -1424,7 +1418,7 @@ int webrtc_set_local_description(webrtc_h webrtc, const char *description)
 
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_NEGOTIATING, WEBRTC_ERROR_INVALID_STATE, "the state should be NEGOTIATING");
 
-       LOG_INFO("description: %s", description);
+       LOG_INFO("webrtc[%p] description: %s", webrtc, description);
 
        return _webrtcbin_set_session_description(webrtc, description, false);
 }
@@ -1441,7 +1435,7 @@ int webrtc_set_remote_description(webrtc_h webrtc, const char *description)
 
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_NEGOTIATING, WEBRTC_ERROR_INVALID_STATE, "the state should be NEGOTIATING");
 
-       LOG_INFO("description: %s", description);
+       LOG_INFO("webrtc[%p] description: %s", webrtc, description);
 
        return _webrtcbin_set_session_description(webrtc, description, true);
 }
@@ -1458,7 +1452,7 @@ int webrtc_add_ice_candidate(webrtc_h webrtc, const char *candidate)
 
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_NEGOTIATING, WEBRTC_ERROR_INVALID_STATE, "the state should be NEGOTIATING");
 
-       LOG_INFO("candidate: %s", candidate);
+       LOG_INFO("webrtc[%p] candidate: %s", webrtc, candidate);
 
        return _webrtcbin_add_ice_candidate(webrtc, candidate);
 }
@@ -1503,7 +1497,7 @@ int webrtc_set_data_channel_cb(webrtc_h webrtc, webrtc_data_channel_cb callback,
        _webrtc->data_channel_cb.callback = callback;
        _webrtc->data_channel_cb.user_data = user_data;
 
-       LOG_INFO("callback[%p] user_data[%p]", callback, user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p]", webrtc, callback, user_data);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -1520,8 +1514,8 @@ int webrtc_unset_data_channel_cb(webrtc_h webrtc)
        RET_VAL_IF(_webrtc->state != WEBRTC_STATE_IDLE, WEBRTC_ERROR_INVALID_STATE, "the state should be IDLE");
        RET_VAL_IF(_webrtc->data_channel_cb.callback == NULL, WEBRTC_ERROR_INVALID_OPERATION, "callback was not set");
 
-       LOG_INFO("callback[%p] user_data[%p] is reset to NULL",
-               _webrtc->data_channel_cb.callback, _webrtc->data_channel_cb.user_data);
+       LOG_INFO("webrtc[%p] callback[%p] user_data[%p] is reset to NULL",
+               webrtc, _webrtc->data_channel_cb.callback, _webrtc->data_channel_cb.user_data);
 
        _webrtc->data_channel_cb.callback = NULL;
        _webrtc->data_channel_cb.user_data = NULL;

diff --git a/src/webrtc_source.c b/src/webrtc_source.c
index a289ac35afcfc1f5aead481a10589ab4175d17ca..de920856821065f265e69c65965556b80bc8fc39 100644 (file)
--- a/src/webrtc_source.c
+++ b/src/webrtc_source.c
@@ -2831,7 +2831,7 @@ int _set_pause(webrtc_s *webrtc, unsigned int source_id, webrtc_media_type_e med
                return WEBRTC_ERROR_INVALID_PARAMETER;
        }
 
-       LOG_INFO("media_type[%u] of source_id[%u] is [%s] -> [%s]", media_type, source_id,
+       LOG_INFO("webrtc[%p] media_type[%u] of source_id[%u] is [%s] -> [%s]", webrtc, media_type, source_id,
                prev ? "PAUSED" : "PLAYING", pause ? "PAUSED" : "PLAYING");
 
        return WEBRTC_ERROR_NONE;
@@ -2862,7 +2862,7 @@ int _get_pause(webrtc_s *webrtc, unsigned int source_id, webrtc_media_type_e med
                return WEBRTC_ERROR_INVALID_PARAMETER;
        }
 
-       LOG_INFO("media_type[%u] of source_id[%u] is [%s]", media_type, source_id, *paused ? "PAUSED" : "PLAYING");
+       LOG_INFO("webrtc[%p] media_type[%u] of source_id[%u] is [%s]", webrtc, media_type, source_id, *paused ? "PAUSED" : "PLAYING");
 
        return WEBRTC_ERROR_NONE;
 }
@@ -2917,7 +2917,7 @@ int _get_video_resolution(webrtc_s *webrtc, unsigned int source_id, int *width,
        *width = source->video_info.width;
        *height = source->video_info.height;
 
-       LOG_INFO("source_id[%u], [%dx%d]", source_id, *width, *height);
+       LOG_INFO("webrtc[%p], source_id[%u], [%dx%d]", webrtc, source_id, *width, *height);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -2953,7 +2953,7 @@ int _set_sound_stream_info(webrtc_s *webrtc, unsigned int source_id, sound_strea
                return WEBRTC_ERROR_INVALID_PARAMETER;
        }
 
-       LOG_INFO("source_id[%u], stream_info[%p, type:%s, index:%d]", source_id, stream_info, stream_type, stream_index);
+       LOG_INFO("webrtc[%p], source_id[%u], stream_info[%p, type:%s, index:%d]", webrtc, source_id, stream_info, stream_type, stream_index);
 
        return _apply_stream_info(element, stream_type, stream_index);
 }
@@ -3574,7 +3574,7 @@ int _set_video_mute(webrtc_s *webrtc, unsigned int source_id, bool mute)
                return WEBRTC_ERROR_INVALID_PARAMETER;
        }
 
-       LOG_DEBUG("source_id[%u] mute[%d]", source_id, mute);
+       LOG_DEBUG("webrtc[%p] source_id[%u] mute[%d]", webrtc, source_id, mute);
 
        switch (source->type) {
        case WEBRTC_MEDIA_SOURCE_TYPE_VIDEOTEST:
@@ -3633,7 +3633,7 @@ int _set_audio_mute(webrtc_s *webrtc, unsigned int source_id, bool mute)
                return WEBRTC_ERROR_INVALID_PARAMETER;
        }
 
-       LOG_DEBUG("source_id[%u] mute[%d]", source_id, mute);
+       LOG_INFO("webrtc[%p] source_id[%u] mute[%d]", webrtc, source_id, mute);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -3663,7 +3663,7 @@ int _get_video_mute(webrtc_s *webrtc, unsigned int source_id, bool *muted)
                return WEBRTC_ERROR_INVALID_PARAMETER;
        }
 
-       LOG_DEBUG("source_id[%u] muted[%d]", source_id, *muted);
+       LOG_INFO("webrtc[%p] source_id[%u] muted[%d]", webrtc, source_id, *muted);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -3701,7 +3701,7 @@ int _get_audio_mute(webrtc_s *webrtc, unsigned int source_id, bool *muted)
                return WEBRTC_ERROR_INVALID_PARAMETER;
        }
 
-       LOG_DEBUG("source_id[%u] muted[%d]", source_id, *muted);
+       LOG_DEBUG("webrtc[%p] source_id[%u] muted[%d]", webrtc, source_id, *muted);
 
        return WEBRTC_ERROR_NONE;
 }
@@ -3991,7 +3991,7 @@ int _set_audio_loopback(webrtc_s *webrtc, unsigned int source_id, sound_stream_i
        RET_VAL_IF(stream_info == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "stream_info is NULL");
        RET_VAL_IF(source->av[AV_IDX_AUDIO].render.pipeline, WEBRTC_ERROR_INVALID_OPERATION, "audio loopback has already been set");
 
-       LOG_INFO("source_id[%u] stream_info[%p]", source_id, stream_info);
+       LOG_INFO("webrtc[%p] source_id[%u] stream_info[%p]", webrtc, source_id, stream_info);
 
        sound_manager_get_type_from_stream_information(stream_info, &stream_type);
        sound_manager_get_index_from_stream_information(stream_info, &stream_index);
@@ -4036,7 +4036,7 @@ int _set_video_loopback(webrtc_s *webrtc, unsigned int source_id, unsigned int t
                RET_VAL_IF(source->display == NULL, WEBRTC_ERROR_INVALID_OPERATION, "source->display is NULL");
        }
 
-       LOG_INFO("source_id[%u]", source_id);
+       LOG_INFO("webrtc[%p] source_id[%u]", webrtc, source_id);
 
        _set_display_type_and_surface(source->display, type, display);