From b0f5550895894f26d32a814fc23be451761738ce Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 26 Feb 2018 18:43:07 +0900 Subject: [PATCH] changed player_set_sound_type to player_set_sound_stream_info. MM api has been changed. Change-Id: I60d748e647b65c76cdee693a1ab285373487a621 --- dali-extension/video-player/tizen-video-player.cpp | 18 +++++++++++++++--- dali-extension/video-player/tizen-video-player.h | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) mode change 100644 => 100755 dali-extension/video-player/tizen-video-player.cpp mode change 100644 => 100755 dali-extension/video-player/tizen-video-player.h diff --git a/dali-extension/video-player/tizen-video-player.cpp b/dali-extension/video-player/tizen-video-player.cpp old mode 100644 new mode 100755 index d2beef3..f1ca4f7 --- a/dali-extension/video-player/tizen-video-player.cpp +++ b/dali-extension/video-player/tizen-video-player.cpp @@ -220,7 +220,9 @@ TizenVideoPlayer::TizenVideoPlayer() mPacketVector(), mEcoreWlWindow( NULL ), mAlphaBitChanged( false ), - mCodecType( PLAYER_CODEC_TYPE_DEFAULT ) + mCodecType( PLAYER_CODEC_TYPE_DEFAULT ), + mStreamInfo( NULL ), + mStreamType( SOUND_STREAM_TYPE_MEDIA ) { } @@ -550,7 +552,10 @@ void TizenVideoPlayer::InitializeTextureStreamMode( Dali::NativeImageSourcePtr n error = player_set_media_packet_video_frame_decoded_cb( mPlayer, MediaPacketVideoDecodedCb, this ); LogPlayerError( error ); - error = player_set_sound_type( mPlayer, SOUND_TYPE_MEDIA ); + error = sound_manager_create_stream_information( mStreamType, NULL, NULL, &mStreamInfo ); + LogPlayerError( error ); + + error = player_set_sound_stream_info( mPlayer, mStreamInfo ); LogPlayerError( error ); error = player_set_display_mode( mPlayer, PLAYER_DISPLAY_MODE_FULL_SCREEN ); @@ -584,7 +589,10 @@ void TizenVideoPlayer::InitializeUnderlayMode( Ecore_Wl_Window* ecoreWlWindow ) error = player_set_completed_cb( mPlayer, EmitPlaybackFinishedSignal, this ); LogPlayerError( error ); - error = player_set_sound_type( mPlayer, SOUND_TYPE_MEDIA ); + error = sound_manager_create_stream_information( mStreamType, NULL, NULL, &mStreamInfo ); + LogPlayerError( error ); + + error = player_set_sound_stream_info( mPlayer, mStreamInfo ); LogPlayerError( error ); error = player_set_display_mode( mPlayer, PLAYER_DISPLAY_MODE_DST_ROI ); @@ -778,6 +786,10 @@ void TizenVideoPlayer::DestroyPlayer() error = player_destroy( mPlayer ); LogPlayerError( error ); + + error = sound_manager_destroy_stream_information(mStreamInfo); + LogPlayerError( error ); + mPlayerState = PLAYER_STATE_NONE; mPlayer = NULL; mUrl = ""; diff --git a/dali-extension/video-player/tizen-video-player.h b/dali-extension/video-player/tizen-video-player.h old mode 100644 new mode 100755 index 57db37f..ffa4ef9 --- a/dali-extension/video-player/tizen-video-player.h +++ b/dali-extension/video-player/tizen-video-player.h @@ -241,6 +241,8 @@ private: player_codec_type_e mCodecType; + sound_stream_info_h mStreamInfo; + sound_stream_type_e mStreamType; public: Dali::VideoPlayerPlugin::VideoPlayerSignalType mFinishedSignal; -- 2.7.4