refactor: change to USE_MIXER macro

diff --git a/include/esplusplayer/esplusplayer.h b/include/esplusplayer/esplusplayer.h
index 73f3d8a..756cdcb 100644 (file)
--- a/include/esplusplayer/esplusplayer.h
+++ b/include/esplusplayer/esplusplayer.h
@@ -32,7 +32,7 @@
 #include <utility>
 #include <vector>
 
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
 #include "mixer/mixer.h"
 #endif
 
@@ -469,7 +469,7 @@ class EsPlusPlayer : private boost::noncopyable {
    *            EsPlusPlayer::SetDisplayVisible()
    */
   virtual bool SetDisplay(const DisplayType& type, void* obj) { return false; }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   /**
    * @brief     Set the video display
    * @remarks   We are not supporting changing display.

diff --git a/packaging/esplusplayer.spec b/packaging/esplusplayer.spec
index c1d4916..dd55b3c 100644 (file)
--- a/packaging/esplusplayer.spec
+++ b/packaging/esplusplayer.spec
@@ -128,15 +128,21 @@ export CXXFLAGS+=" -Wno-deprecated-declarations"
 export CFLAGS+=" -DIS_AUDIO_PRODUCT"
 export CXXFLAGS+=" -DIS_AUDIO_PRODUCT"
 %define PRODUCT_TYPE_AUDIO yes
+%define USE_MIXER no
 %else
 %define PRODUCT_TYPE_AUDIO no
+%define USE_MIXER yes
+export CFLAGS+=" -DUSE_MIXER"
+export CXXFLAGS+=" -DUSE_MIXER"
 %endif
 
+#TODO: check AV type is used or not
 %if ("%{_vd_cfg_product_type}" == "AV")
 export CFLAGS+=" -DIS_AV_PRODUCT"
 export CXXFLAGS+=" -DIS_AV_PRODUCT"
 %endif
 
+#TODO: AUDIO type is used to enable fmm mode API impl.
 %if ("%{_vd_cfg_product_type}" == "AUDIO")
 export CFLAGS+=" -DSOUNDBAR_PRODUCT"
 export CXXFLAGS+=" -DSOUNDBAR_PRODUCT"
@@ -160,12 +166,12 @@ export CXXFLAGS+=" -DDRM_MAPI_AARCH_64"
 
 %if ("%{sec_buildconf_product_lite_tizen}" == "n")
 %if %{with ESPLUSPLAYER_UT}
-%cmake . -DESPLUSPLAYER_BUILD_UT=ON -DPRODUCT_TYPE_AUDIO=%PRODUCT_TYPE_AUDIO
+%cmake . -DESPLUSPLAYER_BUILD_UT=ON -DPRODUCT_TYPE_AUDIO=%PRODUCT_TYPE_AUDIO -DUSE_MIXER=%USE_MIXER
 %else
-%cmake . -DPRODUCT_TYPE_AUDIO=%PRODUCT_TYPE_AUDIO
+%cmake . -DPRODUCT_TYPE_AUDIO=%PRODUCT_TYPE_AUDIO -DUSE_MIXER=%USE_MIXER
 %endif
 %else
-%cmake . -DPRODUCT_TYPE_AUDIO=%PRODUCT_TYPE_AUDIO
+%cmake . -DPRODUCT_TYPE_AUDIO=%PRODUCT_TYPE_AUDIO -DUSE_MIXER=%USE_MIXER
 %endif
 
 make %{?jobs:-j%jobs}
@@ -202,7 +208,7 @@ find . \( -name '*.gcno' -o -name '*.cpp' -o -name '*.c' -o -name '*.hpp' -o -na
 %license LICENSE.APLv2
 %{_libdir}/libespplayer-core.so
 %{_libdir}/libesplusplayer.so
-%if ("%{_vd_cfg_product_type}" != "AUDIO")
+%if ("%{USE_MIXER}" == "yes")
 %{_libdir}/libmixer.so
 %endif
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 028312a..dbd90f4 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 ADD_SUBDIRECTORY(plusplayer-core)
 ADD_SUBDIRECTORY(esplusplayer)
-IF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+IF(${USE_MIXER} STREQUAL "yes")
 ADD_SUBDIRECTORY(mixer)
-ENDIF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+ENDIF(${USE_MIXER} STREQUAL "yes")

diff --git a/src/esplusplayer/CMakeLists.txt b/src/esplusplayer/CMakeLists.txt
index bd82c70..a698fde 100644 (file)
--- a/src/esplusplayer/CMakeLists.txt
+++ b/src/esplusplayer/CMakeLists.txt
@@ -4,18 +4,18 @@ SET(fw_name "${PROJECT_NAME}")
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib)
 SET(${fw_name}_LDFLAGS)
 
-IF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+IF(${USE_MIXER} STREQUAL "yes")
 SET(ADD_LIBS
   "espplayer-core"
   "trackrenderer"
   "mixer"
 )
-ELSE(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+ELSE(${USE_MIXER} STREQUAL "yes")
 SET(ADD_LIBS
   "espplayer-core"
   "trackrenderer"
 )
-ENDIF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+ENDIF(${USE_MIXER} STREQUAL "yes")
 
 SET(${fw_name}_CXXFLAGS "-Wall -Werror -std=c++17 -fPIC -fno-lto -Wl,-z,relro -fstack-protector -DEFL_BETA_API_SUPPORT")
 

diff --git a/src/esplusplayer/include_internal/esplayer/esplayer.h b/src/esplusplayer/include_internal/esplayer/esplayer.h
index dd74268..175f67e 100644 (file)
--- a/src/esplusplayer/include_internal/esplayer/esplayer.h
+++ b/src/esplusplayer/include_internal/esplayer/esplayer.h
@@ -18,7 +18,7 @@
 #include "core/decoderinputbuffer.h"
 #include "core/kpi.h"
 #include "core/trackrendereradapter.h"
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
 #include "mixer/mixerticket.h"
 #include "mixer/mixerticket_eventlistener.h"
 #endif
@@ -67,7 +67,7 @@ class EsPlayer : public EsPlusPlayer {
   void SetAppInfoEx(const PlayerAppInfoEx& app_info) override;
   bool SetPlaybackRate(const double rate, const bool audio_mute) override;
   bool SetDisplay(const DisplayType& type, void* obj) override;
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   bool SetDisplay(const DisplayType& type, MixerTicket* handle) override;
 #endif
   bool SetDisplay(const DisplayType& type, void* ecore_wl2_window, const int x,
@@ -215,7 +215,7 @@ class EsPlayer : public EsPlusPlayer {
   void GetSrcQueueCurrentSize_(const TrackType& type, uint64_t* byte_size,
                                uint64_t* time_size);
   kpi::EsCodecLoggerKeys MakeKpiKeys_();
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   bool PrepareVideoMixingMode_(std::vector<Track>* tracks);
 #endif
   void InitValuesFromIni_();
@@ -246,7 +246,7 @@ class EsPlayer : public EsPlusPlayer {
     void OnVideoHighLatency() override;
     void OnAudioHighLatency() override;
     void OnVideoFrameDropped(const uint64_t& count) override;
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
     void OnMediaPacketVideoRawDecoded(
         const DecodedVideoRawModePacket& packet) override;
 #endif
@@ -266,7 +266,7 @@ class EsPlayer : public EsPlusPlayer {
     EsPlayer* handler_ = nullptr;
   };  // class TrackRendererEventListener
 
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   class MixerListener : public MixerTicketEventListener {
    public:
     explicit MixerListener(EsPlayer* handler) : handler_(handler) {
@@ -319,7 +319,7 @@ class EsPlayer : public EsPlusPlayer {
 
   std::unique_ptr<TrackRendererEventListener> trackrenderer_event_listener_{
       new TrackRendererEventListener(this)};
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   std::unique_ptr<MixerListener> mixer_event_listener_{new MixerListener(this)};
 #endif
   std::unique_ptr<TrackRendererAdapter> trackrenderer_;
@@ -334,7 +334,7 @@ class EsPlayer : public EsPlusPlayer {
   SrcQueueSize src_queue_size_;
 
   std::string caf_unique_number;
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   std::unique_ptr<MixerTicket> mixer_ticket_;
   bool is_audio_focused_ = true;
   Geometry mixerticket_roi_;

diff --git a/src/esplusplayer/src/esplayer.cpp b/src/esplusplayer/src/esplayer.cpp
index 9abf80b..9f7805d 100644 (file)
--- a/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
@@ -372,7 +372,7 @@ bool EsPlayer::Deactivate(const StreamType type) {
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (!enable_audio_pipeline_handle_ && type == StreamType::kAudio) {
     LOG_ERROR_P(
         this, "can't deactivate audio stream, mixer will control audio stream");
@@ -410,7 +410,7 @@ bool EsPlayer::Activate(const StreamType type) {
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (!enable_audio_pipeline_handle_ && type == StreamType::kAudio) {
     LOG_ERROR_P(this,
                 "can't activate audio stream, mixer will control audio stream");
@@ -438,7 +438,7 @@ bool EsPlayer::Activate(const StreamType type) {
       internal::MakeTrustZoneTracks(track_, app_info_.id);
     }
     SetTrackRendererAttributes_();
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
     if (type == StreamType::kVideo) {
       if (mixer_ticket_)
         trackrenderer_->SetVideoFrameBufferType(
@@ -466,7 +466,7 @@ bool EsPlayer::DeactivateAudio() {
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (!enable_audio_pipeline_handle_) {
     LOG_ERROR_P(
         this, "can't deactivate audio stream, mixer will control audio stream");
@@ -488,7 +488,7 @@ bool EsPlayer::ActivateAudio() {
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (!enable_audio_pipeline_handle_) {
     LOG_ERROR_P(this,
                 "can't activate audio stream, mixer will control audio stream");
@@ -532,7 +532,7 @@ bool EsPlayer::Stop() {
     const auto start = performance_checker::Start();
     if (trackrenderer_) trackrenderer_->Stop();
     ResetContextForStop_();
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
     if (mixer_ticket_) mixer_ticket_.reset();
 #endif
     performance_checker::End(start, "Stop");
@@ -619,7 +619,7 @@ void EsPlayer::SetTrackRendererAttributes_() {
 }
 
 // LCOV_EXCL_START
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
 bool EsPlayer::PrepareVideoMixingMode_(std::vector<Track>* tracks) {
   LOG_ENTER_P(this);
   mixer_ticket_->Prepare();
@@ -672,7 +672,7 @@ bool EsPlayer::Prepare_() {
       return false;
     }
     trackrenderer_->SetIniProperty(es_conf::ini_property);
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
     if (mixer_ticket_) {
       trackrenderer_->SetVideoFrameBufferType(
           VideoFrameTypeStrategyPtr(new RawVideoFrameTypeStrategy()));
@@ -936,14 +936,14 @@ bool EsPlayer::SetDisplay(const DisplayType& type, void* obj) {
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (mixer_ticket_) mixer_ticket_.reset();
 #endif
   return trackrenderer_->SetDisplay(type, obj);
 }
 
 // LCOV_EXCL_START
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
 bool EsPlayer::SetDisplay(const DisplayType& type, MixerTicket* handle) {
   if (type == DisplayType::kMixer) {
     LOG_INFO_P(this, "Create MixerTicket");
@@ -965,7 +965,7 @@ bool EsPlayer::SetDisplay(const DisplayType& type, void* ecore_wl2_window,
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (mixer_ticket_) mixer_ticket_.reset();
 #endif
   return trackrenderer_->SetDisplay(type, ecore_wl2_window, x, y, w, h);
@@ -979,7 +979,7 @@ bool EsPlayer::SetDisplaySubsurface(const DisplayType& type,
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (mixer_ticket_) mixer_ticket_.reset();
 #endif
   return trackrenderer_->SetDisplaySubsurface(type, ecore_wl2_subsurface, x, y,
@@ -993,7 +993,7 @@ bool EsPlayer::SetDisplay(const DisplayType& type, unsigned int surface_id,
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (mixer_ticket_) mixer_ticket_.reset();
 #endif
   return trackrenderer_->SetDisplay(type, surface_id, x, y, w, h);
@@ -1026,7 +1026,7 @@ bool EsPlayer::SetDisplayRoi(const Geometry& roi) {
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   mixerticket_roi_ = roi;
   if (mixer_ticket_) return true;
 #endif
@@ -1078,7 +1078,7 @@ bool EsPlayer::SetDisplayVisible(bool is_visible) {
                 state_manager_.GetStateEnum());
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (mixer_ticket_) {
     LOG_INFO_P(this, "mixed player is_visible [%d] -> [%d]", is_visible_,
                is_visible);
@@ -2047,7 +2047,7 @@ bool EsPlayer::SetVideoCodecType(const PlayerVideoCodecType& type) {
                 "type is scale");
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (!enable_rsc_alloc_handle_) {
     LOG_ERROR_P(this, "player can't control resource type, mixer will do it");
     return false;
@@ -2140,7 +2140,7 @@ bool EsPlayer::SetAlternativeVideoResource(unsigned int rsc_type) {
     LOG_ERROR_P(this, "Invalid State");
     return false;
   }
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
   if (!enable_rsc_alloc_handle_) {
     LOG_ERROR_P(this, "player can't control resource type, mixer will do it");
     return false;
@@ -2628,7 +2628,7 @@ void EsPlayer::TrackRendererEventListener::OnMediaPacketVideoDecoded(
   handler_->eventlistener_->OnMediaPacketVideoDecoded(packet);
 }
 
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
 void EsPlayer::TrackRendererEventListener::OnMediaPacketVideoRawDecoded(
     const DecodedVideoRawModePacket& packet) {
   if (handler_->mixer_ticket_ == nullptr) return;

diff --git a/src/esplusplayer/src/esplusplayer_capi.cpp b/src/esplusplayer/src/esplusplayer_capi.cpp
index 60b93d4..a5ec155 100644 (file)
--- a/src/esplusplayer/src/esplusplayer_capi.cpp
+++ b/src/esplusplayer/src/esplusplayer_capi.cpp
@@ -18,7 +18,7 @@ using esplusplayer::Geometry;
 #include "core/utils/plusplayer_log.h"
 #include "esplayer/decoded_pkt_list.h"
 #include "esplusplayer_capi/esplusplayer_internal.h"
-#ifndef IS_TOMATO
+#if defined(USE_MIXER) && !defined(IS_TOMATO)
 #include "mixer_capi/mixer_capi.h"
 #endif
 #include "esplusplayer/appinfo.h"
@@ -1058,7 +1058,7 @@ int esplusplayer_set_display(esplusplayer_handle handle,
   LOG_INFO_P(cast_(handle), "display type : %d, object : %p",
              static_cast<int>(type), window);
 
-#if (!IS_AUDIO_PRODUCT) && (!IS_TOMATO)
+#if defined(USE_MIXER) && !defined(IS_TOMATO)
   if (type == ESPLUSPLAYER_DISPLAY_TYPE_MIXER) {
     mixer_handle mixer_h = window;
     esplusplayer::MixerTicket* ticket =

diff --git a/ut/CMakeLists.txt b/ut/CMakeLists.txt
index f013e50..bcce70e 100644 (file)
--- a/ut/CMakeLists.txt
+++ b/ut/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(${fw_name}_CXXFLAGS "-Wall -Werror -std=c++17 -pthread -fPIE -Wl,-z,relro -f
 
 SET(${fw_name}_LDFLAGS)
 
-IF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+IF(${USE_MIXER} STREQUAL "yes")
 SET(ADD_LIBS
   "espplayer-core"
   "trackrenderer"
@@ -15,14 +15,14 @@ SET(ADD_LIBS
   "mixer"
   "gstvideo-1.0"
 )
-ELSE(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+ELSE(${USE_MIXER} STREQUAL "yes")
 SET(ADD_LIBS
   "espplayer-core"
   "trackrenderer"
   "esplusplayer"
   "gstvideo-1.0"
 )
-ENDIF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+ENDIF(${USE_MIXER} STREQUAL "yes")
 
 SET(dependents "gstreamer-1.0 glib-2.0 gstreamer-plugins-base-1.0 gstreamer-app-1.0 dlog gtest gmock"
                "boost"
@@ -67,7 +67,7 @@ FILE(GLOB UT_SRC
   src/tc_regression.cpp
 )
 
-IF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+IF(${USE_MIXER} STREQUAL "yes")
 SET(UT_MIXER_SRC
   src/mixer/constant.cpp
   src/mixer/matcher.cpp
@@ -84,9 +84,9 @@ SET(UT_MIXER_SRC
   src/mixer/ut_videoplane.cpp
 )
 #ADD_EXECUTABLE(${fw_name} ${UT_SRC} ${UT_MIXER_SRC})
-#ELSE(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+#ELSE(${USE_MIXER} STREQUAL "yes")
 #ADD_EXECUTABLE(${fw_name} ${UT_SRC})
-ENDIF(${PRODUCT_TYPE_AUDIO} STREQUAL "no")
+ENDIF(${USE_MIXER} STREQUAL "yes")
 ADD_EXECUTABLE(${fw_name} ${UT_SRC})
 LINK_DIRECTORIES(${LIB_INSTALL_DIR})
 

diff --git a/ut/include/utils/utility.h b/ut/include/utils/utility.h
index 14882c6..fce1d27 100644 (file)
--- a/ut/include/utils/utility.h
+++ b/ut/include/utils/utility.h
@@ -88,7 +88,7 @@ class Utility {
 
   const char* GetCurrentTestName(void);
 
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
 
 #if 0
   esplusplayer::PlusPlayer::Ptr GetOpenedMixPlusPlayer(std::string& uri,

diff --git a/ut/src/utils/utility.cpp b/ut/src/utils/utility.cpp
index 81fd62e..6c4db27 100644 (file)
--- a/ut/src/utils/utility.cpp
+++ b/ut/src/utils/utility.cpp
@@ -57,7 +57,7 @@ const char* Utility::GetCurrentTestName(void) {
   return ::testing::UnitTest::GetInstance()->current_test_info()->name();
 }
 
-#ifndef IS_AUDIO_PRODUCT
+#ifdef USE_MIXER
 
 #if 0
 esplusplayer::PlusPlayer::Ptr Utility::GetOpenedMixPlusPlayer(std::string& uri,