Remove unnecessary build definition

These are the resource manager dependency codes for public tizen platform.
It's not necessary to make a particular definition as the previous one.

For tizen tv binary building, since the resource management is not used
rather, '#ifndef TIZEN_TV' is now used.

[Version] 0.2.9
[Issue Type] Build definition

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f56e71cf22d57323ec5fd6aa169047cadcb09a46..514ed676a43fd1002be89ceaa9a348e75fbc133f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,6 @@ SET(dependents "dlog glib-2.0 gstreamer-1.0 gstreamer-webrtc-1.0 gstreamer-video
                 libtbm libwebsockets cynara-client libsmack capi-system-info libsoup-2.4 bundle")
 IF(NOT TIZEN_PROFILE_TV)
     SET(dependents "${dependents} mm-resource-manager")
-    ADD_DEFINITIONS("-DTIZEN_FEATURE_RES_MGR")
 ELSE()
     ADD_DEFINITIONS("-DTIZEN_TV")
 ENDIF()

diff --git a/include/webrtc_private.h b/include/webrtc_private.h
index db07de5272a8e7df623f62582e0b47185cf4f91b..676f503c4896edbe297f5f88e54e2ce622bf5b68 100644 (file)
--- a/include/webrtc_private.h
+++ b/include/webrtc_private.h
@@ -26,7 +26,7 @@
 #endif
 #include <iniparser.h>
 #include <mm_display_interface.h>
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
 #include <mm_resource_manager.h>
 #endif
 #include <tbm_bufmgr.h>
@@ -242,7 +242,7 @@ enum {
        AV_IDX_MAX
 };
 
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
 #define RESOURCE_TYPE_MAX MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_ENCODER + 1
 
 typedef struct _webrtc_resource_s {
@@ -394,7 +394,7 @@ typedef struct _webrtc_s {
        bool negotiation_needed_cb_invoked;
 
        webrtc_negotiation_states_s negotiation_states;
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        webrtc_resource_s resource;
 #endif
 } webrtc_s;
@@ -539,7 +539,7 @@ void _release_display(webrtc_display_s *display);
 int _apply_display(webrtc_display_s *display);
 void _video_stream_decoded_cb(GstElement *object, GstBuffer *buffer, GstPad *pad, gpointer data);
 
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
 int _acquire_resource_if_needed(webrtc_s *webrtc);
 int _create_resource_manager(webrtc_s *webrtc);
 int _destroy_resource_manager(webrtc_s *webrtc);

diff --git a/packaging/capi-media-webrtc.spec b/packaging/capi-media-webrtc.spec
index 770ca9be104effb096255ce1ad58848e037dec8d..7103e23920b8843f848cce1f9cf86507d753d444 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.2.8
+Version:    0.2.9
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/webrtc_source.c b/src/webrtc_source.c
index 2ad282aa2cb13e2d2d56ae3f0d58e641f52ba312..70203cb286a472e94406f414c96c14236afd3fdd 100644 (file)
--- a/src/webrtc_source.c
+++ b/src/webrtc_source.c
@@ -623,7 +623,7 @@ static GstElement *__get_hw_encoder_element(webrtc_s *webrtc, webrtc_gst_slot_s
        }
 
        if (encoder) {
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
                webrtc->resource.need_to_acquire[MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_ENCODER] = true;
 #endif
                LOG_WARNING("hw encoder element [%s]", GST_ELEMENT_NAME(encoder));
@@ -1087,7 +1087,7 @@ static int __build_camerasrc(webrtc_s *webrtc, webrtc_gst_slot_s *source)
 
        source->media_types = MEDIA_TYPE_VIDEO;
        source->zerocopy_enabled = __is_hw_encoder_used(webrtc, source->type, source->media_types);
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        webrtc->resource.need_to_acquire[MM_RESOURCE_MANAGER_RES_TYPE_CAMERA] = true;
 #endif
        if (!(camerasrc = _create_element(__get_source_element(webrtc, WEBRTC_MEDIA_SOURCE_TYPE_CAMERA), ELEMENT_NAME_VIDEO_SRC)))