[Tizen] Revert "Changed Player Internal API" 04/214404/1 accepted/tizen/unified/20190924.071756 submit/tizen/20190921.112950 submit/tizen/20190924.003932 submit/tizen/20190924.010739
authordongsug.song <dongsug.song@samsung.com>
Sat, 21 Sep 2019 11:10:24 +0000 (20:10 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Sat, 21 Sep 2019 11:16:26 +0000 (20:16 +0900)
- Fix build error

This reverts commit 13444a9f815e0d8b548d541240cf2eda869645d3.

Change-Id: I8fad3747a9c663fa109a21d0e5620906ab89112e

dali-extension/video-player/ecore-wl/tizen-video-player-ecore-wl.cpp
dali-extension/video-player/ecore-wl/tizen-video-player.h
dali-extension/video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp
dali-extension/video-player/ecore-wl2/tizen-video-player.h

index ebd3895..50b7bf8 100755 (executable)
@@ -220,7 +220,7 @@ TizenVideoPlayer::TizenVideoPlayer()
   mPacketVector(),
   mEcoreWlWindow( NULL ),
   mAlphaBitChanged( false ),
-  mCodecType( PLAYER_CODEC_TYPE_DEFAULT ),
+  mCodecType( PLAYER_VIDEO_CODEC_TYPE_EX_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_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, static_cast< player_codec_type_e >( type ) );
+      error = player_set_video_codec_type_ex( mPlayer, static_cast< player_video_codec_type_ex_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_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, &mCodecType );
+      error = player_get_video_codec_type_ex( mPlayer, &mCodecType );
       LogPlayerError( error );
     }
   }
index 5876c0e..5b1a606 100755 (executable)
@@ -249,7 +249,7 @@ private:
 
   bool mAlphaBitChanged; ///< True if underlay rendering initialization changes window alpha
 
-  player_codec_type_e mCodecType;
+  player_video_codec_type_ex_e mCodecType;
 
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;
index e8133f3..58f10a6 100755 (executable)
@@ -220,7 +220,7 @@ TizenVideoPlayer::TizenVideoPlayer()
   mPacketVector(),
   mEcoreWlWindow( NULL ),
   mAlphaBitChanged( false ),
-  mCodecType( PLAYER_CODEC_TYPE_DEFAULT ),
+  mCodecType( PLAYER_VIDEO_CODEC_TYPE_EX_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_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, static_cast< player_codec_type_e >( type ) );
+      error = player_set_video_codec_type_ex( mPlayer, static_cast< player_video_codec_type_ex_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_codec_type( mPlayer, PLAYER_STREAM_TYPE_VIDEO, &mCodecType );
+      error = player_get_video_codec_type_ex( mPlayer, &mCodecType );
       LogPlayerError( error );
     }
   }
index 40b7dd8..ec03d74 100755 (executable)
@@ -249,7 +249,7 @@ private:
 
   bool mAlphaBitChanged; ///< True if underlay rendering initialization changes window alpha
 
-  player_codec_type_e mCodecType;
+  player_video_codec_type_ex_e mCodecType;
 
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;