Add ConvertDisplayMode and ConvertDisplayRotationType method

Author: xiaowei-guan

packages/video_player_avplay/tizen/src/plus_player.cc

@@ -409,8 +409,8 @@ bool PlusPlayer::SetDisplay() {
   }
   plusplayer_geometry_s roi{x, y, width, height};
   if (plusplayer_set_display_subsurface(
-          player_, plusplayer_display_type_e::PLUSPLAYER_DISPLAY_TYPE_OVERLAY,
-          resource_id, roi) != PLUSPLAYER_ERROR_TYPE_NONE) {
+          player_, PLUSPLAYER_DISPLAY_TYPE_OVERLAY, resource_id, roi) !=
+      PLUSPLAYER_ERROR_TYPE_NONE) {
     LOG_ERROR("[PlusPlayer] Player fail to set display.");
     return false;
   }
@@ -820,8 +820,8 @@ bool PlusPlayer::SetDisplayRotate(int64_t rotation) {
 
   LOG_INFO("[PlusPlayer] rotation: %lld", rotation);
   return plusplayer_set_display_rotation(
-             player_, static_cast<plusplayer_display_rotation_type_e>(
-                          rotation)) != PLUSPLAYER_ERROR_TYPE_NONE;
+             player_, ConvertDisplayRotationType(rotation)) !=
+         PLUSPLAYER_ERROR_TYPE_NONE;
 }
 
 bool PlusPlayer::SetDisplayMode(int64_t display_mode) {
@@ -836,8 +836,7 @@ bool PlusPlayer::SetDisplayMode(int64_t display_mode) {
     return false;
   }
   LOG_INFO("[PlusPlayer] display_mode: %lld", display_mode);
-  if (plusplayer_set_display_mode(
-          player_, static_cast<plusplayer_display_mode_e>(display_mode)) !=
+  if (plusplayer_set_display_mode(player_, ConvertDisplayMode(display_mode)) !=
       PLUSPLAYER_ERROR_TYPE_NONE) {
     LOG_ERROR("[PlusPlayer] Player fail to set display mode.");
     return false;
@@ -1186,14 +1185,12 @@ void PlusPlayer::OnSubtitleData(const plusplayer_subtitle_type_e type,
                                 int attr_size, void *userdata) {}
 
 void PlusPlayer::OnResourceConflicted(void *user_data) {
-  LOG_ERROR("[PlusPlayer] Resource conflicted.");
   PlusPlayer *self = reinterpret_cast<PlusPlayer *>(user_data);
 
   self->SendIsPlayingState(false);
 }
 
 void PlusPlayer::OnError(plusplayer_error_type_e error_type, void *user_data) {
-  LOG_ERROR("[PlusPlayer] Error code: %d", error_type);
   PlusPlayer *self = reinterpret_cast<PlusPlayer *>(user_data);
 
   self->SendError("[PlusPlayer] error",
@@ -1202,7 +1199,6 @@ void PlusPlayer::OnError(plusplayer_error_type_e error_type, void *user_data) {
 
 void PlusPlayer::OnErrorMsg(plusplayer_error_type_e error_type,
                             const char *error_msg, void *user_data) {
-  LOG_ERROR("[PlusPlayer] Error code: %d, message: %s.", error_type, error_msg);
   PlusPlayer *self = reinterpret_cast<PlusPlayer *>(user_data);
 
   self->SendError("PlusPlayer error", std::string("Error: ") + error_msg);

packages/video_player_avplay/tizen/src/plus_player_util.cc

@@ -40,6 +40,35 @@ static std::unordered_map<std::string, plusplayer_property_e>
         {"DASH_STREAM_INFO", PLUSPLAYER_PROPERTY_DASH_STREAM_INFO},
         {"HTTP_HEADER", PLUSPLAYER_PROPERTY_HTTP_HEADER}};
 
+static const std::vector<plusplayer_display_rotation_type_e>
+    kConvertDisplayRotationVec = {PLUSPLAYER_DISPLAY_ROTATION_TYPE_NONE,
+                                  PLUSPLAYER_DISPLAY_ROTATION_TYPE_90,
+                                  PLUSPLAYER_DISPLAY_ROTATION_TYPE_180,
+                                  PLUSPLAYER_DISPLAY_ROTATION_TYPE_270};
+
+static const std::vector<plusplayer_display_mode_e> kConvertDisplayModeMap = {
+    PLUSPLAYER_DISPLAY_MODE_LETTER_BOX,
+    PLUSPLAYER_DISPLAY_MODE_ORIGIN_SIZE,
+    PLUSPLAYER_DISPLAY_MODE_FULL_SCREEN,
+    PLUSPLAYER_DISPLAY_MODE_CROPPED_FULL,
+    PLUSPLAYER_DISPLAY_MODE_ORIGIN_OR_LETTER,
+    PLUSPLAYER_DISPLAY_MODE_DST_ROI,
+    PLUSPLAYER_DISPLAY_MODE_AUTO_ASPECT_RATIO,
+    PLUSPLAYER_DISPLAY_MODE_ROI_AUTO_ASPECT_RATIO};
+
+plusplayer_display_rotation_type_e ConvertDisplayRotationType(
+    const int64_t &rotation_type) {
+  int index = static_cast<int>(rotation_type);
+  return kConvertDisplayRotationVec[index];
+}
+
+plusplayer_display_mode_e ConvertDisplayMode(const int64_t &display_mode) {
+  int index = static_cast<int>(display_mode);
+  return (index >= 0 && index < kConvertDisplayModeMap.size())
+             ? kConvertDisplayModeMap[index]
+             : static_cast<plusplayer_display_mode_e>(-1);
+}
+
 plusplayer_track_type_e ConvertTrackType(const std::string &track_type) {
   auto it = kTrackMap.find(track_type);
   if (it != kTrackMap.end()) {

packages/video_player_avplay/tizen/src/plus_player_util.h

@@ -30,5 +30,8 @@ plusplayer_track_type_e ConvertTrackType(const std::string &track_type);
 plusplayer_property_e ConvertPropertyType(const std::string &type_value);
 std::vector<std::string> Split(const std::string &s, char delim);
 std::string GetErrorMessage(plusplayer_error_type_e error_code);
+plusplayer_display_mode_e ConvertDisplayMode(const int64_t &display_mode);
+plusplayer_display_rotation_type_e ConvertDisplayRotationType(
+    const int64_t &rotation_type);
 }  // namespace video_player_avplay_tizen
 #endif