Add wfd source video codec

- For video codec negtiation between source and sink,
  add video codec parameter for wfd source

Signed-off-by: SeokHoon Lee <andy.shlee@samsung.com>
Change-Id: I437529b302f5e094527fe8d210bd91aac8de447f

diff --git a/include/scmirroring_src_ini.h b/include/scmirroring_src_ini.h
index bad0ea8c89c4e34941465174bc8bb56538886e81..6cf6149f304d532725f27dfa0c123e17c4820767 100644 (file)
--- a/include/scmirroring_src_ini.h
+++ b/include/scmirroring_src_ini.h
@@ -79,6 +79,7 @@ typedef struct __scmirroring_src_ini {
        gint audio_latency_time;
        gint audio_buffer_time;
        gint audio_do_timestamp;
+       guint video_codec;
        guint64 video_reso_supported;
        guint decide_udp_bitrate[21];
        gint video_native_resolution;
@@ -136,6 +137,7 @@ typedef struct __scmirroring_src_ini {
 #define DEFAULT_AUDIO_EXYNOS_BUFFER_TIME       200000
 #define DEFAULT_AUDIO_QC_BUFFER_TIME   1000
 #define DEFAULT_AUDIO_DO_TIMESTAMP     0
+#define DEFAULT_VIDEO_CODEC 1
 #define DEFAULT_VIDEO_RESOLUTION_SUPPORTED     0x000000ab
 #define DEFAULT_NATIVE_VIDEO_RESOLUTION  0
 #define DEFAULT_HDCP_ENABLED 1

diff --git a/miracast_server/miracast_server_impl.c b/miracast_server/miracast_server_impl.c
index aa0ccbd36958c56f99f43f96b7e1b808071c7a72..fcf25fe8f8da09973bc493259c58184f73cc5816 100644 (file)
--- a/miracast_server/miracast_server_impl.c
+++ b/miracast_server/miracast_server_impl.c
@@ -645,6 +645,9 @@ int __miracast_server_start(MiracastServer *server_obj)
        gst_rtsp_wfd_server_set_audio_codec(server,
                        scmirroring_src_ini_get_structure()->audio_codec);
 
+       gst_rtsp_wfd_server_set_video_codec(server,
+                       scmirroring_src_ini_get_structure()->video_codec);
+
        /* CEA Resolution */
        if (server_obj->resolution & SCMIRRORING_RESOLUTION_1920x1080_P30) {
                native_reso = GST_WFD_VIDEO_CEA_RESOLUTION;

diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec
index dab1c271b3f36709b135a985cffba8373f30d9e6..285d24fa5244a01f91420d94b0759b67236a883d 100644 (file)
--- a/packaging/capi-media-screen-mirroring.spec
+++ b/packaging/capi-media-screen-mirroring.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-screen-mirroring
 Summary:    A screen mirroring library in Tizen C API
-Version:    0.1.64
+Version:    0.1.66
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/scmirroring_src_ini.c b/src/scmirroring_src_ini.c
index 728b46d811208a49283a22c88e64a31b5efa997f..5e35947e171e9df536dec5c5e305b2a71c416cb8 100644 (file)
--- a/src/scmirroring_src_ini.c
+++ b/src/scmirroring_src_ini.c
@@ -95,6 +95,7 @@ scmirroring_src_ini_load(void)
                SCMIRRORING_INI_GET_STRING(g_scmirroring_src_ini.name_of_audio_device_property, "general:audio properties name", DEFAULT_AUDIO_DEVICE_PROPERTY_NAME);
                g_scmirroring_src_ini.audio_latency_time = iniparser_getint(dict, "general:audio latency_time", DEFAULT_AUDIO_LATENCY_TIME);
                g_scmirroring_src_ini.audio_do_timestamp = iniparser_getint(dict, "general:audio do_timestamp", DEFAULT_AUDIO_DO_TIMESTAMP);
+               g_scmirroring_src_ini.video_codec = iniparser_getint(dict, "general:video codec", DEFAULT_VIDEO_CODEC);
                SCMIRRORING_INI_GET_STRING(temp, "general:video resolution_supported", "");
                if (strlen(temp) > 0) g_scmirroring_src_ini.video_reso_supported = strtoull(temp, NULL, 16);
                else g_scmirroring_src_ini.video_reso_supported = DEFAULT_VIDEO_RESOLUTION_SUPPORTED;
@@ -158,6 +159,7 @@ scmirroring_src_ini_load(void)
                strncpy(g_scmirroring_src_ini.name_of_audio_device_property, DEFAULT_AUDIO_DEVICE_PROPERTY_NAME, SCMIRRORING_SRC_INI_MAX_STRLEN - 1);
                g_scmirroring_src_ini.audio_latency_time = DEFAULT_AUDIO_LATENCY_TIME;
                g_scmirroring_src_ini.audio_do_timestamp = DEFAULT_AUDIO_DO_TIMESTAMP;
+               g_scmirroring_src_ini.video_codec = DEFAULT_VIDEO_CODEC;
                g_scmirroring_src_ini.video_reso_supported = DEFAULT_VIDEO_RESOLUTION_SUPPORTED;
                g_scmirroring_src_ini.decide_udp_bitrate[0] = DEFAULT_VIDEO_BITRATE_INIT_1;
                g_scmirroring_src_ini.decide_udp_bitrate[1] = DEFAULT_VIDEO_BITRATE_MIN_1;
@@ -226,6 +228,7 @@ scmirroring_src_ini_load(void)
        scmirroring_debug("audio latency_time : %d\n", g_scmirroring_src_ini.audio_latency_time);
        scmirroring_debug("audio buffer_time : %d\n", g_scmirroring_src_ini.audio_buffer_time);
        scmirroring_debug("audio do_timestamp : %d\n", g_scmirroring_src_ini.audio_do_timestamp);
+       scmirroring_debug("video codec : %d\n", g_scmirroring_src_ini.video_codec);
        scmirroring_debug("video resolution_supported : %d\n", g_scmirroring_src_ini.video_reso_supported);
        scmirroring_debug("video native_resolution : %d\n", g_scmirroring_src_ini.video_native_resolution);
        scmirroring_debug("encryption HDCP_enabled : %d\n", g_scmirroring_src_ini.hdcp_enabled);