/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
TypeRegistration mType( typeid( Dali::BufferImage ), typeid( Dali::Image ), NULL );
} // unnamed namespace
-BufferImagePtr BufferImage::New( unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePol )
+BufferImagePtr BufferImage::New( unsigned int width,
+ unsigned int height,
+ Pixel::Format pixelformat )
{
- BufferImagePtr internal = new BufferImage( width, height, pixelformat, releasePol );
+ BufferImagePtr internal = new BufferImage( width, height, pixelformat );
internal->Initialize();
return internal;
}
-BufferImagePtr BufferImage::New( PixelBuffer* pixBuf, unsigned int width, unsigned int height, Pixel::Format pixelformat, unsigned int stride, ReleasePolicy releasePol )
+BufferImagePtr BufferImage::New( PixelBuffer* pixBuf,
+ unsigned int width,
+ unsigned int height,
+ Pixel::Format pixelformat,
+ unsigned int stride )
{
- BufferImagePtr internal = new BufferImage( pixBuf, width, height, pixelformat, stride, releasePol );
+ BufferImagePtr internal = new BufferImage( pixBuf, width, height, pixelformat, stride );
internal->Initialize();
return internal;
}
-BufferImage::BufferImage(unsigned int width, unsigned int height, Pixel::Format pixelformat, ReleasePolicy releasePol)
-: Image(releasePol),
- mInternalBuffer(NULL),
- mExternalBuffer(NULL),
- mBitmap(NULL)
+BufferImage::BufferImage(unsigned int width, unsigned int height, Pixel::Format pixelformat)
+: Image(),
+ mInternalBuffer( NULL ),
+ mExternalBuffer( NULL ),
+ mResourceClient( NULL ),
+ mBufferSize( 0 ),
+ mByteStride( 0 ),
+ mBytesPerPixel( 0 ),
+ mBufferWidth( 0 ),
+ mPixelFormat( pixelformat ),
+ mResourcePolicy( ResourcePolicy::OWNED_DISCARD )
{
- ThreadLocalStorage& tls = ThreadLocalStorage::Get();
- mResourceClient = &tls.GetResourceClient();
- mWidth = width;
- mHeight = height;
- mPixelFormat = pixelformat;
- mBytesPerPixel = Pixel::GetBytesPerPixel( pixelformat );
- mByteStride = width * mBytesPerPixel;
- mBufferSize = height * mByteStride;
+ SetupBuffer( width, height, pixelformat, width );
// Allocate a persistent internal buffer
mInternalBuffer = new PixelBuffer[ mBufferSize ];
+}
- // Respect the desired release policy
- mResourcePolicy = releasePol == Dali::Image::UNUSED ? ResourcePolicy::OWNED_DISCARD : ResourcePolicy::OWNED_RETAIN;
+BufferImage::BufferImage(PixelBuffer* pixBuf,
+ unsigned int width,
+ unsigned int height,
+ Pixel::Format pixelformat,
+ unsigned int stride)
+: Image(),
+ mInternalBuffer( NULL ),
+ mExternalBuffer( pixBuf ),
+ mResourceClient( NULL ),
+ mBufferSize( 0 ),
+ mByteStride( 0 ),
+ mBytesPerPixel( 0 ),
+ mBufferWidth( 0 ),
+ mPixelFormat( pixelformat ),
+ mResourcePolicy( ResourcePolicy::OWNED_DISCARD )
+{
+ SetupBuffer( width, height, pixelformat, stride ? stride: width );
}
-BufferImage::BufferImage(PixelBuffer* pixBuf, unsigned int width, unsigned int height, Pixel::Format pixelformat, unsigned int stride, ReleasePolicy releasePol )
-: Image(releasePol),
- mInternalBuffer(NULL),
- mExternalBuffer(pixBuf),
- mBitmap(NULL)
+BufferImage::~BufferImage()
+{
+ if( mTicket )
+ {
+ mTicket->RemoveObserver(*this);
+ mTicket.Reset();
+ }
+
+ delete[] mInternalBuffer;
+}
+
+void BufferImage::SetupBuffer( unsigned int width,
+ unsigned int height,
+ Pixel::Format pixelformat,
+ unsigned int byteStride )
{
ThreadLocalStorage& tls = ThreadLocalStorage::Get();
mResourceClient = &tls.GetResourceClient();
mHeight = height;
mPixelFormat = pixelformat;
mBytesPerPixel = Pixel::GetBytesPerPixel( pixelformat );
- mByteStride = ( stride ? stride : mWidth ) * mBytesPerPixel;
+
+ mByteStride = byteStride * mBytesPerPixel;
mBufferSize = height * mByteStride;
// Respect the desired release policy
- mResourcePolicy = releasePol == Dali::Image::UNUSED ? ResourcePolicy::OWNED_DISCARD : ResourcePolicy::OWNED_RETAIN;
-
- // Create a bitmap to hold copy of external buffer
- ReserveBitmap();
-
- // Take a copy of the external buffer immediately, so it can be released if desired
- RectArea area;
- MirrorExternal( area );
-}
-
-BufferImage::~BufferImage()
-{
- delete[] mInternalBuffer;
+ mResourcePolicy = ResourcePolicy::OWNED_RETAIN;
}
bool BufferImage::IsDataExternal() const
void BufferImage::Update( RectArea& updateArea )
{
- ValidateBitmap();
- UpdateBitmap( updateArea );
-
- if (mTicket)
+ if ( !mTicket )
{
- DALI_ASSERT_DEBUG( updateArea.x + updateArea.width <= mWidth && updateArea.y + updateArea.height <= mHeight );
- mResourceClient->UpdateBitmapArea( mTicket, updateArea );
-
- // Bitmap ownership has been passed on, so any subsequent update will need another bitmap
- mBitmap = NULL;
+ CreateHostBitmap();
}
+ DALI_ASSERT_DEBUG( updateArea.x + updateArea.width <= mWidth && updateArea.y + updateArea.height <= mHeight );
+ UploadArea( mTicket->GetId(), updateArea );
}
-void BufferImage::UpdateBitmap( RectArea& updateArea )
+void BufferImage::CreateHostBitmap()
{
- if ( mExternalBuffer )
- {
- MirrorExternal( updateArea );
- }
- else
- {
- // Copy the internal buffer to the bitmap area
- memcpy( mBitmap->GetBuffer(), mInternalBuffer, mBufferSize );
- }
-}
+ Integration::Bitmap* bitmap = Bitmap::New( Bitmap::BITMAP_2D_PACKED_PIXELS, mResourcePolicy );
+ Bitmap::PackedPixelsProfile* const packedBitmap = bitmap->GetPackedPixelsProfile();
+ DALI_ASSERT_DEBUG(packedBitmap);
-void BufferImage::ValidateBitmap()
-{
- ReserveBitmap();
- if ( !mTicket )
- {
- mTicket = mResourceClient->AddBitmapImage( mBitmap );
- mTicket->AddObserver(*this);
- }
+ packedBitmap->ReserveBuffer( mPixelFormat, mWidth, mHeight );
+ DALI_ASSERT_DEBUG(bitmap->GetBuffer() != 0);
+ DALI_ASSERT_DEBUG(bitmap->GetBufferSize() >= mHeight * mWidth * mBytesPerPixel );
+
+ mTicket = mResourceClient->AddBitmapImage( bitmap );
+ mTicket->AddObserver(*this);
}
-void BufferImage::ReserveBitmap()
+void BufferImage::UploadArea( ResourceId destId, const RectArea& area )
{
- // Does a bitmap currently exist ?
- if ( !mBitmap )
+ Integration::Bitmap* bitmap = Bitmap::New( Bitmap::BITMAP_2D_PACKED_PIXELS, mResourcePolicy );
+ Bitmap::PackedPixelsProfile* const packedBitmap = bitmap->GetPackedPixelsProfile();
+ DALI_ASSERT_DEBUG(packedBitmap);
+ DALI_ASSERT_DEBUG( area.width <= mWidth && area.height <= mHeight );
+
+ mBufferWidth = area.width ? area.width : mWidth;
+ packedBitmap->ReserveBuffer( mPixelFormat, mBufferWidth, area.height ? area.height : mHeight );
+ DALI_ASSERT_DEBUG(bitmap->GetBuffer() != 0);
+ DALI_ASSERT_DEBUG(bitmap->GetBufferSize() >= mBufferWidth * ( area.height ? area.height : mHeight ) * mBytesPerPixel );
+
+ // Are we uploading from an external or internal buffer ?
+ if ( mExternalBuffer )
{
- mBitmap = Bitmap::New( Bitmap::BITMAP_2D_PACKED_PIXELS, mResourcePolicy );
+ // Check if we're doing the entire area without stride mismatch between source and dest ?
+ if( ( mByteStride == mWidth * mBytesPerPixel ) && area.IsEmpty() )
+ {
+ memcpy( bitmap->GetBuffer(), mExternalBuffer, mBufferSize );
+ }
+ else
+ {
+ UpdateBufferArea( mExternalBuffer, bitmap->GetBuffer(), area );
+ }
}
-
- if ( !mBitmap->GetBuffer() )
+ else
{
- Bitmap::PackedPixelsProfile* const packedBitmap = mBitmap->GetPackedPixelsProfile();
- DALI_ASSERT_DEBUG(packedBitmap);
-
- packedBitmap->ReserveBuffer( mPixelFormat, mWidth, mHeight, mByteStride / mBytesPerPixel, mHeight );
- DALI_ASSERT_DEBUG(mBitmap->GetBuffer() != 0);
- DALI_ASSERT_DEBUG(mBitmap->GetBufferSize() >= mWidth * mHeight * Pixel::GetBytesPerPixel( mBitmap->GetPixelFormat() ) );
+ // Check if we're doing the entire internal buffer ?
+ if( area.IsEmpty() )
+ {
+ memcpy( bitmap->GetBuffer(), mInternalBuffer, bitmap->GetBufferSize() );
+ }
+ else
+ {
+ UpdateBufferArea( mInternalBuffer, bitmap->GetBuffer(), area );
+ }
}
+ mResourceClient->UploadBitmap( destId, bitmap, area.x, area.y );
+
}
void BufferImage::UploadBitmap( ResourceId destId, std::size_t xOffset, std::size_t yOffset )
{
- // Make sure we have a bitmap for transport
- ReserveBitmap();
-
- // Copy source pixel data into bitmap
- RectArea area;
- UpdateBitmap( area );
+ RectArea area( xOffset, yOffset, 0, 0 );
+ if ( !mTicket )
+ {
+ CreateHostBitmap();
+ }
- mResourceClient->UploadBitmap( destId, mBitmap, xOffset, yOffset);
- mBitmap = NULL;
+ UploadArea( destId, area );
}
-void BufferImage::UpdateBufferArea( PixelBuffer* src, const RectArea& area )
+void BufferImage::UpdateBufferArea( PixelBuffer* src, PixelBuffer* dest, const RectArea& area )
{
DALI_ASSERT_DEBUG( area.x + area.width <= mWidth && area.y + area.height <= mHeight );
- PixelBuffer* dest = mBitmap->GetBuffer();
- uint32_t width = area.width * mBytesPerPixel;
- uint32_t stride = mWidth * mBytesPerPixel;
+ uint32_t width = mBufferWidth * mBytesPerPixel;
src += ( area.y * mByteStride ) + ( area.x * mBytesPerPixel );
- dest +=( ( area.y * mWidth ) + area.x ) * mBytesPerPixel;
for ( uint32_t i = 0; i < area.height; ++i )
{
memcpy( dest, src, width );
src += mByteStride;
- dest += stride;
- }
-}
-
-void BufferImage::MirrorExternal( const RectArea& area )
-{
- if( ( mByteStride == mWidth * mBytesPerPixel ) && area.IsEmpty() )
- {
- memcpy( mBitmap->GetBuffer(), mExternalBuffer, mBufferSize );
- }
- else
- {
- UpdateBufferArea( mExternalBuffer, area );
+ dest += width;
}
}
void BufferImage::Connect()
{
- if ( !mConnectionCount++ )
+ if ( !mConnectionCount++ && !mTicket )
{
RectArea area;
Update( area );
void BufferImage::Disconnect()
{
- if ( mTicket )
- {
- if ( !( --mConnectionCount ) && mReleasePolicy == Dali::Image::UNUSED )
- {
- mTicket->RemoveObserver(*this);
- mTicket.Reset();
- }
- }
+ --mConnectionCount;
}
} // namespace Internal
projects / platform / core / uifw / dali-core.git / blobdiff