From 9691aaaa7e1649832b3441b4a505d8a765c620dc Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Mon, 14 Oct 2019 18:29:27 +0900 Subject: [PATCH] Revert "[Tizen] Revert "Changed Player Internal API" This reverts commit fe6aa1794cfffe2a1b135b52240cc5649a8a3cea. Change-Id: Ia06300b82778f19f1639ae1497625ff59d7febce --- .../video-player/ecore-wl/tizen-video-player-ecore-wl.cpp | 6 +++--- dali-extension/video-player/ecore-wl/tizen-video-player.h | 2 +- .../video-player/ecore-wl2/tizen-video-player-ecore-wl2.cpp | 6 +++--- dali-extension/video-player/ecore-wl2/tizen-video-player.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) 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; -- 2.7.4