Revert "[Tizen] Fixed issue of LOOPING, MUTED, and VOLUME properties"

This reverts commit 964b58674c9294a7c31c65de196a201665baf83b.

Change-Id: I5188ece125fa42a780f14854f82f1c9dd14551a4

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
index 2860adf..d6128c5 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-VideoView.cpp
@@ -201,21 +201,20 @@ int UtcDaliVideoViewProperty4(void)
   left = right = 0.f;
 
   Property::Map map;
-  map.Insert( VOLUME_LEFT, 0.5f );
+  map.Insert( VOLUME_LEFT, 1.0f );
   map.Insert( VOLUME_RIGHT, 0.5f );
 
-  view.SetProperty( VideoView::Property::VOLUME, map );
-  Property::Value val = view.GetProperty( VideoView::Property::VOLUME );
-
   Property::Map map2;
-  DALI_TEST_CHECK( val.Get( map2 ) );
+  view.SetProperty( VideoView::Property::VOLUME, map );
+  Property::Value val4 = view.GetProperty( VideoView::Property::VOLUME );
+  DALI_TEST_CHECK( val4.Get( map2 ) );
 
-  Property::Value* volumeLeft = map2.Find( VOLUME_LEFT );
-  Property::Value* volumeRight = map2.Find( VOLUME_RIGHT );
+  Property::Value* volumeLeft = map.Find( VOLUME_LEFT );
+  Property::Value* volumeRight = map.Find( VOLUME_RIGHT );
 
   DALI_TEST_CHECK( volumeLeft && volumeLeft->Get( left ) );
   DALI_TEST_CHECK( volumeRight && volumeRight->Get( right ) );
-  DALI_TEST_CHECK( left == 0.5f );
+  DALI_TEST_CHECK( left == 1.0f );
   DALI_TEST_CHECK( right == 0.5f );
 
   END_TEST;

diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
index 1fd4be5..2ec07ef 100644 (file)
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp
@@ -67,7 +67,7 @@ DALI_TYPE_REGISTRATION_END()
 
 const char* const VOLUME_LEFT( "volumeLeft" );
 const char* const VOLUME_RIGHT( "volumeRight" );
-const char* const RENDERING_TARGET( "renderingTarget" );
+const char* const RENDERING_TARGET( "RENDERING_TARGET" );
 const char* const WINDOW_SURFACE_TARGET( "windowSurfaceTarget" );
 const char* const NATIVE_IMAGE_TARGET( "nativeImageTarget" );
 
@@ -76,7 +76,7 @@ const char* const NATIVE_IMAGE_TARGET( "nativeImageTarget" );
 VideoView::VideoView()
 : Control( ControlBehaviour( ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS ) ),
   mCurrentVideoPlayPosition( 0 ),
-  mIsNativeImageTarget( true ),
+  mSetRenderingTarget( false ),
   mIsPlay( false ),
   mIsPause( false )
 {
@@ -97,31 +97,23 @@ Toolkit::VideoView VideoView::New()
   return handle;
 }
 
-void VideoView::OnInitialize()
-{
-  Any source;
-  Dali::NativeImageSourcePtr nativeImageSourcePtr = Dali::NativeImageSource::New( source );
-  mNativeImage = Dali::NativeImage::New( *nativeImageSourcePtr );
-
-  mVideoPlayer.SetRenderingTarget( nativeImageSourcePtr );
-  mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
-}
-
 void VideoView::SetUrl( const std::string& url )
 {
   if( mUrl != url || !mPropertyMap.Empty() )
   {
-    mUrl = url;
     mPropertyMap.Clear();
+
+    mUrl = url;
   }
 
-  if( mIsNativeImageTarget )
+  if( mSetRenderingTarget )
   {
-    Actor self( Self() );
-    Internal::InitializeVisual( self, mVisual, mNativeImage );
+    mVideoPlayer.SetUrl( mUrl );
+  }
+  else
+  {
+    SetNativeImageTarget();
   }
-
-  mVideoPlayer.SetUrl( mUrl );
 }
 
 void VideoView::SetPropertyMap( Property::Map map )
@@ -513,6 +505,8 @@ void VideoView::SetWindowSurfaceTarget()
   Actor self = Self();
   int curPos = mVideoPlayer.GetPlayPosition();
 
+  mSetRenderingTarget = true;
+
   if( mVisual )
   {
     Toolkit::GetImplementation(mVisual).SetOffStage(self);
@@ -521,8 +515,7 @@ void VideoView::SetWindowSurfaceTarget()
 
   mVideoPlayer.SetRenderingTarget( Dali::Adaptor::Get().GetNativeWindowHandle() );
   mVideoPlayer.SetUrl( mUrl );
-
-  mIsNativeImageTarget = false;
+  mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
 
   if( mIsPlay )
   {
@@ -541,15 +534,17 @@ void VideoView::SetNativeImageTarget()
   Actor self( Self() );
   int curPos = mVideoPlayer.GetPlayPosition();
 
+  mSetRenderingTarget = true;
+
   Any source;
   Dali::NativeImageSourcePtr nativeImageSourcePtr = Dali::NativeImageSource::New( source );
   mNativeImage = Dali::NativeImage::New( *nativeImageSourcePtr );
 
   mVideoPlayer.SetRenderingTarget( nativeImageSourcePtr );
   mVideoPlayer.SetUrl( mUrl );
+  mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish );
 
   Internal::InitializeVisual( self, mVisual, mNativeImage );
-  mIsNativeImageTarget = true;
 
   if( mIsPlay )
   {

diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.h b/dali-toolkit/internal/controls/video-view/video-view-impl.h
index a662802..57641cd 100644 (file)
--- a/dali-toolkit/internal/controls/video-view/video-view-impl.h
+++ b/dali-toolkit/internal/controls/video-view/video-view-impl.h
@@ -185,6 +185,7 @@ public:
    */
   void SetDepthIndex( int depthIndex );
 
+
   /**
    * @brief Performs actions as requested using the action name.
    * @SINCE_1_1.38
@@ -200,11 +201,6 @@ public:
 private: // From Control
 
   /**
-   * @copydoc Toolkit::Control::OnInitialize()
-   */
-  virtual void OnInitialize();
-
-  /**
    * @copydoc Toolkit::Control::OnStageConnect()
    */
   virtual void OnStageConnection( int depth );
@@ -250,7 +246,7 @@ private:
   Dali::Toolkit::VideoView::VideoViewSignalType mFinishedSignal;
   std::string mUrl;
   int mCurrentVideoPlayPosition;
-  bool mIsNativeImageTarget;
+  bool mSetRenderingTarget;
   bool mIsPlay;
   bool mIsPause;
 };