From 72f2c6762c1cc1e1cbd2e32cd2d83904d5b2ca40 Mon Sep 17 00:00:00 2001 From: Wonsik Jung Date: Tue, 29 Jan 2019 14:59:51 +0900 Subject: [PATCH] Revert "VectorAnimationRenderer: Updated dependancy from lotti-player to rlottie library." This reverts commit 3c67ea2317b6e8a846c6a28a63ac31fc671bfc9d. --- build/tizen/vector-animation-renderer/Makefile.am | 4 ++-- build/tizen/vector-animation-renderer/configure.ac | 2 +- .../vector-animation-renderer/tizen-vector-animation-renderer.cpp | 4 ++-- .../vector-animation-renderer/tizen-vector-animation-renderer.h | 6 +++--- packaging/dali-extension.spec | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/tizen/vector-animation-renderer/Makefile.am b/build/tizen/vector-animation-renderer/Makefile.am index 3260bb5..2716664 100644 --- 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) \ - $(RLOTTIE_CFLAGS) \ + $(LOTTIE_PLAYER_CFLAGS) \ -Werror -Wall libdali_vector_animation_renderer_plugin_la_LIBADD = \ $(DALI_LIBS) \ - $(RLOTTIE_LIBS) + $(LOTTIE_PLAYER_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 33ab430..d3c3085 100644 --- 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(RLOTTIE, rlottie) +PKG_CHECK_MODULES(LOTTIE_PLAYER, lottie-player) 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 ec7ece3..86485e4 100755 --- a/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp +++ b/dali-extension/vector-animation-renderer/tizen-vector-animation-renderer.cpp @@ -119,7 +119,7 @@ void TizenVectorAnimationRenderer::SetSize( uint32_t width, uint32_t height ) bool TizenVectorAnimationRenderer::StartRender() { - mRenderer = rlottie::Animation::loadFromFile( mUrl ); + mRenderer = lottie::Animation::loadFromFile( mUrl ); if( !mRenderer ) { DALI_LOG_ERROR( "Failed to load a Lottie file [%s]\n", mUrl.c_str() ); @@ -183,7 +183,7 @@ void TizenVectorAnimationRenderer::Render( uint32_t frameNumber ) unsigned char* buffer = info.planes[0].ptr; // Create Surface object - rlottie::Surface surface( reinterpret_cast< uint32_t* >( buffer ), mWidth, mHeight, static_cast< size_t >( info.planes[0].stride ) ); + lottie::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 a196581..2a98c19 100755 --- 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 #include #include -#include +#include #include #include @@ -91,13 +91,13 @@ private: private: - using SurfacePair = std::pair< tbm_surface_h, rlottie::Surface >; + using SurfacePair = std::pair< tbm_surface_h, lottie::Surface >; std::string mUrl; ///< The content file path std::vector< SurfacePair > mBuffers; ///< EGL Image vector Dali::Mutex mMutex; ///< Mutex NativeImageSourceQueuePtr mTargetSurface; ///< The target surface - std::unique_ptr< rlottie::Animation > mRenderer; ///< The vector animation renderer + std::unique_ptr< lottie::Animation > mRenderer; ///< 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 a3b82a7..87a03a9 100755 --- 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(rlottie) +BuildRequires: pkgconfig(lottie-player) %description vector-animation-renderer-plugin Plugin to render a vector animation -- 2.7.4