[Reform] Apply Coding Style

diff --git a/include/esplusplayer/drm.h b/include/esplusplayer/drm.h
index 82ef1e7ac3b1783e592db27067bccf38bebab6f3..427031a4d3db921ffe35ef7db92d73fb64f2ab49 100644 (file)
--- a/include/esplusplayer/drm.h
+++ b/include/esplusplayer/drm.h
@@ -59,8 +59,7 @@ const std::map<std::string, std::string> KeySystemToDrmNameConverter = {
     {"com.tvkey.drm", "EME_NagSam"},
     {"com.widevine.alpha", "EME_Widevine"},
     {"kr.atsc3.uhdcp", "EME_Atsc3uhdcp"},
-    {"org.w3.clearkey", "EME_ClearKey"}
-};
+    {"org.w3.clearkey", "EME_ClearKey"}};
 
 // post from hlsdemux for getright
 

diff --git a/src/esplusplayer/include_internal/esplayer/esplayer.h b/src/esplusplayer/include_internal/esplayer/esplayer.h
index fbc12bb2ad1788caeb7110f6d40a08f10558fabd..9a57424d2a292716d1771ae4a8de3f6dba7c686f 100644 (file)
--- a/src/esplusplayer/include_internal/esplayer/esplayer.h
+++ b/src/esplusplayer/include_internal/esplayer/esplayer.h
@@ -5,6 +5,8 @@
 #ifndef __ESPLUSPLAYER_SRC_ESPLAYER_ESPLAYER__H__
 #define __ESPLUSPLAYER_SRC_ESPLAYER_ESPLAYER__H__
 
+#include <IEME.h>
+
 #include <boost/core/noncopyable.hpp>
 #include <future>
 #include <list>
@@ -14,7 +16,6 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <IEME.h>
 
 #include "core/decoderinputbuffer.h"
 #include "core/kpi.h"

