Merge branch 'main' into ci/gilbok-lee/update_public

[platform/core/multimedia/esplusplayer.git] / src / esplusplayer / src / esplayer.cpp

diff --git a/src/esplusplayer/src/esplayer.cpp b/src/esplusplayer/src/esplayer.cpp
index a022e13..9096ef6 100755 (executable)
--- a/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
@@ -18,7 +18,9 @@
 
 #include "core/gst_utils.h"
 #include "core/track_util.h"
+#ifndef TIZEN_FEATURE_PUBLIC
 #include "core/utils/caf_logger.h"
+#endif
 #include "core/utils/performance_checker.h"
 #include "core/utils/plusplayer_cfg.h"
 #include "core/utils/plusplayer_log.h"
@@ -294,9 +296,11 @@ inline bool IsExclusiveLowLatencyMode(std::uint32_t current_mode,
 
 EsPlayer::EsPlayer() {
   std::call_once(es_conf::loaded, [this]() { es_conf::LoadIniFile(); });
+#ifndef TIZEN_FEATURE_PUBLIC
   if (CafLogger::Initialize() != true) {
     LOG_INFO("CAF Dbus not connect.");
   }
+#endif
   InitValuesFromIni_();
 }
 
@@ -325,9 +329,12 @@ bool EsPlayer::Open() {
     performance_checker::End(start, "Open");
     return true;
   };
+
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::SetUniqueNumber();
   caf_unique_number = CafLogger::GetUniqueNumber();
   CafLogger::LogMessage(CafEventType::kIdle, caf_unique_number);
+#endif
 
   es_event::Open event{op};
   return state_manager_.ProcessEvent(event);
@@ -514,7 +521,9 @@ bool EsPlayer::Start() {
     return true;
   };
 
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::LogMessage(CafEventType::kPlaying, caf_unique_number);
+#endif
 
   es_event::Start event{op};
   return state_manager_.ProcessEvent(event);
@@ -546,8 +555,10 @@ bool EsPlayer::Stop() {
     LOG_INFO_P(this, "Wait , Wait Prepare() Done...");
   }
 
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::LogMessage(CafEventType::kIdle, caf_unique_number);
   CafLogger::StopLoggingThread();
+#endif
 
   return res;
 }
@@ -715,8 +726,10 @@ bool EsPlayer::Prepare_() {
     return true;
   };
 
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::StartLoggingThread();
   CafLogger::LogMessage(CafEventType::kReady, caf_unique_number);
+#endif
 
   es_event::Prepare event{op};
   if (!state_manager_.ProcessEvent(event)) {
@@ -736,9 +749,11 @@ void EsPlayer::PrepareTask_() {
     LOG_INFO_P(this, "call OnPrepareDone End");
   }
 
+#ifndef TIZEN_FEATURE_PUBLIC
   kpi::CodecLogger logger;
   kpi::EsCodecLoggerKeys event_keys = MakeKpiKeys_();
   logger.SendKpi(ret, event_keys);
+#endif
   LOG_LEAVE_P(this);
 }
 
@@ -776,7 +791,9 @@ bool EsPlayer::Pause() {
         internal::ConvertToStreamType(track.type), true);
   }
 
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::LogMessage(CafEventType::kPaused, caf_unique_number);
+#endif
 
   es_event::Pause event{op};
   return state_manager_.ProcessEvent(event);
@@ -809,7 +826,9 @@ bool EsPlayer::Resume() {
         internal::ConvertToStreamType(track.type), true);
   }
 
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::LogMessage(CafEventType::kPlaying, caf_unique_number);
+#endif
 
   es_event::Resume event{op};
   return state_manager_.ProcessEvent(event);
@@ -878,7 +897,9 @@ void EsPlayer::SetAppInfo(const PlayerAppInfo& app_info) {
   app_info_ = app_info;
   trackrenderer_->SetAppInfo(app_info);
   LOG_INFO("Appid [%s]", app_info.id.c_str());
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::SetAppId(app_info.id);
+#endif
 }
 
 void EsPlayer::SetAppInfoEx(const PlayerAppInfoEx& app_info) {
@@ -893,7 +914,9 @@ void EsPlayer::SetAppInfoEx(const PlayerAppInfoEx& app_info) {
   app_info_.type = app_info.type;
   trackrenderer_->SetAppInfoEx(app_info);
   LOG_INFO("Appid [%s]", app_info_.id.c_str());
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::SetAppId(app_info_.id);
+#endif
 }
 
 bool EsPlayer::SetPlaybackRate(const double rate, const bool audio_mute) {
@@ -1170,7 +1193,9 @@ bool EsPlayer::SetStream_(const Track& track) {
     return true;
   };
 
+#ifndef TIZEN_FEATURE_PUBLIC
   CafLogger::LogMessage(CafEventType::kStreamReady, caf_unique_number);
+#endif
 
   es_event::SetStream event{op};
   return state_manager_.ProcessEvent(event);
@@ -2995,6 +3020,7 @@ bool EsPlayer::SetSimpleMixOutBufferLevel(
   return trackrenderer_->SetSimpleMixOutBufferLevel(converted_level);
 }
 
+#ifndef TIZEN_FEATURE_PUBLIC
 kpi::EsCodecLoggerKeys EsPlayer::MakeKpiKeys_() {
   kpi::EsCodecLoggerKeys event_info;
   event_info.app_id = app_info_.id;
@@ -3017,12 +3043,37 @@ kpi::EsCodecLoggerKeys EsPlayer::MakeKpiKeys_() {
   }
   return event_info;
 }
+#endif
 
 void EsPlayer::InitValuesFromIni_() {
   force_audio_swdecoder_use_ = es_conf::ini_property["force_sw_audio_codec"];
   force_video_swdecoder_use_ = es_conf::ini_property["force_sw_video_codec"];
 }
 
+#ifdef TIZEN_FEATURE_PUBLIC
+bool EsPlayer::EnableVideoHole(bool value) {
+  if (state_manager_.GetState() < EsState::kIdle) {
+    LOG_ERROR_P(this, "Invalid State , current %d",
+                state_manager_.GetStateEnum());
+    return false;
+  }
+  return trackrenderer_->EnableVideoHole(value);
+}
+
+bool EsPlayer::SetSoundStreamInfo(const sound_stream_info_h stream_info) {
+  if (state_manager_.GetState() != EsState::kIdle) {
+    LOG_ERROR_P(this, "Invalid State , current %d",
+                state_manager_.GetStateEnum());
+    return false;
+  }
+  if (!stream_info) {
+    LOG_ERROR_P(this, "stream_info is null");
+    return false;
+  }
+  return trackrenderer_->SetSoundStreamInfo(stream_info);
+}
+#endif
+
 namespace es_conf {
 
 void LoadIniProperty(const Json::Value& root) {