From: Jiyun Yang <ji.yang@samsung.com>
Date: Mon, 14 Oct 2019 06:33:42 +0000 (+0900)
Subject: Revert "[Tizen] Revert "Changed Player Internal API""
X-Git-Tag: accepted/tizen/5.5/unified/20191031.015005~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6f5ebdb1b22f347f4bea579723bc29a4c56d69c0;p=platform%2Fcore%2Fuifw%2Fdali-extension.git

Revert "[Tizen] Revert "Changed Player Internal API""

This reverts commit 962b9ca14f7aa397dcc9bb321d5d88d8b4638f2f.
---

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 50b7bf8..ebd3895 100755
--- 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
@@ -220,7 +220,7 @@ TizenVideoPlayer::TizenVideoPlayer()
   mPacketVector(),
   mEcoreWlWindow( NULL ),
   mAlphaBitChanged( false ),
-  mCodecType( PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT ),
+  mCodecType( PLAYER_CODEC_TYPE_DEFAULT ),
   mStreamInfo( NULL ),
   mStreamType( SOUND_STREAM_TYPE_MEDIA )
 {
@@ -813,14 +813,14 @@ void TizenVideoPlayer::SetCodecType( Dali::VideoPlayerPlugin::CodecType type )
 
     if( mPlayerState == PLAYER_STATE_IDLE )
     {
-      error = player_set_video_codec_type_ex( mPlayer, static_cast< player_video_codec_type_ex_e >( type ) );
+      error = player_set_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, static_cast< player_codec_type_e >( type ) );
       LogPlayerError( error );
 
       if( error == PLAYER_ERROR_INVALID_OPERATION )
       {
         DALI_LOG_ERROR( "The target should not support the codec type\n" );
       }
-      error = player_get_video_codec_type_ex( mPlayer, &mCodecType );
+      error = player_get_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, &mCodecType );
       LogPlayerError( error );
     }
   }
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 5b1a606..5876c0e 100755
--- a/dali-extension/video-player/ecore-wl/tizen-video-player.h
+++ b/dali-extension/video-player/ecore-wl/tizen-video-player.h
@@ -249,7 +249,7 @@ private:
 
   bool mAlphaBitChanged; ///< True if underlay rendering initialization changes window alpha
 
-  player_video_codec_type_ex_e mCodecType;
+  player_codec_type_e mCodecType;
 
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;
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 58f10a6..e8133f3 100755
--- 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
@@ -220,7 +220,7 @@ TizenVideoPlayer::TizenVideoPlayer()
   mPacketVector(),
   mEcoreWlWindow( NULL ),
   mAlphaBitChanged( false ),
-  mCodecType( PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT ),
+  mCodecType( PLAYER_CODEC_TYPE_DEFAULT ),
   mStreamInfo( NULL ),
   mStreamType( SOUND_STREAM_TYPE_MEDIA )
 {
@@ -805,14 +805,14 @@ void TizenVideoPlayer::SetCodecType( Dali::VideoPlayerPlugin::CodecType type )
 
     if( mPlayerState == PLAYER_STATE_IDLE )
     {
-      error = player_set_video_codec_type_ex( mPlayer, static_cast< player_video_codec_type_ex_e >( type ) );
+      error = player_set_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, static_cast< player_codec_type_e >( type ) );
       LogPlayerError( error );
 
       if( error == PLAYER_ERROR_INVALID_OPERATION )
       {
         DALI_LOG_ERROR( "The target should not support the codec type\n" );
       }
-      error = player_get_video_codec_type_ex( mPlayer, &mCodecType );
+      error = player_get_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, &mCodecType );
       LogPlayerError( error );
     }
   }
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 ec03d74..40b7dd8 100755
--- a/dali-extension/video-player/ecore-wl2/tizen-video-player.h
+++ b/dali-extension/video-player/ecore-wl2/tizen-video-player.h
@@ -249,7 +249,7 @@ private:
 
   bool mAlphaBitChanged; ///< True if underlay rendering initialization changes window alpha
 
-  player_video_codec_type_ex_e mCodecType;
+  player_codec_type_e mCodecType;
 
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;