diff --git a/src/esplusplayer/src/esplayer.cpp b/src/esplusplayer/src/esplayer.cpp
index fee853d05a36cf47a5a5f09f2e04884d13f467ad..33c9c128e472cea22cf51c3a2d3a2b6e1ac83c7b 100755 (executable)
--- a/src/esplusplayer/src/esplayer.cpp
+++ b/src/esplusplayer/src/esplayer.cpp
@@ -1643,10 +1643,13 @@ PacketSubmitStatus EsPlayer::SubmitEncryptedPacket(
   if (!key_system_acquired_) {
     key_system_ = eme::IEME::getKeySystemName(drm_info.handle);
     LOG_INFO("KeySystemName :: [%s] ", key_system_.c_str());
-    if (!state_manager_.GetPreparingState()) { //if the stream comes with clean data at the begining, re-post kpi when we get key system. 
-        kpi::CodecLogger logger;
-        kpi::EsCodecLoggerKeys event_keys = MakeKpiKeys_();
-        logger.SendKpi(true, event_keys);
+    if (!state_manager_
+             .GetPreparingState()) {  // if the stream comes with clean data at
+                                      // the begining, re-post kpi when we get
+                                      // key system.
+      kpi::CodecLogger logger;
+      kpi::EsCodecLoggerKeys event_keys = MakeKpiKeys_();
+      logger.SendKpi(true, event_keys);
     }
     key_system_acquired_ = true;
   }

diff --git a/src/plusplayer-core/include_internal/core/kpi.h b/src/plusplayer-core/include_internal/core/kpi.h
index e75569f3e5ceb7154092e010f16cf86f33fc829a..6f86033b6d4ca680f2a2a9f2fabceecbebb4409a 100644 (file)
--- a/src/plusplayer-core/include_internal/core/kpi.h
+++ b/src/plusplayer-core/include_internal/core/kpi.h
@@ -31,7 +31,7 @@ struct CodecLoggerKeys {
 
 struct EsCodecLoggerKeys {
   std::string app_id;
-  bool is_clean = true;  /**< (false:EME, true:MSE) */
+  bool is_clean = true; /**< (false:EME, true:MSE) */
   int width = 0;
   int height = 0;
   std::string v_codec;
@@ -40,14 +40,14 @@ struct EsCodecLoggerKeys {
   std::string key_system;
 };
 
-
 class CodecLogger {
  public:
-  CodecLogger() {};
-  ~CodecLogger() {};
+  CodecLogger(){};
+  ~CodecLogger(){};
 
   bool SendKpi(bool event_case, const CodecLoggerKeys& keys);
   bool SendKpi(bool event_case, const EsCodecLoggerKeys& keys);
+
  private:
   bool SendKpi_(bool event_case, const std::stringstream& message);
 };

diff --git a/src/plusplayer-core/src/kpi.cpp b/src/plusplayer-core/src/kpi.cpp
index 863b39b13041f9556b1eb7fb13573ba595fd8732..1d34e5db4a50ef186382d9d07d0f0dfe1c4c9a82 100644 (file)
--- a/src/plusplayer-core/src/kpi.cpp
+++ b/src/plusplayer-core/src/kpi.cpp
@@ -25,13 +25,15 @@ const char* GetProductYear(void) {
       "com.samsung/featureconf/product.tv_year", &value);
   if (result != SYSTEM_INFO_ERROR_NONE || value < 0) {
     LOG_ERROR(
-          "can't get com.samsung/featureconf/product.tv_year, result:%d, "
-          "value:%d",
-          result, value);
+        "can't get com.samsung/featureconf/product.tv_year, result:%d, "
+        "value:%d",
+        result, value);
     return "20";
   }
 
-  static char str_year[3] = {0, };
+  static char str_year[3] = {
+      0,
+  };
   int size = snprintf(str_year, 3, "%d", value);
   if (size != 2) {
     LOG_ERROR("size is not 2!! size:%d, year:%d", size, value);
@@ -132,14 +134,16 @@ bool CodecLogger::SendKpi(bool event_case, const EsCodecLoggerKeys& keys) {
   LOG_ENTER;
 
   std::string ptype = keys.is_clean ? "MSE" : "EME";
-  std::string drm_type = keys.is_clean ? "NONE" : drm::KeySystemToDrmNameConverter.at(keys.key_system);
+  std::string drm_type =
+      keys.is_clean ? "NONE"
+                    : drm::KeySystemToDrmNameConverter.at(keys.key_system);
   std::string v_decoder_type("HW");
   std::string a_decoder_type("HW");
   std::string container_type("EsPlusplayer");
   unsigned int video_tag = 0;
   unsigned int audio_tag = 0;
-  std::string video_codec = keys.v_codec + "-" +
-                            std::to_string(keys.v_codec_version);
+  std::string video_codec =
+      keys.v_codec + "-" + std::to_string(keys.v_codec_version);
 
   // generate message
   std::stringstream str;
@@ -178,13 +182,14 @@ bool CodecLogger::SendKpi_(bool event_case, const std::stringstream& message) {
     category = "EV002";
   }
 
-  LOG_ERROR("[KPI] service_name: %s, desc_log: %s",
-            service_name.str().c_str(), message.str().c_str());
+  LOG_ERROR("[KPI] service_name: %s, desc_log: %s", service_name.str().c_str(),
+            message.str().c_str());
 
   CLogger* pLogger = CLogger::GetInstance();
   LoggerErrorCode result = LOGGER_ERROR_NONE;
-  result = pLogger->AddEventLogSync(service_name.str().c_str(), eventName.c_str(),
-                                    category.c_str(), message.str().c_str());
+  result =
+      pLogger->AddEventLogSync(service_name.str().c_str(), eventName.c_str(),
+                               category.c_str(), message.str().c_str());
   if (result != LOGGER_ERROR_NONE) {
     LOG_ERROR("Failed to send KPI log for esplayer, result:%d", result);
     return false;
@@ -193,6 +198,5 @@ bool CodecLogger::SendKpi_(bool event_case, const std::stringstream& message) {
   return true;
 }
 
-
 }  // namespace kpi
 }  // namespace esplusplayer