Fix format issue

Author: xiaowei-guan

packages/video_player_avplay/tizen/inc/plusplayer_capi/property.h

@@ -36,10 +36,10 @@ extern "C" {
  * @brief  Enumerations for plusplayer property.
  */
 typedef enum {
-  PLUSPLAYER_PROPERTY_ADAPTIVE_INFO, /**< String containing custom
-                                            attributes for adaptive streaming
-                                            playback. Effective only for
-                                        Adaptive Streaming Protocols.*/
+  PLUSPLAYER_PROPERTY_ADAPTIVE_INFO,        /**< String containing custom
+                                                   attributes for adaptive streaming
+                                                   playback. Effective only for
+                                               Adaptive Streaming Protocols.*/
   PLUSPLAYER_PROPERTY_LISTEN_SPARSE_TRACK,  /**< Sparse track is a
                                                    lightweight timeline-synced
                                                    stream used for captions,

packages/video_player_avplay/tizen/inc/plusplayer_capi/track.h

@@ -43,7 +43,6 @@ typedef enum {
   PLUSPLAYER_TRACK_TYPE_SUBTITLE   /**< Track type Subtitle */
 } plusplayer_track_type_e;
 
-
 #ifdef __cplusplus
 }  // extern "C"
 #endif

packages/video_player_avplay/tizen/inc/plusplayer_capi/track_capi.h

@@ -511,7 +511,8 @@ int plusplayer_get_track_layer(plusplayer_track_h track, int* track_layer);
  * @code
  *            plusplayer_track_h track = ...;
  *            int track_bits_per_sample;
- *            plusplayer_get_track_bits_per_sample(track, &track_bits_per_sample);
+ *            plusplayer_get_track_bits_per_sample(track,
+ * &track_bits_per_sample);
  *            // ... your codes ...
  * @endcode
  * @pre       The track handle must be valid.
