Add support for rendering video to overlay surface

[Version] 0.1.68
[Issue Type] New feature

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

diff --git a/include/webrtc_private.h b/include/webrtc_private.h
index 4e37e6eb3a3145a4901d24926f8e4118919e9af8..cd6e5c8e3e66925627104590a1d62087542de75c 100644 (file)
--- a/include/webrtc_private.h
+++ b/include/webrtc_private.h
@@ -226,6 +226,7 @@ typedef struct _webrtc_tbm_s {
 typedef struct _webrtc_display {
        void *object;
        int type;
+       int overlay_surface_id;
 
        GMutex mutex;
        mm_display_interface_h mm_display;

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index cc168e3d4e55b0a5606042f1193c891dc2921697..c59435bb384beaf8eb7589f21d79e5b4966fda61 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.1.67
+Version:    0.1.68
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc_display.c b/src/webrtc_display.c
index 59c10c49f8856ec0c538fbd4f84023adae571274..3c33b878812fd9a2608e05bc3f20e90b54760fc4 100644 (file)
--- a/src/webrtc_display.c
+++ b/src/webrtc_display.c
@@ -634,6 +634,29 @@ void _video_stream_decoded_cb(GstElement *object, GstBuffer *buffer, GstPad *pad
        mm_display_interface_evas_render(display->mm_display, packet);
 }
 
+static gboolean __set_overlay_display_idle_cb(gpointer user_data)
+{
+       int ret = MM_ERROR_NONE;
+       webrtc_display_s *display = (webrtc_display_s*)user_data;
+
+       RET_VAL_IF(display == NULL, G_SOURCE_REMOVE, "display is NULL");
+
+       g_mutex_lock(&display->mutex);
+
+       ret = mm_display_interface_set_display(display->mm_display, MM_DISPLAY_TYPE_OVERLAY, display->object, &display->overlay_surface_id);
+       if (ret != MM_ERROR_NONE) {
+               LOG_ERROR("failed to mm_display_interface_set_display(), ret[0x%x]", ret);
+               g_mutex_unlock(&display->mutex);
+               return G_SOURCE_REMOVE;
+       }
+
+       LOG_INFO("overlay_surface_id[%d]", display->overlay_surface_id);
+
+       g_mutex_unlock(&display->mutex);
+
+       return G_SOURCE_REMOVE;
+}
+
 static gboolean __set_evas_display_idle_cb(gpointer user_data)
 {
        int ret = MM_ERROR_NONE;
@@ -651,6 +674,7 @@ static gboolean __set_evas_display_idle_cb(gpointer user_data)
                return G_SOURCE_REMOVE;
        }
 
+       /* FIXME: remove meaningless this value */
        LOG_DEBUG("surface id[%d]", surface_id);
 
        /* FIXE: get mode and rotation value from handle */
@@ -674,8 +698,9 @@ int _apply_display(webrtc_display_s *display)
 
        switch (display->type) {
        case WEBRTC_DISPLAY_TYPE_OVERLAY:
-               /* TODO: Implemenation */
                LOG_DEBUG("it's OVERLAY type");
+
+               g_idle_add(__set_overlay_display_idle_cb, display);
                break;
 
        case WEBRTC_DISPLAY_TYPE_EVAS:

diff --git a/src/webrtc_sink.c b/src/webrtc_sink.c
index 7a5e3e2b62380ceeac265fb719aa7eae084ba423..fbd4d727d0a29abe45353c9c9c7f0b58eee96de1 100644 (file)
--- a/src/webrtc_sink.c
+++ b/src/webrtc_sink.c
@@ -16,6 +16,7 @@
 
 #include "webrtc.h"
 #include "webrtc_private.h"
+#include <gst/video/videooverlay.h>
 
 #define DEFAULT_ELEMENT_VIDEOCONVERT  "videoconvert"
 #define DEFAULT_ELEMENT_AUDIOCONVERT  "audioconvert"
@@ -32,12 +33,41 @@ static webrtc_gst_slot_s* __find_sink_slot(webrtc_s *webrtc, const gchar *key)
        return g_hash_table_lookup(webrtc->gst.sink_slots, key);
 }
 
+static const char *__get_videosink_factory_name(webrtc_display_s *display, const char *default_name, bool *display_is_set)
+{
+       const char *factory_name = DEFAULT_ELEMENT_VIDEOSINK;
+
+       RET_VAL_IF(display == NULL, default_name, "display is NULL");
+       RET_VAL_IF(default_name == NULL, DEFAULT_ELEMENT_VIDEOSINK, "default_name is NULL");
+       RET_VAL_IF(display_is_set == NULL, default_name, "display_is_set is NULL");
+
+       if (display->object == NULL) {
+               *display_is_set = false;
+               LOG_INFO("display object is not set, use [%s]", default_name);
+               return default_name;
+       }
+
+       *display_is_set = true;
+
+       if (display->type == WEBRTC_DISPLAY_TYPE_OVERLAY)
+               factory_name = DEFAULT_ELEMENT_VIDEOSINK;
+       else if (display->type == WEBRTC_DISPLAY_TYPE_EVAS)
+               factory_name = DEFAULT_ELEMENT_FAKESINK;
+       else
+               LOG_ERROR("invalid type(%d)", display->type);
+
+       LOG_INFO("use [%s] for object[%p], type[%d]", factory_name, display->object, display->type);
+
+       return factory_name;
+}
+
 static int __build_videosink(webrtc_s *webrtc, GstElement *decodebin, GstPad *src_pad)
 {
        webrtc_gst_slot_s *sink;
        GstElement *videoconvert;
        GstElement *videosink;
-       const char *videosink_factory_name = DEFAULT_ELEMENT_VIDEOSINK;
+       const char *videosink_factory_name;
+       bool display_is_set = false;
 
        RET_VAL_IF(webrtc == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "webrtc is NULL");
        RET_VAL_IF(decodebin == NULL, WEBRTC_ERROR_INVALID_PARAMETER, "decodebin is NULL");
@@ -54,19 +84,21 @@ static int __build_videosink(webrtc_s *webrtc, GstElement *decodebin, GstPad *sr
                return WEBRTC_ERROR_INVALID_OPERATION;
        }
 
-       /* TODO: Implemenation per sink->display->type */
-       if (sink->display && sink->display->object != NULL && sink->display->type == WEBRTC_DISPLAY_TYPE_EVAS)
-               videosink_factory_name = DEFAULT_ELEMENT_FAKESINK;
+       videosink_factory_name = __get_videosink_factory_name(sink->display, DEFAULT_ELEMENT_VIDEOSINK, &display_is_set);
 
-       /* FIXME: get factory name from ini */
        if (!(videosink = _create_element(videosink_factory_name, NULL))) {
                LOG_ERROR("failed to create videosink[%s]", videosink_factory_name);
                return WEBRTC_ERROR_INVALID_OPERATION;
        }
 
-       if (sink->display && sink->display->object != NULL && sink->display->type == WEBRTC_DISPLAY_TYPE_EVAS) {
-               g_object_set(videosink, "signal-handoffs", TRUE, NULL);
-               _connect_and_append_signal(&sink->signals, (GObject *)videosink, "handoff", G_CALLBACK(_video_stream_decoded_cb), sink->display);
+       if (display_is_set) {
+               if (sink->display->type == WEBRTC_DISPLAY_TYPE_OVERLAY) {
+                       gst_video_overlay_set_wl_window_wl_surface_id(GST_VIDEO_OVERLAY(videosink), sink->display->overlay_surface_id);
+
+               } else if (sink->display->type == WEBRTC_DISPLAY_TYPE_EVAS) {
+                       g_object_set(videosink, "signal-handoffs", TRUE, NULL);
+                       _connect_and_append_signal(&sink->signals, (GObject *)videosink, "handoff", G_CALLBACK(_video_stream_decoded_cb), sink->display);
+               }
        }
 
        gst_bin_add_many(GST_BIN(sink->bin), videoconvert, videosink, NULL);

diff --git a/test/webrtc_test.c b/test/webrtc_test.c
index c1d7ad2fbc6ed06dfe80b602eb10e5ac804504f0..e9f3d7b33e6618ec7a77cbcf6ee64176e5c8d141 100644 (file)
--- a/test/webrtc_test.c
+++ b/test/webrtc_test.c
@@ -91,7 +91,6 @@ static const char* g_webrtc_transceiver_direction_str[] = {
 
 /* for video display */
 static Evas_Object *g_win_id;
-static Evas_Object *g_selected_win_id;
 
 typedef struct {
        Evas_Object *win;
@@ -220,7 +219,6 @@ static int app_create(void *data)
                return -1;
        ad->win = win;
        g_win_id = win;
-       g_selected_win_id = g_win_id;
        create_render_rect_and_bg(ad->win);
 
        /* Create evas image object for EVAS surface */
@@ -255,7 +253,6 @@ static int app_terminate(void *data)
        }
 
        ad->win = NULL;
-       g_selected_win_id = NULL;
 
        return 0;
 }
@@ -854,8 +851,8 @@ static void __track_added_cb(webrtc_h webrtc, webrtc_media_type_e type, unsigned
        if (type == WEBRTC_MEDIA_TYPE_VIDEO) {
                g_print("Video track is added, ");
                if (conn->display_type == WEBRTC_DISPLAY_TYPE_OVERLAY) {
-                       g_print("set display - overlay\n");
-                       /* FIXME: set window id here */
+                       g_print("set display - overlay, object[%p]\n", g_win_id);
+                       webrtc_set_display(conn->webrtc, id, WEBRTC_DISPLAY_TYPE_OVERLAY, g_win_id);
 
                } else if (conn->display_type == WEBRTC_DISPLAY_TYPE_EVAS) {
                        g_print("set display - evas object[%p]\n", conn->eo);