From: SeokHoon Lee Date: Mon, 7 Nov 2016 02:07:16 +0000 (+0900) Subject: Delete unsued device/code about evasimagesink X-Git-Tag: submit/tizen_3.0/20161122.043110^2~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a6ece54db3abca5663b485a929dc8a176e767e8e;p=platform%2Fcore%2Fapi%2Fscreen-mirroring.git Delete unsued device/code about evasimagesink [Version] 0.1.56 [Profile] Common [Issue Type] code refactoring [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-mobile_20161101.1] Signed-off-by: SeokHoon Lee Change-Id: I250ccfbf8db4e35f54bcfb945b7f5d7be5d68f6f --- diff --git a/include/scmirroring_src_ini.h b/include/scmirroring_src_ini.h index 7c992a2..bad0ea8 100644 --- a/include/scmirroring_src_ini.h +++ b/include/scmirroring_src_ini.h @@ -33,15 +33,6 @@ extern "C" { #define SCMIRRORING_SRC_INI_MAX_STRLEN 80 #define SCMIRRORING_SRC_INI_MAX_PARAM_STRLEN 256 -typedef enum __scmirroring_ini_videosink_element { - SCMIRRORING_INI_VSINK_V4l2SINK = 0, - SCMIRRORING_INI_VSINK_XIMAGESINK, - SCMIRRORING_INI_VSINK_XVIMAGESINK, - SCMIRRORING_INI_VSINK_FAKESINK, - SCMIRRORING_INI_VSINK_EVASIMAGESINK, - SCMIRRORING_INI_VSINK_GLIMAGESINK, - SCMIRRORING_INI_VSINK_NUM -} SCMIRRORING_INI_VSINK_ELEMENT; typedef enum __scmirroring_ini_videosrc_element { SCMIRRORING_INI_VSRC_XIMAGESRC, @@ -74,7 +65,6 @@ typedef struct __scmirroring_src_ini { SCMIRRORING_INI_VSRC_ELEMENT videosrc_element; gchar name_of_video_encoder[SCMIRRORING_SRC_INI_MAX_STRLEN]; gint session_mode; - SCMIRRORING_INI_VSINK_ELEMENT videosink_element; gchar name_of_video_converter[SCMIRRORING_SRC_INI_MAX_STRLEN]; gboolean skip_rescan; gboolean generate_dot; @@ -107,7 +97,6 @@ typedef struct __scmirroring_src_ini { #define DEFAULT_SKIP_RESCAN TRUE #define DEFAULT_GENERATE_DOT FALSE #define DEFAULT_PROVIDE_CLOCK TRUE -#define DEFAULT_VIDEOSINK SCMIRRORING_INI_VSINK_XVIMAGESINK #define DEFAULT_VIDEOSRC SCMIRRORING_INI_VSRC_WAYLANDSRC #define DEFAULT_VIDEOENC "omxenc_h264" #define DEFAULT_VIDEO_BITRATE_INIT_1 1048576 /* bps */ @@ -153,46 +142,6 @@ typedef struct __scmirroring_src_ini { #define DEFAULT_UIBC_GEN_CAPABILITY 15 #define DEFAULT_DUMP_TS 0 -/* NOTE : following content should be same with above default values */ -/* FIXIT : need smarter way to generate default ini file. */ -/* FIXIT : finally, it should be an external file */ -#define SCMIRRORING_SRC_DEFAULT_INI \ -" \ -[general] \n\ -\n\ -; set default video source element\n\ -; 0: xvimagesrc, 1: filesrc, 2: camerasrc, 3: videotestsrc\n\ -videosrc element = 0 \n\ -\n\ -; sending video only mirroring mode\n\ -; 0: audio-video-muxed sending, 1:video-only, 2:audio-only, 3:audio-video-saperate\n\ -session_mode = 0 \n\ -disable segtrap = yes ; same effect with --gst-disable-segtrap \n\ -\n\ -; set default video sink when video is rendered on the SCMIRRORING source as well\n\ -; 0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink 4:evasimagesink 5:glimagesink\n\ -videosink element = 2 \n\ -\n\ -mtu_size value = 1400 \n\ -\n\ -video converter element = \n\ -\n\ -; if yes. gstreamer will not update registry \n\ -skip rescan = yes \n\ -\n\ -; parameters for initializing gstreamer \n\ -gstparam1 = \n\ -gstparam2 = \n\ -gstparam3 = \n\ -gstparam4 = \n\ -gstparam5 = \n\ -\n\ -; generating dot file representing pipeline state \n\ -generate dot = no \n\ -\n\ -\n\ -\n\ -" int scmirroring_src_ini_load(void); diff --git a/packaging/capi-media-screen-mirroring.spec b/packaging/capi-media-screen-mirroring.spec index ff1e871..1c3e21c 100644 --- 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.55 +Version: 0.1.56 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/scmirroring_src_ini.c b/src/scmirroring_src_ini.c index 86a227d..9ab0fc1 100644 --- a/src/scmirroring_src_ini.c +++ b/src/scmirroring_src_ini.c @@ -76,7 +76,6 @@ scmirroring_src_ini_load(void) g_scmirroring_src_ini.videosrc_element = iniparser_getint(dict, "general:videosrc element", DEFAULT_VIDEOSRC); SCMIRRORING_INI_GET_STRING(g_scmirroring_src_ini.name_of_video_encoder, "general:video encoder element", DEFAULT_VIDEOENC); g_scmirroring_src_ini.session_mode = iniparser_getint(dict, "general:session_mode", DEFAULT_SESSION_MODE); - g_scmirroring_src_ini.videosink_element = iniparser_getint(dict, "general:videosink element", DEFAULT_VIDEOSINK); g_scmirroring_src_ini.disable_segtrap = iniparser_getboolean(dict, "general:disable segtrap", DEFAULT_DISABLE_SEGTRAP); g_scmirroring_src_ini.skip_rescan = iniparser_getboolean(dict, "general:skip rescan", DEFAULT_SKIP_RESCAN); g_scmirroring_src_ini.mtu_size = iniparser_getint(dict, "general:mtu_size value", DEFAULT_MTU_SIZE); @@ -140,7 +139,6 @@ scmirroring_src_ini_load(void) g_scmirroring_src_ini.videosrc_element = DEFAULT_VIDEOSRC; strncpy(g_scmirroring_src_ini.name_of_video_encoder, DEFAULT_VIDEOENC, SCMIRRORING_SRC_INI_MAX_STRLEN - 1); g_scmirroring_src_ini.session_mode = DEFAULT_SESSION_MODE; - g_scmirroring_src_ini.videosink_element = DEFAULT_VIDEOSINK; g_scmirroring_src_ini.disable_segtrap = DEFAULT_DISABLE_SEGTRAP; g_scmirroring_src_ini.skip_rescan = DEFAULT_SKIP_RESCAN; g_scmirroring_src_ini.mtu_size = DEFAULT_MTU_SIZE; @@ -214,7 +212,6 @@ scmirroring_src_ini_load(void) scmirroring_debug("session mode in mirroring : %d\n", g_scmirroring_src_ini.session_mode); scmirroring_debug("disable_segtrap : %d\n", g_scmirroring_src_ini.disable_segtrap); scmirroring_debug("skip rescan : %d\n", g_scmirroring_src_ini.skip_rescan); - scmirroring_debug("videosink element(0:v4l2sink, 1:ximagesink, 2:xvimagesink, 3:fakesink) : %d\n", g_scmirroring_src_ini.videosink_element); scmirroring_debug("mtu_size : %d\n", g_scmirroring_src_ini.mtu_size); scmirroring_debug("generate_dot : %d\n", g_scmirroring_src_ini.generate_dot); scmirroring_debug("provide_clock : %d\n", g_scmirroring_src_ini.provide_clock);