@@ -674,7 +675,8 @@ int plusplayer_get_track_lang_code(plusplayer_track_h track,
  * @code
  *            plusplayer_track_h track = ...;
  *            const char* track_subtitle_format;
- *            plusplayer_get_track_subtitle_format(track, &track_subtitle_format);
+ *            plusplayer_get_track_subtitle_format(track,
+ * &track_subtitle_format);
  *            // ... your codes ...
  * @endcode
  * @pre       The track handle must be valid.

packages/video_player_avplay/tizen/src/drm_manager.cc

@@ -154,7 +154,8 @@ int DrmManager::UpdatePsshData(const void *data, int length) {
   return ret;
 }
 
-bool DrmManager::SecurityInitCompleteCB(Plusplayer_DrmHandle *drm_handle, unsigned int len,
+bool DrmManager::SecurityInitCompleteCB(Plusplayer_DrmHandle *drm_handle,
+                                        unsigned int len,
                                         unsigned char *pssh_data,
                                         void *user_data) {
   // IMPORTANT: SetDataParam_t cannot be stack allocated because

packages/video_player_avplay/tizen/src/drm_manager.h

@@ -7,12 +7,11 @@
 
 #include <Ecore.h>
 #include <flutter/method_channel.h>
+#include <plusplayer_capi/plusplayer_capi.h>
 
 #include <mutex>
 #include <queue>
 
-#include <plusplayer_capi/plusplayer_capi.h>
-
 class DrmManager {
  public:
   typedef enum {
@@ -30,8 +29,9 @@ class DrmManager {
   bool SetChallenge(const std::string &media_url,
                     flutter::BinaryMessenger *binary_messenger);
   bool GetDrmHandle(int *handle);
-  bool SecurityInitCompleteCB(Plusplayer_DrmHandle *drm_handle, unsigned int len,
-                              unsigned char *pssh_data, void *user_data);
+  bool SecurityInitCompleteCB(Plusplayer_DrmHandle *drm_handle,
+                              unsigned int len, unsigned char *pssh_data,
+                              void *user_data);
   int UpdatePsshData(const void *data, int length);
   void ReleaseDrmSession();
 

packages/video_player_avplay/tizen/src/plus_player.cc

@@ -462,7 +462,7 @@ flutter::EncodableValue ParseVideoTrack(const plusplayer_track_h track) {
   LOG_DEBUG(
       "[PlusPlayer] video track info : trackId : %d, mimetype : %s, width : "
       "%d, height : %d, birate : %d",
-      index, mimetype, width, height, bitrate);
+      track_index, mimetype, width, height, bitrate);
   return flutter::EncodableValue(video_track_result);
 }
 
@@ -711,9 +711,13 @@ std::string PlusPlayer::GetStreamingProperty(
     return "";
   }
   char *value;
-  if (plusplayer_get_property(player_,
-                              ConvertPropertyType(streaming_property_type),
-                              &value) != PLUSPLAYER_ERROR_TYPE_NONE) {
+  plusplayer_property_e property = ConvertPropertyType(streaming_property_type);
+  if (property == static_cast<plusplayer_property_e>(-1)) {
+    LOG_ERROR("[PlusPlayer]:Player fail to convert property type");
+    return "";
+  }
+  if (plusplayer_get_property(player_, property, &value) !=
+      PLUSPLAYER_ERROR_TYPE_NONE) {
     LOG_ERROR("[PlusPlayer]:Player fail to get streaming property");
     return "";
   }
@@ -768,7 +772,6 @@ void PlusPlayer::SetStreamingProperty(const std::string &type,
     LOG_INFO("[PlusPlayer] Streaming property value is true");
     // TODO: handle true case if needed
   }
-  // plusplayer_set_adaptive_streaming_control_event_cb is not applicable here
 }
 
 bool PlusPlayer::SetDisplayRotate(int64_t rotation) {

packages/video_player_avplay/tizen/src/plus_player.h

@@ -13,9 +13,9 @@
 #include "device_proxy.h"
 #include "drm_manager.h"
 #include "messages.h"
+#include "plus_player_util.h"
 #include "plusplayer_capi/plusplayer_capi.h"
 #include "video_player.h"
-#include "plus_player_util.h"
 
 namespace video_player_avplay_tizen {
 

packages/video_player_avplay/tizen/src/plus_player_util.cc

@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "plus_player_util.h"
+
 #include "log.h"
 namespace video_player_avplay_tizen {
 
@@ -15,20 +16,30 @@ static const std::unordered_map<std::string, plusplayer_track_type_e>
         {"audio", plusplayer_track_type_e::PLUSPLAYER_TRACK_TYPE_AUDIO},
         {"text", plusplayer_track_type_e::PLUSPLAYER_TRACK_TYPE_SUBTITLE}};
 
-static const std::unordered_map<std::string, plusplayer_property_e> kMap = {
-    {"ADAPTIVE_INFO", plusplayer_property_e::PLUSPLAYER_PROPERTY_ADAPTIVE_INFO},
-    {"LISTEN_SPARSE_TRACK",
-     plusplayer_property_e::PLUSPLAYER_PROPERTY_LISTEN_SPARSE_TRACK},
-    {"AVAILABLE_BITRATE",
-     plusplayer_property_e::PLUSPLAYER_PROPERTY_AVAILABLE_BITRATE},
-    {"CURRENT_BANDWIDTH",
-     plusplayer_property_e::PLUSPLAYER_PROPERTY_CURRENT_BANDWIDTH},
-    {"GET_LIVE_DURATION",
-     plusplayer_property_e::PLUSPLAYER_PROPERTY_LIVE_DURATION},
-    {"IS_LIVE", plusplayer_property_e::PLUSPLAYER_PROPERTY_IS_LIVE},
-    {"TOKEN", plusplayer_property_e::PLUSPLAYER_PROPERTY_TOKEN},
-    {"OPEN_HTTP_HEADER",
-     plusplayer_property_e::PLUSPLAYER_PROPERTY_OPEN_HTTP_HEADER}};
+static std::unordered_map<std::string, plusplayer_property_e>
+    kConvertPropertyMap = {
+        {"ADAPTIVE_INFO", PLUSPLAYER_PROPERTY_ADAPTIVE_INFO},
+        {"LISTEN_SPARSE_TRACK", PLUSPLAYER_PROPERTY_LISTEN_SPARSE_TRACK},
+        {"CONFIG_LOW_LATENCY", PLUSPLAYER_PROPERTY_CONFIG_LOW_LATENCY},
+        {"ATSC3_L1_SERVER_TIME", PLUSPLAYER_PROPERTY_ATSC3_L1_SERVER_TIME},
+        {"AUDIO_DESCRIPTION", PLUSPLAYER_PROPERTY_AUDIO_DESCRIPTION},
+        {"PRESELECTION_TAG", PLUSPLAYER_PROPERTY_PRESELECTION_TAG},
+        {"USE_MAIN_OUT_SHARE", PLUSPLAYER_PROPERTY_USE_MAIN_OUT_SHARE},
+        {"TOKEN", PLUSPLAYER_PROPERTY_TOKEN},
+        {"USER_LOW_LATENCY", PLUSPLAYER_PROPERTY_USER_LOW_LATENCY},
+        {"MAX_BANDWIDTH", PLUSPLAYER_PROPERTY_MAX_BANDWIDTH},
+        {"MPEGH_METADATA", PLUSPLAYER_PROPERTY_MPEGH_METADATA},
+        {"OPEN_HTTP_HEADER", PLUSPLAYER_PROPERTY_OPEN_HTTP_HEADER},
+        {"IS_LIVE", PLUSPLAYER_PROPERTY_IS_LIVE},
+        {"AVAILABLE_BITRATE", PLUSPLAYER_PROPERTY_AVAILABLE_BITRATE},
+        {"GET_LIVE_DURATION", PLUSPLAYER_PROPERTY_LIVE_DURATION},
+        {"CURRENT_BANDWIDTH", PLUSPLAYER_PROPERTY_CURRENT_BANDWIDTH},
+        {"CUR_LATENCY", PLUSPLAYER_PROPERTY_CUR_LATENCY},
+        {"IS_DVB_DASH", PLUSPLAYER_PROPERTY_IS_DVB_DASH},
+        {"LIVE_PLAYER_START", PLUSPLAYER_PROPERTY_LIVE_PLAYER_START},
+        {"START_DATE", PLUSPLAYER_PROPERTY_START_DATE},
+        {"DASH_STREAM_INFO", PLUSPLAYER_PROPERTY_DASH_STREAM_INFO},
+        {"HTTP_HEADER", PLUSPLAYER_PROPERTY_HTTP_HEADER}};
 
 plusplayer_track_type_e ConvertTrackType(const std::string &track_type) {
   auto it = kTrackMap.find(track_type);
@@ -40,11 +51,11 @@ plusplayer_track_type_e ConvertTrackType(const std::string &track_type) {
 }
 
 plusplayer_property_e ConvertPropertyType(const std::string &type_value) {
-  auto it = kMap.find(type_value);
-  if (it != kMap.end()) {
-    return it->second;
+  for (const auto &pair : kConvertPropertyMap) {
+    if (pair.first == type_value) {
+      return pair.second;
+    }
   }
-  // Return an invalid sentinel value if not found.
   return static_cast<plusplayer_property_e>(-1);
 }