X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=adaptors%2Ftizen%2Fnative-image-source-impl-tizen.cpp;h=fecf43b602326b94ef11b4193d40b16fdda1da9a;hb=3d2425ed78131e450cea9f61ec19d4420e6a7aa4;hp=57c8d434e431a9c09cc34bade7dbc010b5d049d2;hpb=4b72bd158368194ce4ae25e0793225849c6ca3db;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/adaptors/tizen/native-image-source-impl-tizen.cpp b/adaptors/tizen/native-image-source-impl-tizen.cpp old mode 100755 new mode 100644 index 57c8d43..fecf43b --- a/adaptors/tizen/native-image-source-impl-tizen.cpp +++ b/adaptors/tizen/native-image-source-impl-tizen.cpp @@ -20,16 +20,19 @@ // EXTERNAL INCLUDES #include +#include #include +#include // INTERNAL INCLUDES #include #include #include #include +#include + // Allow this to be encoded and saved: -#include #include namespace Dali @@ -45,6 +48,21 @@ namespace { const char* FRAGMENT_PREFIX = "#extension GL_OES_EGL_image_external:require\n"; const char* SAMPLER_TYPE = "samplerExternalOES"; + +tbm_format FORMATS_BLENDING_REQUIRED[] = { + TBM_FORMAT_ARGB4444, TBM_FORMAT_ABGR4444, + TBM_FORMAT_RGBA4444, TBM_FORMAT_BGRA4444, + TBM_FORMAT_RGBX5551, TBM_FORMAT_BGRX5551, + TBM_FORMAT_ARGB1555, TBM_FORMAT_ABGR1555, + TBM_FORMAT_RGBA5551, TBM_FORMAT_BGRA5551, + TBM_FORMAT_ARGB8888, TBM_FORMAT_ABGR8888, + TBM_FORMAT_RGBA8888, TBM_FORMAT_BGRA8888, + TBM_FORMAT_ARGB2101010, TBM_FORMAT_ABGR2101010, + TBM_FORMAT_RGBA1010102, TBM_FORMAT_BGRA1010102 +}; + +const int NUM_FORMATS_BLENDING_REQUIRED = 18; + } using Dali::Integration::PixelBuffer; @@ -65,31 +83,35 @@ NativeImageSource* NativeImageSource::New(unsigned int width, unsigned int heigh NativeImageSource::NativeImageSource( unsigned int width, unsigned int height, Dali::NativeImageSource::ColorDepth depth, Any nativeImageSource ) : mWidth( width ), mHeight( height ), - mOwnTbmsurface( false ), - mTbmsurface( NULL ), + mOwnTbmSurface( false ), + mTbmSurface( NULL ), + mTbmFormat( 0 ), mBlendingRequired( false ), mColorDepth( depth ), mEglImageKHR( NULL ), mEglImageExtensions( NULL ), - mSetSource( false ) + mSetSource( false ), + mNotification( NULL ) { DALI_ASSERT_ALWAYS( Adaptor::IsAvailable() ); EglFactory& eglFactory = Adaptor::GetImplementation( Adaptor::Get() ).GetEGLFactory(); mEglImageExtensions = eglFactory.GetImageExtensions(); DALI_ASSERT_DEBUG( mEglImageExtensions ); - mTbmsurface = GetSurfaceFromAny( nativeImageSource ); + mTbmSurface = GetSurfaceFromAny( nativeImageSource ); - if( mTbmsurface != NULL ) + if( mTbmSurface != NULL ) { - mWidth = tbm_surface_get_width( mTbmsurface ); - mHeight = tbm_surface_get_height( mTbmsurface ); + tbm_surface_internal_ref( mTbmSurface ); + mBlendingRequired = CheckBlending( tbm_surface_get_format( mTbmSurface ) ); + mWidth = tbm_surface_get_width( mTbmSurface ); + mHeight = tbm_surface_get_height( mTbmSurface ); } } void NativeImageSource::Initialize() { - if( mTbmsurface != NULL || mWidth == 0 || mHeight == 0 ) + if( mTbmSurface != NULL || mWidth == 0 || mHeight == 0 ) { return; } @@ -143,8 +165,8 @@ void NativeImageSource::Initialize() If depth = 32, Pixel::RGBA8888 */ mBlendingRequired = ( depth == 32 || depth == 8 ); - mTbmsurface = tbm_surface_create( mWidth, mHeight, format ); - mOwnTbmsurface = true; + mTbmSurface = tbm_surface_create( mWidth, mHeight, format ); + mOwnTbmSurface = true; } tbm_surface_h NativeImageSource::GetSurfaceFromAny( Any source ) const @@ -166,27 +188,45 @@ tbm_surface_h NativeImageSource::GetSurfaceFromAny( Any source ) const NativeImageSource::~NativeImageSource() { - if( mOwnTbmsurface && mTbmsurface != NULL ) + if( mOwnTbmSurface ) { - if( tbm_surface_destroy( mTbmsurface ) != TBM_SURFACE_ERROR_NONE ) + if( mTbmSurface != NULL && tbm_surface_destroy( mTbmSurface ) != TBM_SURFACE_ERROR_NONE ) { DALI_LOG_ERROR( "Failed to destroy tbm_surface\n" ); } } + else + { + if( mTbmSurface != NULL ) + { + tbm_surface_internal_unref( mTbmSurface ); + + if (mNotification != NULL) { + TriggerEventInterface* triggerEvent = static_cast(mNotification); + triggerEvent->Trigger(); + } + } + } } Any NativeImageSource::GetNativeImageSource() const { - return Any( mTbmsurface ); + return Any( mTbmSurface ); +} + + +void NativeImageSource::SetDestructorNotification(void* notification) +{ + mNotification = notification; } bool NativeImageSource::GetPixels(std::vector& pixbuf, unsigned& width, unsigned& height, Pixel::Format& pixelFormat) const { - if( mTbmsurface != NULL ) + if( mTbmSurface != NULL ) { tbm_surface_info_s surface_info; - if( tbm_surface_map( mTbmsurface, TBM_SURF_OPTION_READ, &surface_info) != TBM_SURFACE_ERROR_NONE ) + if( tbm_surface_map( mTbmSurface, TBM_SURF_OPTION_READ, &surface_info) != TBM_SURFACE_ERROR_NONE ) { DALI_LOG_ERROR( "Fail to map tbm_surface\n" ); @@ -221,7 +261,7 @@ bool NativeImageSource::GetPixels(std::vector& pixbuf, unsigned& { cOffset = c*3; offset = cOffset + r*stride; - *(bufptr) = ptr[offset+2]; + *(bufptr+cOffset) = ptr[offset+2]; *(bufptr+cOffset+1) = ptr[offset+1]; *(bufptr+cOffset+2) = ptr[offset]; } @@ -241,7 +281,7 @@ bool NativeImageSource::GetPixels(std::vector& pixbuf, unsigned& { cOffset = c*4; offset = cOffset + r*stride; - *(bufptr) = ptr[offset+3]; + *(bufptr+cOffset) = ptr[offset+3]; *(bufptr+cOffset+1) = ptr[offset+2]; *(bufptr+cOffset+2) = ptr[offset+1]; *(bufptr+cOffset+3) = ptr[offset]; @@ -251,17 +291,13 @@ bool NativeImageSource::GetPixels(std::vector& pixbuf, unsigned& } default: { - DALI_LOG_WARNING( "Tbm surface has unsupported pixel format.\n" ); - - pixbuf.resize( 0 ); - width = 0; - height = 0; + DALI_ASSERT_ALWAYS( 0 && "Tbm surface has unsupported pixel format.\n" ); return false; } } - if( tbm_surface_unmap( mTbmsurface ) != TBM_SURFACE_ERROR_NONE ) + if( tbm_surface_unmap( mTbmSurface ) != TBM_SURFACE_ERROR_NONE ) { DALI_LOG_ERROR( "Fail to unmap tbm_surface\n" ); } @@ -292,33 +328,35 @@ bool NativeImageSource::EncodeToFile(const std::string& filename) const void NativeImageSource::SetSource( Any source ) { - if( mOwnTbmsurface && mTbmsurface != NULL ) + if( mOwnTbmSurface ) { - if( tbm_surface_destroy( mTbmsurface ) != TBM_SURFACE_ERROR_NONE ) + if( mTbmSurface != NULL && tbm_surface_destroy( mTbmSurface ) != TBM_SURFACE_ERROR_NONE ) { DALI_LOG_ERROR( "Failed to destroy tbm_surface\n" ); } - mTbmsurface = NULL; - mOwnTbmsurface = false; + mTbmSurface = NULL; + mOwnTbmSurface = false; } - - mTbmsurface = GetSurfaceFromAny( source ); - mSetSource = true; - - if( mTbmsurface != NULL ) + else { - mWidth = tbm_surface_get_width( mTbmsurface ); - mHeight = tbm_surface_get_height( mTbmsurface ); + if( mTbmSurface != NULL ) + { + tbm_surface_internal_unref( mTbmSurface ); + mTbmSurface = NULL; + } } - if( mEglImageKHRContainer.Size() > 2 ) + mTbmSurface = GetSurfaceFromAny( source ); + + if( mTbmSurface != NULL ) { - mEglImageExtensions->DestroyImageKHR(mEglImageKHRContainer[0]); - mEglImageKHRContainer.Erase( mEglImageKHRContainer.Begin() ); + mSetSource = true; + tbm_surface_internal_ref( mTbmSurface ); + mBlendingRequired = CheckBlending( tbm_surface_get_format( mTbmSurface ) ); + mWidth = tbm_surface_get_width( mTbmSurface ); + mHeight = tbm_surface_get_height( mTbmSurface ); } - - mEglImageKHRContainer.PushBack( mEglImageKHR ); } bool NativeImageSource::IsColorDepthSupported( Dali::NativeImageSource::ColorDepth colorDepth ) @@ -376,7 +414,11 @@ bool NativeImageSource::GlExtensionCreate() { // casting from an unsigned int to a void *, which should then be cast back // to an unsigned int in the driver. - EGLClientBuffer eglBuffer = reinterpret_cast< EGLClientBuffer > (mTbmsurface); + EGLClientBuffer eglBuffer = reinterpret_cast< EGLClientBuffer >(mTbmSurface); + if( !eglBuffer ) + { + return false; + } mEglImageKHR = mEglImageExtensions->CreateImageKHR( eglBuffer ); @@ -385,9 +427,12 @@ bool NativeImageSource::GlExtensionCreate() void NativeImageSource::GlExtensionDestroy() { - mEglImageExtensions->DestroyImageKHR(mEglImageKHR); + if( mEglImageKHR ) + { + mEglImageExtensions->DestroyImageKHR(mEglImageKHR); - mEglImageKHR = NULL; + mEglImageKHR = NULL; + } } unsigned int NativeImageSource::TargetTexture() @@ -399,9 +444,17 @@ unsigned int NativeImageSource::TargetTexture() void NativeImageSource::PrepareTexture() { - if( mSetSource && GlExtensionCreate() ) + if( mSetSource ) { - TargetTexture(); + void* eglImage = mEglImageKHR; + + if( GlExtensionCreate() ) + { + TargetTexture(); + } + + mEglImageExtensions->DestroyImageKHR( eglImage ); + mSetSource = false; } } @@ -449,6 +502,29 @@ const char* NativeImageSource::GetCustomSamplerTypename() return SAMPLER_TYPE; } +int NativeImageSource::GetEglImageTextureTarget() +{ + return GL_TEXTURE_EXTERNAL_OES; +} + +bool NativeImageSource::CheckBlending( tbm_format format ) +{ + if( mTbmFormat != format ) + { + for(int i = 0; i < NUM_FORMATS_BLENDING_REQUIRED; ++i) + { + if( format == FORMATS_BLENDING_REQUIRED[i] ) + { + mBlendingRequired = true; + break; + } + } + mTbmFormat = format; + } + + return mBlendingRequired; +} + } // namespace Adaptor } // namespace internal