Fixed bug that codec could not be set

Change-Id: I98fc77fa16acce22f883fc34475c152470e7efc4

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 a407f20..8a03255 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
@@ -231,7 +231,8 @@ TizenVideoPlayer::TizenVideoPlayer()
   mEcoreWlWindow( NULL ),
   mAlphaBitChanged( false ),
   mStreamInfo( NULL ),
-  mStreamType( SOUND_STREAM_TYPE_MEDIA )
+  mStreamType( SOUND_STREAM_TYPE_MEDIA ),
+  mCodecType( PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT )
 {
 }
 
@@ -581,6 +582,9 @@ 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 );
+    LogPlayerError( error );
+
     error = player_set_display_visible( mPlayer, true );
     LogPlayerError( error );
 
@@ -616,6 +620,10 @@ void TizenVideoPlayer::InitializeUnderlayMode( Ecore_Wl_Window* ecoreWlWindow )
     LogPlayerError( error );
 
     error = player_set_display_roi_area( mPlayer, 0, 0, 1, 1 );
+    LogPlayerError( error );
+
+    error = player_set_video_codec_type_ex( mPlayer, mCodecType );
+    LogPlayerError( error );
 
     int width, height;
     ecore_wl_screen_size_get( &width, &height );
@@ -816,32 +824,32 @@ void TizenVideoPlayer::DestroyPlayer()
 void TizenVideoPlayer::SetCodecType( Dali::VideoPlayerPlugin::CodecType type )
 {
   int error;
+  switch( type )
+  {
+    case Dali::VideoPlayerPlugin::CodecType::DEFAULT :
+    {
+      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
+      break;
+    }
+    case Dali::VideoPlayerPlugin::CodecType::HW :
+    {
+      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_HW;
+      break;
+    }
+    case Dali::VideoPlayerPlugin::CodecType::SW :
+    {
+      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_SW;
+      break;
+    }
+  }
+
   if( mPlayerState != PLAYER_STATE_NONE )
   {
     GetPlayerState( &mPlayerState );
 
     if( mPlayerState == PLAYER_STATE_IDLE )
     {
-      player_video_codec_type_ex_e codecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
-      switch( type )
-      {
-        case Dali::VideoPlayerPlugin::CodecType::DEFAULT :
-        {
-          codecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
-          break;
-        }
-        case Dali::VideoPlayerPlugin::CodecType::HW :
-        {
-          codecType = PLAYER_VIDEO_CODEC_TYPE_EX_HW;
-          break;
-        }
-        case Dali::VideoPlayerPlugin::CodecType::SW :
-        {
-          codecType = PLAYER_VIDEO_CODEC_TYPE_EX_SW;
-          break;
-        }
-      }
-      error = player_set_video_codec_type_ex( mPlayer, codecType );
+      error = player_set_video_codec_type_ex( mPlayer, 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 60c5a87..89ccdd3 100755 (executable)
--- a/dali-extension/video-player/ecore-wl/tizen-video-player.h
+++ b/dali-extension/video-player/ecore-wl/tizen-video-player.h
@@ -251,6 +251,8 @@ private:
 
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;
+
+  player_video_codec_type_ex_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 90221ca..a6305e3 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
@@ -231,7 +231,8 @@ TizenVideoPlayer::TizenVideoPlayer()
   mEcoreWlWindow( NULL ),
   mAlphaBitChanged( false ),
   mStreamInfo( NULL ),
-  mStreamType( SOUND_STREAM_TYPE_MEDIA )
+  mStreamType( SOUND_STREAM_TYPE_MEDIA ),
+  mCodecType( PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT )
 {
 }
 
@@ -463,6 +464,14 @@ void TizenVideoPlayer::SetPlayPosition( int millisecond )
 
   GetPlayerState( &mPlayerState );
 
+  if( mPlayerState == PLAYER_STATE_IDLE )
+  {
+    error = player_prepare( mPlayer );
+    LogPlayerError( error );
+
+    GetPlayerState( &mPlayerState ); // Check the status again.
+  }
+
   if( mPlayerState == PLAYER_STATE_READY ||
       mPlayerState == PLAYER_STATE_PLAYING ||
       mPlayerState == PLAYER_STATE_PAUSED
@@ -572,6 +581,9 @@ 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 );
+    LogPlayerError( error );
+
     error = player_set_display_visible( mPlayer, true );
     LogPlayerError( error );
 
@@ -607,6 +619,10 @@ void TizenVideoPlayer::InitializeUnderlayMode( Ecore_Wl2_Window* ecoreWlWindow )
     LogPlayerError( error );
 
     error = player_set_display_roi_area( mPlayer, 0, 0, 1, 1 );
+    LogPlayerError( error );
+
+    error = player_set_video_codec_type_ex( mPlayer, mCodecType );
+    LogPlayerError( error );
 
     int width, height;
     Ecore_Wl2_Display *wl2_display = ecore_wl2_connected_display_get(NULL);
@@ -808,32 +824,32 @@ void TizenVideoPlayer::DestroyPlayer()
 void TizenVideoPlayer::SetCodecType( Dali::VideoPlayerPlugin::CodecType type )
 {
   int error;
+  switch( type )
+  {
+    case Dali::VideoPlayerPlugin::CodecType::DEFAULT :
+    {
+      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
+      break;
+    }
+    case Dali::VideoPlayerPlugin::CodecType::HW :
+    {
+      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_HW;
+      break;
+    }
+    case Dali::VideoPlayerPlugin::CodecType::SW :
+    {
+      mCodecType = PLAYER_VIDEO_CODEC_TYPE_EX_SW;
+      break;
+    }
+  }
+
   if( mPlayerState != PLAYER_STATE_NONE )
   {
     GetPlayerState( &mPlayerState );
 
     if( mPlayerState == PLAYER_STATE_IDLE )
     {
-      player_video_codec_type_ex_e codecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
-      switch( type )
-      {
-        case Dali::VideoPlayerPlugin::CodecType::DEFAULT :
-        {
-          codecType = PLAYER_VIDEO_CODEC_TYPE_EX_DEFAULT;
-          break;
-        }
-        case Dali::VideoPlayerPlugin::CodecType::HW :
-        {
-          codecType = PLAYER_VIDEO_CODEC_TYPE_EX_HW;
-          break;
-        }
-        case Dali::VideoPlayerPlugin::CodecType::SW :
-        {
-          codecType = PLAYER_VIDEO_CODEC_TYPE_EX_SW;
-          break;
-        }
-      }
-      error = player_set_video_codec_type_ex( mPlayer, codecType );
+      error = player_set_video_codec_type_ex( mPlayer, 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 1d34778..5cb6da0 100755 (executable)
--- a/dali-extension/video-player/ecore-wl2/tizen-video-player.h
+++ b/dali-extension/video-player/ecore-wl2/tizen-video-player.h
@@ -251,6 +251,8 @@ private:
 
   sound_stream_info_h mStreamInfo;
   sound_stream_type_e mStreamType;
+
+  player_video_codec_type_ex_e mCodecType;
 public:
 
   Dali::VideoPlayerPlugin::VideoPlayerSignalType mFinishedSignal;