webrtc_test: Change media test file path in case of TV profile build

To do this, spec and CMakefile are changed.

[Version] 0.1.119
[Issue Type] Test application

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e4e0c091429ee9d3ac9d3849068a94bfa1141af..b0463f7bee170804f292ef10a45b913fe80e1186 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,9 +14,11 @@ INCLUDE_DIRECTORIES(${INC_DIR})
 SET(dependents "dlog glib-2.0 gstreamer-1.0 gstreamer-webrtc-1.0 gstreamer-video-1.0 gstreamer-audio-1.0 \
                 json-glib-1.0 iniparser mm-common mm-display-interface capi-media-tool libtbm libwebsockets \
                 cynara-client libsmack capi-system-info libsoup-2.4")
-IF(TIZEN_FEATURE_RESOURCE_MANAGER)
-SET(dependents "${dependents} mm-resource-manager")
-ADD_DEFINITIONS("-DTIZEN_FEATURE_RES_MGR")
+IF(NOT TIZEN_PROFILE_TV)
+    SET(dependents "${dependents} mm-resource-manager")
+    ADD_DEFINITIONS("-DTIZEN_FEATURE_RES_MGR")
+ELSE()
+    ADD_DEFINITIONS("-DTIZEN_TV")
 ENDIF()
 
 SET(pc_dependents "capi-base-common" )
@@ -43,8 +45,8 @@ AUX_SOURCE_DIRECTORY (src MAIN_SRC)
 LIST (APPEND SOURCES
      ${MAIN_SRC}
 )
-IF(NOT TIZEN_FEATURE_RESOURCE_MANAGER)
-LIST (REMOVE_ITEM SOURCES src/webrtc_resource.c)
+IF(TIZEN_PROFILE_TV)
+    LIST (REMOVE_ITEM SOURCES src/webrtc_resource.c)
 ENDIF()
 
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index eb50081f072cfd0fdd93bfa0940ed3bc6053b010..790f51fe03f2d2775fa45df7adc8e8a83d9e98af 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.118
+Version:    0.1.119
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
@@ -50,10 +50,10 @@ cp %{SOURCE1001} .
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
-%if "%{tizen_profile_name}" != "tv"
--DTIZEN_FEATURE_RESOURCE_MANAGER=on
+%if "%{tizen_profile_name}" == "tv"
+-DTIZEN_PROFILE_TV=on
 %else
--DTIZEN_FEATURE_RESOURCE_MANAGER=off
+-DTIZEN_PROFILE_TV=off
 %endif
 
 make %{?jobs:-j%jobs}

diff --git a/src/webrtc_sink.c b/src/webrtc_sink.c
index 5e7a152840383edd179cafeee4049ec096ff4e10..debcfe90b4fefcd7689a5d2f98a1a27f4f9d26aa 100644 (file)
--- a/src/webrtc_sink.c
+++ b/src/webrtc_sink.c
@@ -689,7 +689,7 @@ static void __encoded_stream_cb(GstElement *object, GstBuffer *buffer, GstPad *p
        RET_IF(sink->webrtc == NULL, "webrtc is NULL");
        RET_IF(sink->encoded_frame_cb == NULL, "encoded_frame_cb is NULL");
 
-       LOG_DEBUG("object[%p] buffer[%p] pad[%p] sink[%p]", object, buffer, pad, sink);
+       LOG_INFO("object[%p] buffer[%p] pad[%p] sink[%p]", object, buffer, pad, sink);
 
        packet = __make_media_packet(sink, buffer, pad);
        RET_IF(packet == NULL, "packet is NULL");

diff --git a/test/webrtc_test.c b/test/webrtc_test.c
index f751841609c7013a79001661c58202afac385de7..f2929565f668da62dcd87f51f5a0f4b220576549 100644 (file)
--- a/test/webrtc_test.c
+++ b/test/webrtc_test.c
@@ -2065,7 +2065,11 @@ static void __demux_pad_added_cb(GstElement *object, GstPad *pad, gpointer data)
        }
 }
 
+#ifdef TIZEN_TV
+#define TEST_640_480_VIDEO_MP4_PATH    "/opt/usr/home/owner/share/media/1.mp4"
+#else
 #define TEST_640_480_VIDEO_MP4_PATH    "/opt/usr/home/owner/media/Videos/1.mp4"
+#endif
 static GstElement* __build_h264_format_pipeline(media_packet_source_s *packet_source)
 {
        GstElement *pipeline;