[Tizen] VectorAnimationRenderer: Updated dependancy from lotti-player to rlottie...

This reverts commit 3ec24c5b5ec2ab282198d9ed6c74b4e36b7d8a0e.

Change-Id: I19a74732f75816664963832df8434c1348af6aaa

diff --git a/build/tizen/vector-animation-renderer/Makefile.am b/build/tizen/vector-animation-renderer/Makefile.am
index 2716664..3260bb5 100644 (file)
--- a/build/tizen/vector-animation-renderer/Makefile.am
+++ b/build/tizen/vector-animation-renderer/Makefile.am
@@ -32,12 +32,12 @@ libdali_vector_animation_renderer_plugin_la_DEPENDENCIES =
 libdali_vector_animation_renderer_plugin_la_CXXFLAGS = \
                       -I../../../ \
                       $(DALI_CFLAGS) \
-                      $(LOTTIE_PLAYER_CFLAGS) \
+                      $(RLOTTIE_CFLAGS) \
                       -Werror -Wall
 
 libdali_vector_animation_renderer_plugin_la_LIBADD = \
                       $(DALI_LIBS) \
-                      $(LOTTIE_PLAYER_LIBS)
+                      $(RLOTTIE_LIBS)
 
 libdali_vector_animation_renderer_plugin_la_LDFLAGS = \
                       -rdynamic

diff --git a/build/tizen/vector-animation-renderer/configure.ac b/build/tizen/vector-animation-renderer/configure.ac
index d3c3085..33ab430 100644 (file)
--- a/build/tizen/vector-animation-renderer/configure.ac
+++ b/build/tizen/vector-animation-renderer/configure.ac
@@ -15,7 +15,7 @@ DALI_EXTENSION_VERSION=dali_version
 AC_SUBST(DALI_EXTENSION_VERSION)
 
 PKG_CHECK_MODULES([DALI], [dali-core dali-adaptor dali-toolkit])
-PKG_CHECK_MODULES(LOTTIE_PLAYER, lottie-player)
+PKG_CHECK_MODULES(RLOTTIE, rlottie)
 
 devincludepath=${includedir}
 AC_SUBST(devincludepath)

diff --git a/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp b/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp
index 99158e3..01b8fd2 100755 (executable)
--- a/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp
+++ b/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp
@@ -147,7 +147,7 @@ void TizenVectorAnimationRenderer::SetSize( uint32_t width, uint32_t height )
 
 bool TizenVectorAnimationRenderer::StartRender()
 {
-  mVectorRenderer = lottie::Animation::loadFromFile( mUrl );
+  mVectorRenderer = rlottie::Animation::loadFromFile( mUrl );
   if( !mVectorRenderer )
   {
     DALI_LOG_ERROR( "Failed to load a Lottie file [%s]\n", mUrl.c_str() );
@@ -211,7 +211,7 @@ void TizenVectorAnimationRenderer::Render( uint32_t frameNumber )
       unsigned char* buffer = info.planes[0].ptr;
 
       // Create Surface object
-      lottie::Surface surface( reinterpret_cast< uint32_t* >( buffer ), mWidth, mHeight, static_cast< size_t >( info.planes[0].stride ) );
+      rlottie::Surface surface( reinterpret_cast< uint32_t* >( buffer ), mWidth, mHeight, static_cast< size_t >( info.planes[0].stride ) );
 
       // Push the buffer
       mBuffers.push_back( SurfacePair( tbmSurface, surface ) );

diff --git a/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.h b/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.h
index 260a572..c332aec 100755 (executable)
--- a/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.h
+++ b/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.h
@@ -25,7 +25,7 @@
 #include <dali/devel-api/adaptor-framework/native-image-source-queue.h>
 #include <dali/devel-api/adaptor-framework/vector-animation-renderer-plugin.h>
 #include <memory>
-#include <lottieanimation.h>
+#include <rlottie.h>
 #include <tbm_surface.h>
 #include <tbm_surface_queue.h>
 
@@ -96,14 +96,14 @@ private:
 
 private:
 
-  using SurfacePair = std::pair< tbm_surface_h, lottie::Surface >;
+  using SurfacePair = std::pair< tbm_surface_h, rlottie::Surface >;
 
   std::string                          mUrl;               ///< The content file path
   std::vector< SurfacePair >           mBuffers;           ///< EGL Image vector
   Dali::Mutex                          mMutex;             ///< Mutex
   Dali::Renderer                       mRenderer;          ///< Renderer
   NativeImageSourceQueuePtr            mTargetSurface;     ///< The target surface
-  std::unique_ptr< lottie::Animation > mVectorRenderer;    ///< The vector animation renderer
+  std::unique_ptr< rlottie::Animation > mVectorRenderer;    ///< The vector animation renderer
   tbm_surface_queue_h                  mTbmQueue;          ///< Tbm surface queue handle
   uint32_t                             mTotalFrameNumber;  ///< The total frame number
   uint32_t                             mWidth;             ///< The width of the surface

diff --git a/packaging/dali-extension.spec b/packaging/dali-extension.spec
index 686816a..cc642c2 100755 (executable)
--- a/packaging/dali-extension.spec
+++ b/packaging/dali-extension.spec
@@ -99,7 +99,7 @@ Image Loader plugin to image loading file for Dali
 %package vector-animation-renderer-plugin
 Summary:    Plugin to render a vector animation
 Group:      System/Libraries
-BuildRequires:  pkgconfig(lottie-player)
+BuildRequires:  pkgconfig(rlottie)
 
 %description vector-animation-renderer-plugin
 Plugin to render a vector animation