Ensure synchronous buffer decode when using encoded buffer image.

Change-Id: Iaff725f9ee05c2c35d902849949389807689995f

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
index f0ea225..0a89ecb 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.cpp
@@ -122,6 +122,12 @@ Integration::ResourcePointer TestPlatformAbstraction::LoadResourceSynchronously(
   return mResources.loadedResource;
 }
 
+Integration::BitmapPtr TestPlatformAbstraction::DecodeBuffer( const Integration::ResourceType& resourceType, uint8_t * buffer, size_t size )
+{
+  mTrace.PushCall("DecodeBuffer", "");
+  return Integration::BitmapPtr();
+}
+
 /**
  * @copydoc PlatformAbstraction::CancelLoad()
  */

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
index 5428d97..e52e112 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-platform-abstraction.h
@@ -105,9 +105,17 @@ public:
    */
   virtual void LoadResource(const Integration::ResourceRequest& request);
 
+  /**
+   * @copydoc PlatformAbstraction::LoadResourceSynchronously()
+   */
   virtual Integration::ResourcePointer LoadResourceSynchronously( const Integration::ResourceType& resourceType, const std::string& resourcePath );
 
   /**
+   * @copydoc PlatformAbstraction::DecodeBuffer()
+   */
+  virtual Integration::BitmapPtr DecodeBuffer( const Dali::Integration::ResourceType& resourceType, uint8_t * buffer, size_t size );
+
+  /**
    * @copydoc PlatformAbstraction::CancelLoad()
    */
   virtual void CancelLoad(Integration::ResourceId id, Integration::ResourceTypeId typeId);

diff --git a/dali/integration-api/platform-abstraction.h b/dali/integration-api/platform-abstraction.h
index 3caac53..d86fc3c 100644 (file)
--- a/dali/integration-api/platform-abstraction.h
+++ b/dali/integration-api/platform-abstraction.h
@@ -142,6 +142,16 @@ public:
   virtual ResourcePointer LoadResourceSynchronously( const ResourceType& resourceType, const std::string& resourcePath ) = 0;
 
   /**
+   * Decode a buffer of data synchronously.
+   * @param[in] resourceType The type of resource to load
+   * @param[in] buffer The decoded data
+   * @param[in] bufferSize The size of the buffer used by the decoded data.
+   *
+   * @return A pointer to the decoded buffer.
+   */
+  virtual BitmapPtr DecodeBuffer( const ResourceType& resourceType, uint8_t * buffer, size_t bufferSize ) = 0;
+
+  /**
    * Cancel an ongoing LoadResource() request.
    * Multi-threading note: this method will be called from the main thread only i.e. not
    * from within the Core::Render() method.

diff --git a/dali/internal/event/images/encoded-buffer-image-impl.cpp b/dali/internal/event/images/encoded-buffer-image-impl.cpp
index b52f838..01f379f 100644 (file)
--- a/dali/internal/event/images/encoded-buffer-image-impl.cpp
+++ b/dali/internal/event/images/encoded-buffer-image-impl.cpp
@@ -63,19 +63,19 @@ EncodedBufferImagePtr EncodedBufferImage::New( const uint8_t * const encodedImag
   memcpy( &(buffer->GetVector()[0]), encodedImage, encodedImageByteCount );
 
   // Get image size from buffer
-  const ImageDimensions expectedSize = Internal::ThreadLocalStorage::Get().GetPlatformAbstraction().GetClosestImageSize( buffer, size, fittingMode, samplingMode, orientationCorrection );
+  Dali::Integration::PlatformAbstraction& platformAbstraction = Internal::ThreadLocalStorage::Get().GetPlatformAbstraction();
+  const ImageDimensions expectedSize = platformAbstraction.GetClosestImageSize( buffer, size, fittingMode, samplingMode, orientationCorrection );
   image->mWidth = (unsigned int) expectedSize.GetWidth();
   image->mHeight = (unsigned int) expectedSize.GetHeight();
 
-  ResourceClient &resourceClient = ThreadLocalStorage::Get().GetResourceClient();
-  ResourceTicketPtr ticket = resourceClient.DecodeResource( resourceType, buffer );
-  if( ticket )
-  {
-    DALI_ASSERT_DEBUG( dynamic_cast<ImageTicket*>( ticket.Get() ) && "Resource ticket returned for image resource has to be an ImageTicket subclass.\n" );
-    ImageTicket * const imageTicket = static_cast<ImageTicket*>( ticket.Get() );
+  // Load the image synchronously
+  Integration::BitmapPtr bitmap = platformAbstraction.DecodeBuffer( resourceType, &(buffer->GetVector()[0]), encodedImageByteCount );
 
-    image->mTicket = imageTicket;
-    imageTicket->AddObserver( *image );
+  if( bitmap )
+  {
+    ResourceClient &resourceClient = ThreadLocalStorage::Get().GetResourceClient();
+    image->mTicket = resourceClient.AddBitmapImage( bitmap.Get() );
+    image->mTicket->AddObserver( *image );
   }
 
   return image;