fixup! Remove unnecessary build definition

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

diff --git a/src/webrtc.c b/src/webrtc.c
index 3ea7f43547a872e02ad4dcdb149f367db3a2a6d2..c482ca95c5e32b967379b9e8f4458646a5777c46 100644 (file)
--- a/src/webrtc.c
+++ b/src/webrtc.c
@@ -113,7 +113,7 @@ int webrtc_unset_state_changed_cb(webrtc_h webrtc)
 
 int webrtc_create(webrtc_h *webrtc)
 {
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        int ret = WEBRTC_ERROR_NONE;
 #endif
        webrtc_s *_webrtc = NULL;
@@ -124,7 +124,7 @@ int webrtc_create(webrtc_h *webrtc)
 
        _webrtc = g_new0(webrtc_s, 1);
 
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        ret = _create_resource_manager(_webrtc);
        if (ret != WEBRTC_ERROR_NONE) {
                LOG_ERROR("failed to create resource manager");
@@ -167,7 +167,7 @@ int webrtc_destroy(webrtc_h webrtc)
        ret = _gst_pipeline_set_state(_webrtc, GST_STATE_NULL);
        RET_VAL_WITH_UNLOCK_IF(ret != WEBRTC_ERROR_NONE, ret, &_webrtc->mutex, "failed to _gst_pipeline_set_state()");
 
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        ret = _destroy_resource_manager(_webrtc);
        RET_VAL_WITH_UNLOCK_IF(ret != WEBRTC_ERROR_NONE, ret, &_webrtc->mutex, "failed to _destroy_resource_manager()");
 #endif
@@ -205,7 +205,7 @@ int webrtc_start(webrtc_h webrtc)
        RET_VAL_WITH_UNLOCK_IF(_webrtc->gst.webrtcbin == NULL, WEBRTC_ERROR_INVALID_OPERATION, &_webrtc->mutex, "webrtcbin is NULL");
        RET_VAL_WITH_UNLOCK_IF(!_check_if_format_is_set_to_packet_sources(_webrtc), WEBRTC_ERROR_INVALID_OPERATION, &_webrtc->mutex, "the media format should be set");
 
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        ret = _acquire_resource_if_needed(_webrtc);
        if (ret != WEBRTC_ERROR_NONE) {
                LOG_ERROR("failed to acquire resource, webrtc[%p]", _webrtc);

diff --git a/src/webrtc_private.c b/src/webrtc_private.c
index 9f86acc69c23824792c8ced6ed9c6902c8c03393..a3f9cc2f3de038834c3c87d768e6b294b2c47231 100644 (file)
--- a/src/webrtc_private.c
+++ b/src/webrtc_private.c
@@ -1602,7 +1602,7 @@ int _webrtc_stop(webrtc_s *webrtc)
        ret = _gst_pipeline_set_state(webrtc, GST_STATE_NULL);
        RET_VAL_WITH_UNLOCK_IF(ret != WEBRTC_ERROR_NONE, ret, &webrtc->mutex, "failed to _gst_pipeline_set_state()");
 
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        ret = _release_all_resources(webrtc);
        RET_VAL_WITH_UNLOCK_IF(ret != WEBRTC_ERROR_NONE, ret, &webrtc->mutex, "failed to release all resources");
 #endif

diff --git a/src/webrtc_sink.c b/src/webrtc_sink.c
index 07295dee43d1d074f48108886b6f2ea44f661c4c..5d91e96780c9d345d0dd7678bedcbbf8a3a95249 100644 (file)
--- a/src/webrtc_sink.c
+++ b/src/webrtc_sink.c
@@ -135,7 +135,7 @@ static int __build_videosink(webrtc_s *webrtc, GstElement *decodebin, GstPad *sr
                LOG_ERROR("failed to create videosink[%s]", videosink_factory_name);
                return WEBRTC_ERROR_INVALID_OPERATION;
        }
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
        if (sink->display->type == WEBRTC_DISPLAY_TYPE_OVERLAY && webrtc->ini.rendering_sink.v_overlay_resource_required) {
                webrtc->resource.need_to_acquire[MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_OVERLAY] = true;
                if ((ret =_acquire_resource_for_type(webrtc, MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_OVERLAY)))
@@ -387,7 +387,7 @@ static int __decodebin_autoplug_select_cb(GstElement *decodebin, GstPad *pad, Gs
                if (str_arr == NULL || !g_strv_contains((const gchar * const *)str_arr, factory_name)) {
                        LOG_WARNING("this video hw decoder element[%s] is not specified in ini file, skip it", factory_name);
                        return GST_AUTOPLUG_SELECT_SKIP;
-#ifdef TIZEN_FEATURE_RES_MGR
+#ifndef TIZEN_TV
                } else {
                        webrtc->resource.need_to_acquire[MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_DECODER] = true;
                        if (_acquire_resource_for_type(webrtc, MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_DECODER) != WEBRTC_ERROR_NONE)