Change API

int player_set_video_codec_type_ex(player_h player, player_video_codec_type_ex_e codec_type)
==>
int player_set_video_codec_type(player_h player, player_codec_type_e codec_type)

Change-Id: Id0080ae8e272cc0289e43afc013c05e69b499247

diff --git a/dali-extension/video-player/ecore-wl/tizen-video-player-ecore-wl.cpp b/dali-extension/video-player/ecore-wl/tizen-video-player-ecore-wl.cpp
index 454e84b..a8a4ead 100755 (executable)
--- a/dali-extension/video-player/ecore-wl/tizen-video-player-ecore-wl.cpp
+++ b/dali-extension/video-player/ecore-wl/tizen-video-player-ecore-wl.cpp
@@ -239,7 +239,7 @@ TizenVideoPlayer::TizenVideoPlayer( Dali::Actor actor, Dali::VideoSyncMode syncM
   mEcoreWlWindow( NULL ),
   mStreamInfo( NULL ),
   mStreamType( SOUND_STREAM_TYPE_MEDIA ),
-  mCodecType( PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT )
+  mCodecType( PLAYER_CODEC_TYPE_HW )
 {
 }
 
@@ -583,7 +583,7 @@ void TizenVideoPlayer::InitializeTextureStreamMode( Dali::NativeImageSourcePtr n
     error = player_set_display( mPlayer, PLAYER_DISPLAY_TYPE_NONE, NULL );
     LogPlayerError( error );
 
-    error = player_set_video_codec_type_ex( mPlayer, mCodecType );
+    error = player_set_video_codec_type( mPlayer, mCodecType );
     LogPlayerError( error );
 
     error = player_set_display_visible( mPlayer, true );
@@ -623,7 +623,7 @@ void TizenVideoPlayer::InitializeUnderlayMode( Ecore_Wl_Window* ecoreWlWindow )
     error = player_set_display_roi_area( mPlayer, 0, 0, 1, 1 );
     LogPlayerError( error );
 
-    error = player_set_video_codec_type_ex( mPlayer, mCodecType );
+    error = player_set_video_codec_type( mPlayer, mCodecType );
     LogPlayerError( error );
 
     int width, height;
@@ -827,19 +827,19 @@ void TizenVideoPlayer::SetCodecType( Dali::VideoPlayerPlugin::CodecType type )
   int error;
   switch( type )
   {
-    case Dali::VideoPlayerPlugin::CodecType::DEFAULT :
+    case Dali::VideoPlayerPlugin::CodecType::HW :
     {
-      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
+      mCodecType = PLAYER_CODEC_TYPE_HW;
       break;
     }
-    case Dali::VideoPlayerPlugin::CodecType::HW :
+    case Dali::VideoPlayerPlugin::CodecType::SW :
     {
-      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_HW;
+      mCodecType = PLAYER_CODEC_TYPE_SW;
       break;
     }
-    case Dali::VideoPlayerPlugin::CodecType::SW :
+    default:
     {
-      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_SW;
+      mCodecType = PLAYER_CODEC_TYPE_HW;
       break;
     }
   }
@@ -850,7 +850,7 @@ void TizenVideoPlayer::SetCodecType( Dali::VideoPlayerPlugin::CodecType type )
 
     if( mPlayerState == PLAYER_STATE_IDLE )
     {
-      error = player_set_video_codec_type_ex( mPlayer, mCodecType );
+      error = player_set_video_codec_type( mPlayer, mCodecType );
       LogPlayerError( error );
     }
   }
@@ -858,11 +858,11 @@ void TizenVideoPlayer::SetCodecType( Dali::VideoPlayerPlugin::CodecType type )
 
 Dali::VideoPlayerPlugin::CodecType TizenVideoPlayer::GetCodecType() const
 {
-  Dali::VideoPlayerPlugin::CodecType type = Dali::VideoPlayerPlugin::CodecType::DEFAULT;
+  Dali::VideoPlayerPlugin::CodecType type = Dali::VideoPlayerPlugin::CodecType::HW;
   if( mPlayerState != PLAYER_STATE_NONE )
   {
-    player_video_codec_type_ex_e codecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
-    int error = player_get_video_codec_type_ex( mPlayer, &codecType );
+    player_codec_type_e codecType = PLAYER_CODEC_TYPE_HW;
+    int error = player_get_video_codec_type( mPlayer, &codecType );
     if( error != PLAYER_ERROR_NONE )
     {
       LogPlayerError( error );
@@ -871,19 +871,19 @@ Dali::VideoPlayerPlugin::CodecType TizenVideoPlayer::GetCodecType() const
 
     switch( codecType )
     {
-      case PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT :
+      case PLAYER_CODEC_TYPE_HW :
       {
-        type = Dali::VideoPlayerPlugin::CodecType::DEFAULT;
+        type = Dali::VideoPlayerPlugin::CodecType::HW;
         break;
       }
-      case PLAYER_VIDEO_CODEC_TYPE_EX_HW :
+      case PLAYER_CODEC_TYPE_SW :
       {
-        type = Dali::VideoPlayerPlugin::CodecType::HW;
+        type = Dali::VideoPlayerPlugin::CodecType::SW;
         break;
       }
-      case PLAYER_VIDEO_CODEC_TYPE_EX_SW :
+      default:
       {
-        type = Dali::VideoPlayerPlugin::CodecType::SW;
+        type = Dali::VideoPlayerPlugin::CodecType::HW;
         break;
       }
     }

diff --git a/dali-extension/video-player/ecore-wl/tizen-video-player.h b/dali-extension/video-player/ecore-wl/tizen-video-player.h
index 243077e..f9b6474 100755 (executable)
--- a/dali-extension/video-player/ecore-wl/tizen-video-player.h
+++ b/dali-extension/video-player/ecore-wl/tizen-video-player.h
@@ -30,7 +30,6 @@
 #ifndef HAVE_WAYLAND
 #define HAVE_WAYLAND
 #endif
-#include <player_internal.h>
 #include <Ecore_Wayland.h>
 
 namespace Dali
@@ -255,7 +254,7 @@ private:
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;
 
-  player_video_codec_type_ex_e mCodecType;
+  player_codec_type_e mCodecType;
 public:
 
   Dali::VideoPlayerPlugin::VideoPlayerSignalType mFinishedSignal;

diff --git a/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp b/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp
index 386cdcf..67d3156 100755 (executable)
--- a/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp
+++ b/dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp
@@ -318,7 +318,7 @@ TizenVideoPlayer::TizenVideoPlayer(Dali::Actor actor, Dali::VideoSyncMode syncMo
   mPacketList(),
   mStreamInfo(NULL),
   mStreamType(SOUND_STREAM_TYPE_MEDIA),
-  mCodecType(PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT),
+  mCodecType(PLAYER_CODEC_TYPE_HW),
   mEcoreWlWindow(nullptr),
   mEcoreSubVideoWindow(nullptr),
   mSyncActor(actor),
@@ -810,11 +810,11 @@ void TizenVideoPlayer::InitializeTextureStreamMode(Dali::NativeImageSourcePtr na
       DALI_LOG_ERROR("InitializeTextureStreamMode, player_set_display() is failed\n");
     }
 
-    error = player_set_video_codec_type_ex(mPlayer, mCodecType);
+    error = player_set_video_codec_type(mPlayer, mCodecType);
     ret   = LogPlayerError(error);
     if(ret)
     {
-      DALI_LOG_ERROR("InitializeTextureStreamMode, player_set_video_codec_type_ex() is failed\n");
+      DALI_LOG_ERROR("InitializeTextureStreamMode, player_set_video_codec_type() is failed\n");
     }
     error = player_set_display_visible(mPlayer, true);
     ret   = LogPlayerError(error);
@@ -896,11 +896,11 @@ void TizenVideoPlayer::InitializeEnableSyncMode(Ecore_Wl2_Window* ecoreWlWindow)
       DALI_LOG_ERROR("InitializeEnableSyncMode, player_set_sound_stream_info() is failed\n");
     }
 
-    error = player_set_video_codec_type_ex(mPlayer, mCodecType);
+    error = player_set_video_codec_type(mPlayer, mCodecType);
     ret   = LogPlayerError(error);
     if(ret)
     {
-      DALI_LOG_ERROR("InitializeEnableSyncMode, player_set_video_codec_type_ex() is failed\n");
+      DALI_LOG_ERROR("InitializeEnableSyncMode, player_set_video_codec_type() is failed\n");
     }
 
     int                width, height;
@@ -971,11 +971,11 @@ void TizenVideoPlayer::InitializeUnderlayMode(Ecore_Wl2_Window* ecoreWlWindow)
       DALI_LOG_ERROR("InitializeUnderlayMode, player_set_sound_stream_info() is failed\n");
     }
 
-    error = player_set_video_codec_type_ex(mPlayer, mCodecType);
+    error = player_set_video_codec_type(mPlayer, mCodecType);
     ret   = LogPlayerError(error);
     if(ret)
     {
-      DALI_LOG_ERROR("InitializeUnderlayMode, player_set_video_codec_type_ex() is failed\n");
+      DALI_LOG_ERROR("InitializeUnderlayMode, player_set_video_codec_type() is failed\n");
     }
 
     int                width, height;
@@ -1248,19 +1248,19 @@ void TizenVideoPlayer::SetCodecType(Dali::VideoPlayerPlugin::CodecType type)
   int ret = 0;
   switch(type)
   {
-    case Dali::VideoPlayerPlugin::CodecType::DEFAULT:
+    case Dali::VideoPlayerPlugin::CodecType::HW:
     {
-      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
+      mCodecType = PLAYER_CODEC_TYPE_HW;
       break;
     }
-    case Dali::VideoPlayerPlugin::CodecType::HW:
+    case Dali::VideoPlayerPlugin::CodecType::SW:
     {
-      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_HW;
+      mCodecType = PLAYER_CODEC_TYPE_SW;
       break;
     }
-    case Dali::VideoPlayerPlugin::CodecType::SW:
+    default:
     {
-      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_SW;
+      mCodecType = PLAYER_CODEC_TYPE_HW;
       break;
     }
   }
@@ -1271,11 +1271,11 @@ void TizenVideoPlayer::SetCodecType(Dali::VideoPlayerPlugin::CodecType type)
 
     if(mPlayerState == PLAYER_STATE_IDLE)
     {
-      error = player_set_video_codec_type_ex(mPlayer, mCodecType);
+      error = player_set_video_codec_type(mPlayer, mCodecType);
       ret   = LogPlayerError(error);
       if(ret)
       {
-        DALI_LOG_ERROR("SetCodecType, player_set_video_codec_type_ex() is failed\n");
+        DALI_LOG_ERROR("SetCodecType, player_set_video_codec_type() is failed\n");
       }
     }
   }
@@ -1283,37 +1283,37 @@ void TizenVideoPlayer::SetCodecType(Dali::VideoPlayerPlugin::CodecType type)
 
 Dali::VideoPlayerPlugin::CodecType TizenVideoPlayer::GetCodecType() const
 {
-  Dali::VideoPlayerPlugin::CodecType type = Dali::VideoPlayerPlugin::CodecType::DEFAULT;
+  Dali::VideoPlayerPlugin::CodecType type = Dali::VideoPlayerPlugin::CodecType::HW;
   int                                ret  = 0;
   if(mPlayerState != PLAYER_STATE_NONE)
   {
-    player_video_codec_type_ex_e codecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
-    int                          error     = player_get_video_codec_type_ex(mPlayer, &codecType);
+    player_codec_type_e codecType = PLAYER_CODEC_TYPE_HW;
+    int                          error     = player_get_video_codec_type(mPlayer, &codecType);
     if(error != PLAYER_ERROR_NONE)
     {
       ret = LogPlayerError(error);
       if(ret)
       {
-        DALI_LOG_ERROR("GetCodecType, player_get_video_codec_type_ex() is failed\n");
+        DALI_LOG_ERROR("GetCodecType, player_get_video_codec_type() is failed\n");
       }
       return type;
     }
 
     switch(codecType)
     {
-      case PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT:
+      case PLAYER_CODEC_TYPE_HW:
       {
-        type = Dali::VideoPlayerPlugin::CodecType::DEFAULT;
+        type = Dali::VideoPlayerPlugin::CodecType::HW;
         break;
       }
-      case PLAYER_VIDEO_CODEC_TYPE_EX_HW:
+      case PLAYER_CODEC_TYPE_SW:
       {
-        type = Dali::VideoPlayerPlugin::CodecType::HW;
+        type = Dali::VideoPlayerPlugin::CodecType::SW;
         break;
       }
-      case PLAYER_VIDEO_CODEC_TYPE_EX_SW:
+      default:
       {
-        type = Dali::VideoPlayerPlugin::CodecType::SW;
+        type = Dali::VideoPlayerPlugin::CodecType::HW;
         break;
       }
     }

diff --git a/dali-extension/video-player/ecore-wl2/tizen-video-player.h b/dali-extension/video-player/ecore-wl2/tizen-video-player.h
index 03a70b8..3a92205 100755 (executable)
--- a/dali-extension/video-player/ecore-wl2/tizen-video-player.h
+++ b/dali-extension/video-player/ecore-wl2/tizen-video-player.h
@@ -303,7 +303,7 @@ private:
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;
 
-  player_video_codec_type_ex_e mCodecType;
+  player_codec_type_e mCodecType;
 
   Ecore_Wl2_Window*             mEcoreWlWindow;       ///< ecore native window handle
   Ecore_Wl2_Subsurface*         mEcoreSubVideoWindow; ///< ecore native subsurface for synchronization with video player