From: Hyunsoo Park Date: Thu, 21 Mar 2019 04:53:13 +0000 (+0900) Subject: Make R2 features message configurable. X-Git-Tag: submit/tizen_5.0/20190328.050019^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5116f337701d454c7e79f54a3e7c7b05270f2927;p=platform%2Fcore%2Fapi%2Fscreen-mirroring.git 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 --- diff --git a/include/scmirroring_src_ini.h b/include/scmirroring_src_ini.h index 56893a5..ae6b42f 100644 --- 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 9c9db71..64b243c 100644 --- 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/src/scmirroring_src_ini.c b/src/scmirroring_src_ini.c index 3cdf995..db79b28 100644 --- 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");