ToolkitTestApplication application;
tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual03: Request animated vector image visual with a Property::Map" );
+ int startFrame = 1, endFrame = 3;
+ Property::Array playRange;
+ playRange.PushBack( startFrame );
+ playRange.PushBack( endFrame );
+
Property::Map propertyMap;
propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
.Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
.Add( DevelImageVisual::Property::LOOP_COUNT, 3 )
- .Add( DevelImageVisual::Property::PLAY_RANGE, Vector2( 0.2f, 0.8f ) );
+ .Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
DALI_TEST_CHECK( visual );
ToolkitTestApplication application;
tet_infoline( "UtcDaliAnimatedVectorImageVisualGetPropertyMap01" );
- Vector2 playRange( 0.2f, 0.8f );
+ int startFrame = 1, endFrame = 3;
+ Property::Array playRange;
+ playRange.PushBack( startFrame );
+ playRange.PushBack( endFrame );
Property::Map propertyMap;
propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get< int >() == 3 );
- value = resultMap.Find( DevelImageVisual::Property::PLAY_RANGE, Property::VECTOR2 );
+ value = resultMap.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
DALI_TEST_CHECK( value );
- DALI_TEST_CHECK( value->Get< Vector2 >() == playRange );
+
+ Property::Array* result = value->GetArray();
+ DALI_TEST_CHECK( result );
+
+ DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
+ DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
// request AnimatedVectorImageVisual with an URL
Visual::Base visual2 = factory.CreateVisual( TEST_VECTOR_IMAGE_FILE_NAME, ImageDimensions() );
ToolkitTestApplication application;
tet_infoline( "UtcDaliAnimatedVectorImageVisualPlayRange" );
- Vector2 playRange( 0.8f, 0.2f );
+ int startFrame = 3, endFrame = 1;
+ Property::Array array;
+ array.PushBack( startFrame );
+ array.PushBack( endFrame );
Property::Map propertyMap;
propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
.Add( ImageVisual::Property::URL, TEST_VECTOR_IMAGE_FILE_NAME )
- .Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
+ .Add( DevelImageVisual::Property::PLAY_RANGE, array );
Visual::Base visual = VisualFactory::Get().CreateVisual( propertyMap );
DALI_TEST_CHECK( visual );
Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
Property::Value* value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
- DALI_TEST_EQUALS( value->Get< Vector2 >(), playRange, TEST_LOCATION );
+
+ int resultStartFrame, resultEndFrame;
+ Property::Array* result = value->GetArray();
+ result->GetElementAt( 0 ).Get( resultStartFrame );
+ result->GetElementAt( 1 ).Get( resultEndFrame );
+
+ DALI_TEST_EQUALS( startFrame, resultStartFrame, TEST_LOCATION );
+ DALI_TEST_EQUALS( endFrame, resultEndFrame, TEST_LOCATION );
+
+ // Set invalid play range
+ array.Clear();
+ array.PushBack( -1 );
+ array.PushBack( 100 );
+
+ attributes.Clear();
+ attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
+ DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
+
+ application.SendNotification();
+ application.Render();
+
+ map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
+ value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
+
+ result = value->GetArray();
+ result->GetElementAt( 0 ).Get( resultStartFrame );
+ result->GetElementAt( 1 ).Get( resultEndFrame );
+
+ DALI_TEST_EQUALS( startFrame, resultStartFrame, TEST_LOCATION ); // Should not be changed
+ DALI_TEST_EQUALS( endFrame, resultEndFrame, TEST_LOCATION );
END_TEST;
}
END_TEST;
}
-int UtcDaliAnimatedVectorImageVisualJumpToCurrentProgress(void)
+int UtcDaliAnimatedVectorImageVisualJumpTo(void)
{
ToolkitTestApplication application;
- tet_infoline( "UtcDaliAnimatedVectorImageVisualJumpToCurrentProgress" );
+ tet_infoline( "UtcDaliAnimatedVectorImageVisualJumpTo" );
Property::Map propertyMap;
propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
- DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 0.6f );
+ DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 2 );
application.SendNotification();
application.Render();
Property::Map map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
- Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_PROGRESS );
- DALI_TEST_EQUALS( value->Get< float >(), 0.6f, TEST_LOCATION );
+ Property::Value* value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
+ DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );
- Vector2 playRange( 0.0f, 0.4f );
+ Property::Array array;
+ array.PushBack( 0 );
+ array.PushBack( 2 );
Property::Map attributes;
- attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
+ attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
- DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 0.8f );
+ DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
application.SendNotification();
application.Render();
map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
- value = map.Find( DevelImageVisual::Property::CURRENT_PROGRESS );
- DALI_TEST_EQUALS( value->Get< float >(), 0.4f, TEST_LOCATION );
+ value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
+ DALI_TEST_EQUALS( value->Get< int >(), 2, TEST_LOCATION );
// Change play range
attributes.Clear();
- attributes.Add( DevelImageVisual::Property::PLAY_RANGE, Vector2( 0.0f, 1.0f ) );
+ array.Clear();
+
+ array.PushBack( 0 );
+ array.PushBack( 4 );
+
+ attributes.Add( DevelImageVisual::Property::PLAY_RANGE, array );
DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
attributes.Clear();
application.SendNotification();
application.Render();
- // Stop and jump to 0.2
+ // Stop and jump to 3
DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::STOP, attributes );
- DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 0.2f );
+ DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::JUMP_TO, 3 );
application.SendNotification();
application.Render();
map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
- value = map.Find( DevelImageVisual::Property::CURRENT_PROGRESS );
- DALI_TEST_EQUALS( value->Get< float >(), 0.2f, TEST_LOCATION );
+ value = map.Find( DevelImageVisual::Property::CURRENT_FRAME_NUMBER );
+ DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
END_TEST;
}
ToolkitTestApplication application;
tet_infoline( "UtcDaliAnimatedVectorImageVisualJumpToCurrentProgress" );
- Vector2 playRange( 0.2f, 0.5f );
+ int startFrame = 1, endFrame = 3;
+ Property::Array playRange;
+ playRange.PushBack( startFrame );
+ playRange.PushBack( endFrame );
Property::Map propertyMap;
propertyMap.Add( Toolkit::Visual::Property::TYPE, DevelVisual::ANIMATED_VECTOR_IMAGE )
Property::Value* value = map.Find( DevelImageVisual::Property::LOOP_COUNT );
DALI_TEST_EQUALS( value->Get< int >(), 3, TEST_LOCATION );
- value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
- DALI_TEST_EQUALS( value->Get< Vector2 >(), playRange, TEST_LOCATION );
+ value = map.Find( DevelImageVisual::Property::PLAY_RANGE, Property::ARRAY );
+ DALI_TEST_CHECK( value );
- Vector2 newPlayRange( 0.6f, 1.0f );
+ Property::Array* result = value->GetArray();
+ DALI_TEST_CHECK( result );
+
+ DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
+ DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
+
+ playRange.Clear();
+ playRange.PushBack( 0 );
+ playRange.PushBack( 2 );
Property::Map attributes;
- attributes.Add( DevelImageVisual::Property::PLAY_RANGE, newPlayRange );
+ attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
attributes.Add( DevelImageVisual::Property::LOOP_COUNT, 5 );
DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
DALI_TEST_EQUALS( value->Get< int >(), 5, TEST_LOCATION );
value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
- DALI_TEST_EQUALS( value->Get< Vector2 >(), newPlayRange, TEST_LOCATION );
+ result = value->GetArray();
+ DALI_TEST_CHECK( result );
+
+ DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == 0 );
+ DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == 2 );
attributes.Clear();
+
+ playRange.Clear();
+ playRange.PushBack( startFrame );
+ playRange.PushBack( endFrame );
+
attributes.Add( DevelImageVisual::Property::PLAY_RANGE, playRange );
DevelControl::DoAction( actor, DummyControl::Property::TEST_VISUAL, Dali::Toolkit::DevelAnimatedVectorImageVisual::Action::UPDATE_PROPERTY, attributes );
map = actor.GetProperty< Property::Map >( DummyControl::Property::TEST_VISUAL );
value = map.Find( DevelImageVisual::Property::PLAY_RANGE );
- DALI_TEST_EQUALS( value->Get< Vector2 >(), playRange, TEST_LOCATION );
+
+ result = value->GetArray();
+ DALI_TEST_CHECK( result );
+
+ DALI_TEST_CHECK( result->GetElementAt( 0 ).Get< int >() == startFrame );
+ DALI_TEST_CHECK( result->GetElementAt( 1 ).Get< int >() == endFrame );
END_TEST;
}
mUrl( imageUrl ),
mVectorRasterizeThread( imageUrl.GetUrl() ),
mVisualSize(),
- mPlayRange( 0.0f, 1.0f ),
mPlacementActor(),
mLoopCount( LOOP_FOREVER ),
+ mStartFrame( 0 ),
+ mEndFrame( 0 ),
mResendFlag( 0 ),
mActionStatus( DevelAnimatedVectorImageVisual::Action::STOP )
{
map.Insert( Toolkit::ImageVisual::Property::URL, mUrl.GetUrl() );
}
map.Insert( Toolkit::DevelImageVisual::Property::LOOP_COUNT, mLoopCount );
- map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, mPlayRange );
+
+ Property::Array playRange;
+ playRange.PushBack( mStartFrame );
+ playRange.PushBack( mEndFrame );
+ map.Insert( Toolkit::DevelImageVisual::Property::PLAY_RANGE, playRange );
+
map.Insert( Toolkit::DevelImageVisual::Property::PLAY_STATE, static_cast< int >( mVectorRasterizeThread.GetPlayState() ) );
- map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_PROGRESS, mVectorRasterizeThread.GetCurrentProgress() );
+ map.Insert( Toolkit::DevelImageVisual::Property::CURRENT_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetCurrentFrameNumber() ) );
+ map.Insert( Toolkit::DevelImageVisual::Property::TOTAL_FRAME_NUMBER, static_cast< int32_t >( mVectorRasterizeThread.GetTotalFrameNumber() ) );
}
void AnimatedVectorImageVisual::DoCreateInstancePropertyMap( Property::Map& map ) const
}
case Toolkit::DevelImageVisual::Property::PLAY_RANGE:
{
- Vector2 range;
- if( value.Get( range ) )
+ Property::Array* array = value.GetArray();
+ if( array )
{
- mPlayRange = range;
- mResendFlag |= RESEND_PLAY_RANGE;
+ size_t count = array->Count();
+ if( count >= 2 )
+ {
+ int startFrame, endFrame;
+ int totalFrame = mVectorRasterizeThread.GetTotalFrameNumber();
+ array->GetElementAt( 0 ).Get( startFrame );
+ array->GetElementAt( 1 ).Get( endFrame );
+
+ if( startFrame >= 0 && startFrame < totalFrame && endFrame >= 0 && endFrame < totalFrame )
+ {
+ mStartFrame = startFrame;
+ mEndFrame = endFrame;
+ mResendFlag |= RESEND_PLAY_RANGE;
+ }
+ else
+ {
+ DALI_LOG_ERROR( "Invalid play range [%d, %d / %d]\n", startFrame, endFrame, totalFrame );
+ }
+ }
}
break;
}
}
case DevelAnimatedVectorImageVisual::Action::JUMP_TO:
{
- float progress;
- if( attributes.Get( progress ) )
+ int32_t frameNumber;
+ if( attributes.Get( frameNumber ) )
{
- mVectorRasterizeThread.SetCurrentProgress( progress );
+ mVectorRasterizeThread.SetCurrentFrameNumber( frameNumber );
if( IsOnStage() && mVectorRasterizeThread.GetPlayState() != DevelImageVisual::PlayState::PLAYING )
{
if( mResendFlag & RESEND_PLAY_RANGE )
{
- mVectorRasterizeThread.SetPlayRange( mPlayRange );
+ mVectorRasterizeThread.SetPlayRange( mStartFrame, mEndFrame );
}
if( IsOnStage() )
mConditionalWait(),
mResourceReadyTrigger(),
mAnimationFinishedTrigger(),
- mPlayRange( 0.0f, 1.0f ),
mPlayState( DevelImageVisual::PlayState::STOPPED ),
mFrameDurationNanoSeconds( 0 ),
- mProgress( 0.0f ),
mFrameRate( 60.0f ),
mCurrentFrame( 0 ),
mTotalFrame( 0 ),
}
}
-int32_t VectorRasterizeThread::GetLoopCount() const
+void VectorRasterizeThread::SetPlayRange( uint32_t startFrame, uint32_t endFrame )
{
- return mLoopCount;
-}
-
-void VectorRasterizeThread::SetPlayRange( Vector2 range )
-{
- // Make sure the range specified is between 0.0 and 1.0
- if( range.x >= 0.0f && range.x <= 1.0f && range.y >= 0.0f && range.y <= 1.0f )
+ // Make sure the range specified is between 0 and the total frame number
+ if( startFrame >= 0 && startFrame < mTotalFrame && endFrame >= 0 && endFrame < mTotalFrame )
{
- Vector2 orderedRange( range );
// If the range is not in order swap values
- if( range.x > range.y )
+ if( startFrame > endFrame )
{
- orderedRange = Vector2( range.y, range.x );
+ uint32_t temp = startFrame;
+ startFrame = endFrame;
+ endFrame = temp;
}
- if( mPlayRange != orderedRange )
+ if( startFrame != mStartFrame || endFrame != mEndFrame )
{
ConditionalWait::ScopedLock lock( mConditionalWait );
- mPlayRange = orderedRange;
-
- mStartFrame = static_cast< uint32_t >( mPlayRange.x * mTotalFrame + 0.5f );
- mEndFrame = static_cast< uint32_t >( mPlayRange.y * mTotalFrame + 0.5f );
+ mStartFrame = startFrame;
+ mEndFrame = endFrame;
// If the current frame is out of the range, change the current frame also.
if( mStartFrame > mCurrentFrame )
mResourceReady = false;
}
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetPlayRange: [%d, %d]\n", mStartFrame, mEndFrame );
+ DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetPlayRangeInFrame: [%d, %d]\n", mStartFrame, mEndFrame );
}
}
}
-Vector2 VectorRasterizeThread::GetPlayRange() const
-{
- return mPlayRange;
-}
-
-void VectorRasterizeThread::SetCurrentProgress( float progress )
+void VectorRasterizeThread::SetCurrentFrameNumber( uint32_t frameNumber )
{
ConditionalWait::ScopedLock lock( mConditionalWait );
- if( progress >= mPlayRange.x && progress <= mPlayRange.y )
+ if( frameNumber >= mStartFrame && frameNumber <= mEndFrame )
{
- mProgress = progress;
-
- mCurrentFrame = static_cast< uint32_t >( mTotalFrame * progress + 0.5f );
+ mCurrentFrame = frameNumber;
mCurrentFrameUpdated = true;
mResourceReady = false;
- DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentProgress: progress = %f (%d)\n", progress, mCurrentFrame );
+ DALI_LOG_INFO( gVectorAnimationLogFilter, Debug::Verbose, "VectorRasterizeThread::SetCurrentFrameNumber: frame number = %f (%d)\n", mCurrentFrame );
+ }
+ else
+ {
+ DALI_LOG_ERROR( "Invalid frame number [%d (%d, %d)]\n", frameNumber, mStartFrame, mEndFrame );
}
}
-float VectorRasterizeThread::GetCurrentProgress() const
+uint32_t VectorRasterizeThread::GetCurrentFrameNumber() const
{
- return ( static_cast< float >( mCurrentFrame ) / static_cast< float >( mTotalFrame ) );
+ return mCurrentFrame;
+}
+
+uint32_t VectorRasterizeThread::GetTotalFrameNumber() const
+{
+ return mTotalFrame;
}
void VectorRasterizeThread::GetDefaultSize( uint32_t& width, uint32_t& height ) const
mTotalFrame = mVectorRenderer.GetTotalFrameNumber();
- mStartFrame = static_cast< uint32_t >( mPlayRange.x * mTotalFrame + 0.5f );
- mEndFrame = static_cast< uint32_t >( mPlayRange.y * mTotalFrame + 0.5f );
-
- mCurrentFrame = std::max( static_cast< uint32_t >( mTotalFrame * mProgress + 0.5f ), mStartFrame );
+ mEndFrame = mTotalFrame;
mFrameRate = mVectorRenderer.GetFrameRate();
mFrameDurationNanoSeconds = NANOSECONDS_PER_SECOND / mFrameRate;