Make R2 features message configurable.

R2 is not fully supported yet.
So i added 'wfd2_supported' parameter for make it configurable.

Change-Id: I17f3da6ee3d10a552c5a123c0d505db2766c0576
Signed-off-by: Hyunsoo Park <hance.park@samsung.com>

diff --git a/include/scmirroring_src_ini.h b/include/scmirroring_src_ini.h
index 56893a5dda99fcdee0d49b682b2e4b16e5bff791..ae6b42fbe966de6a5ee08c4b26f542fd5560e842 100644 (file)
--- a/include/scmirroring_src_ini.h
+++ b/include/scmirroring_src_ini.h
@@ -90,6 +90,7 @@ typedef struct __scmirroring_src_ini {
 
        gint dump_ts;
 
+       gint wfd2_supported;
 } scmirroring_src_ini_t;
 
 /* default values if each values are not specified in inifile */
@@ -142,6 +143,10 @@ typedef struct __scmirroring_src_ini {
 #define DEFAULT_UIBC_GEN_CAPABILITY 15
 #define DEFAULT_DUMP_TS                                0
 
+/* R2 features */
+#define DEFAULT_WFD2_SUPPORTED 0
+
+
 
 int
 scmirroring_src_ini_load(void);

diff --git a/miracast_server/miracast_server_impl.c b/miracast_server/miracast_server_impl.c
index 9c9db7136215af54301fd4b5ef562b4be2d67028..64b243c4ba11b97c244b66648dddf271ace1cb5e 100644 (file)
--- a/miracast_server/miracast_server_impl.c
+++ b/miracast_server/miracast_server_impl.c
@@ -700,6 +700,9 @@ int __miracast_server_start(MiracastServer *server_obj)
        if (server_obj->multisink == SCMIRRORING_MULTISINK_ENABLE)
                gst_rtsp_media_factory_set_shared(GST_RTSP_MEDIA_FACTORY_CAST(factory), TRUE);
 
+       gst_rtsp_wfd_server_set_wfd2_supported(server,
+               scmirroring_src_ini_get_structure()->wfd2_supported);
+
        g_signal_connect(GST_RTSP_MEDIA_FACTORY(factory), "media-constructed", (GCallback) __media_constructed, server_obj);
 
        g_object_ref(factory);

diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec
index f5d8361d65c63ebf2954f94c5f53b3c47989862f..2345f6c6dbb96af285bbf1c7b0b0c347ea5fb2eb 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.94
+Version:    0.1.95
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/scmirroring_src_ini.c b/src/scmirroring_src_ini.c
index 3cdf995a0271a4b0f6bd13ebc7e30f100087d363..db79b28f5d7900f16dd642ccc36f90e9e084fad1 100644 (file)
--- a/src/scmirroring_src_ini.c
+++ b/src/scmirroring_src_ini.c
@@ -132,6 +132,8 @@ scmirroring_src_ini_load(void)
 
                g_scmirroring_src_ini.dump_ts = iniparser_getint(dict, "general:dump ts", DEFAULT_DUMP_TS);
 
+               g_scmirroring_src_ini.wfd2_supported = iniparser_getint(dict, "general:wfd2 wfd2_supported", DEFAULT_WFD2_SUPPORTED);
+
        } else { /* if dict is not available just fill the structure with default value */
                scmirroring_debug("failed to load ini. using hardcoded default\n");
 
@@ -192,6 +194,8 @@ scmirroring_src_ini_load(void)
                strncpy(g_scmirroring_src_ini.gst_param[3], DEFAULT_GST_PARAM, SCMIRRORING_SRC_INI_MAX_PARAM_STRLEN - 1);
                strncpy(g_scmirroring_src_ini.gst_param[4], DEFAULT_GST_PARAM, SCMIRRORING_SRC_INI_MAX_PARAM_STRLEN - 1);
                g_scmirroring_src_ini.dump_ts = DEFAULT_DUMP_TS;
+
+               g_scmirroring_src_ini.wfd2_supported = DEFAULT_WFD2_SUPPORTED;
        }
 
        /* free dict as we got our own structure */
@@ -238,6 +242,7 @@ scmirroring_src_ini_load(void)
        scmirroring_debug("gst_param5 : %s\n", g_scmirroring_src_ini.gst_param[4]);
 
        scmirroring_debug("dump ts : %d\n", g_scmirroring_src_ini.dump_ts);
+       scmirroring_debug("wfd2 wfd2_supported : %d\n", g_scmirroring_src_ini.wfd2_supported);
 
        scmirroring_debug("---------------------------------------------------\n");