Fix codes about gstreamer 1.20.0 update

[Version] 0.1.144
[IssueType] Update

Change-Id: I3c3c4e21505662bd4383392984455ecafc7e09af
Signed-off-by: Hyunil <hyunil46.park@samsung.com>

diff --git a/packaging/capi-media-streamer.spec b/packaging/capi-media-streamer.spec
index fc8dbd6..ea264f7 100644 (file)
--- a/packaging/capi-media-streamer.spec
+++ b/packaging/capi-media-streamer.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-streamer
 Summary:    A Media Streamer API
-Version:    0.1.143
+Version:    0.1.144
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index d816302..72770cc 100644 (file)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -93,7 +93,7 @@ static gboolean __ms_add_ghostpad(GstElement *gst_element, const char *pad_name,
 
        /* Check, if pad is not static, get it by request */
        if (element_pad == NULL)
-               element_pad = gst_element_get_request_pad(gst_element, pad_name);
+               element_pad = gst_element_request_pad_simple(gst_element, pad_name);
 
        ghost_pad = gst_ghost_pad_new(ghost_pad_name, element_pad);
        ms_retvm_if(!ghost_pad, FALSE, "ghost_pad is NULL");

diff --git a/src/media_streamer_gst_webrtc.c b/src/media_streamer_gst_webrtc.c
index 1d3f103..974b235 100644 (file)
--- a/src/media_streamer_gst_webrtc.c
+++ b/src/media_streamer_gst_webrtc.c
@@ -184,10 +184,10 @@ void ms_webrtc_set_rtp_transceiver_direction_with_index(GstElement *webrtcbin, g
 
        g_signal_emit_by_name (webrtcbin, "get-transceivers", &transceivers);
        if (transceivers != NULL && transceivers->len > 0) {
-               trans = g_array_index (transceivers, GstWebRTCRTPTransceiver *, transceiver_idx);
-               trans->direction = direction;
-               g_array_unref (transceivers);
-               ms_info("Set transceiver direction(%d) to transceiver_%d", trans->direction, transceiver_idx);
+               trans = g_array_index(transceivers, GstWebRTCRTPTransceiver *, transceiver_idx);
+               g_object_set(G_OBJECT(trans), "direction", direction, NULL);
+               g_array_unref(transceivers);
+               ms_info("Set transceiver direction(%d) to transceiver_%d", direction, transceiver_idx);
        } else {
                ms_error("Could not set transceiver direction(%d) in transceiver_%d", direction, transceiver_idx);
        }
@@ -196,15 +196,17 @@ void ms_webrtc_set_rtp_transceiver_direction_with_index(GstElement *webrtcbin, g
 void ms_webrtc_set_rtp_transceiver_direction_with_caps(GstElement *webrtcbin, const gchar *caps_str, GstWebRTCRTPTransceiverDirection direction)
 {
        GstWebRTCRTPTransceiver *trans = NULL;
+       GstWebRTCRTPTransceiverDirection _direction;
        GstCaps *caps = NULL;
 
        ms_retm_if(webrtcbin == NULL, "webrtcbin is NULL");
-       caps = gst_caps_from_string (caps_str);
-       g_signal_emit_by_name (webrtcbin, "add-transceiver", direction, caps, &trans);
-       gst_caps_unref (caps);
+       caps = gst_caps_from_string(caps_str);
+       g_signal_emit_by_name(webrtcbin, "add-transceiver", direction, caps, &trans);
+       gst_caps_unref(caps);
        if (trans) {
-               ms_info("Set transceiver direction(%d) with caps(%s)", trans->direction, caps_str);
-               gst_object_unref (trans);
+        g_object_get(G_OBJECT(trans), "direction", &_direction, NULL);
+               ms_info("Set transceiver direction(%d) with caps(%s)", _direction, caps_str);
+               gst_object_unref(trans);
        } else {
                ms_error("Could not set transceivers direction(%d) with caps(%s)", direction, caps_str);
        }
@@ -459,11 +461,18 @@ void ms_webrtcbin_on_ice_candidate_cb(GstElement *webrtcbin, guint mlineindex, g
 
 void ms_webrtcbin_on_new_transceiver_cb(GstElement *webrtcbin, GstWebRTCRTPTransceiver *transceiver, gpointer user_data)
 {
+       gint mlineindex;
+       gchar *mid;
+       GstWebRTCRTPTransceiverDirection direction;
+
        ms_retm_if(webrtcbin == NULL, "webrtcbin is NULL");
        ms_retm_if(transceiver == NULL, "transceiver is NULL");
 
-       ms_info("new transceiver[%p, mline:%u, mid:%s, direction:%d] user_data[%p]",
-               transceiver, transceiver->mline, transceiver->mid, transceiver->direction, user_data);
+       g_object_get(G_OBJECT(transceiver),
+               "mlineindex", &mlineindex, "mid", &mid, "direction", &direction, NULL);
+
+       ms_info("new transceiver[%p, mlineindex:%u, mid:%s, direction:%d] user_data[%p]",
+               transceiver, mlineindex, mid, direction, user_data);
 }
 
 void ms_webrtcbin_notify_ice_connection_state_cb(GstElement *webrtcbin, GParamSpec * pspec, gpointer user_data)

diff --git a/src/media_streamer_internal.c b/src/media_streamer_internal.c
index fc6e5ca..b893de3 100644 (file)
--- a/src/media_streamer_internal.c
+++ b/src/media_streamer_internal.c
@@ -47,7 +47,7 @@ static void __remove_gst_pad_probe_cb(const char *pad_name, gulong probe_id, med
 
        pad = gst_element_get_static_pad(node->gst_element, pad_name);
        if (!pad)
-               pad = gst_element_get_request_pad(node->gst_element, pad_name);
+               pad = gst_element_request_pad_simple(node->gst_element, pad_name);
 
        if (!pad) {
                ms_warning("pad[%s] is NULL, in case of force unset, request pad can be already disposed after unlink and\n"
@@ -120,7 +120,7 @@ int media_streamer_node_set_pad_probe_cb(media_streamer_node_h node, const char
 
        pad = gst_element_get_static_pad(ms_node->gst_element, pad_name);
        if (!pad) {
-               pad = gst_element_get_request_pad(ms_node->gst_element, pad_name);
+               pad = gst_element_request_pad_simple(ms_node->gst_element, pad_name);
                if (!pad) {
                        ms_error ("Failed to get pad from pad_name[%s]", pad_name);
                        return MEDIA_STREAMER_ERROR_INVALID_OPERATION;

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
index def6df6..7a7600e 100644 (file)
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -1901,7 +1901,7 @@ static int __ms_webrtc_prepare_ghost_sink_pad(GstElement *webrtc_container, GstE
        ms_info("%s is found, link it with webrtcbin and export the ghost pad[%s] of webrtc_container",
                        capsfilter_name, pad_name);
 
-       if (!(req_pad = gst_element_get_request_pad(webrtcbin, "sink_%u"))) {
+       if (!(req_pad = gst_element_request_pad_simple(webrtcbin, "sink_%u"))) {
                ms_error("Failed to get request pad");
                ret = MEDIA_STREAMER_ERROR_INVALID_OPERATION;
                goto end;