X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fvideo-view%2Fvideo-view-impl.cpp;h=2fdb70b206d2d2a93c9662de1d106a1fb737f8ef;hb=e9333cfe318586fd503495e28b0d71c0dac4888a;hp=671ebb7b29edaf840477d1c201ebf169ab54da72;hpb=f31a7b83577275e88914a00f37c4ff5224336553;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp index 671ebb7..2fdb70b 100644 --- a/dali-toolkit/internal/controls/video-view/video-view-impl.cpp +++ b/dali-toolkit/internal/controls/video-view/video-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -26,9 +26,18 @@ #include #include #include +#include +#include +#include // INTERNAL INCLUDES #include +#include +#include +#include +#include +#include +#include namespace Dali { @@ -66,24 +75,76 @@ DALI_TYPE_REGISTRATION_END() const char* const VOLUME_LEFT( "volumeLeft" ); const char* const VOLUME_RIGHT( "volumeRight" ); -const char* const RENDERING_TARGET( "RENDERING_TARGET" ); +const char* const RENDERING_TARGET( "renderingTarget" ); const char* const WINDOW_SURFACE_TARGET( "windowSurfaceTarget" ); const char* const NATIVE_IMAGE_TARGET( "nativeImageTarget" ); +const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( + attribute mediump vec2 aPosition;\n + uniform mediump mat4 uMvpMatrix;\n + uniform mediump vec3 uSize;\n + \n + void main()\n + {\n + mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);\n + vertexPosition.xyz *= uSize;\n + gl_Position = uMvpMatrix * vertexPosition;\n + }\n +); + +const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( + uniform lowp vec4 uColor;\n + uniform lowp vec3 mixColor;\n + uniform lowp float opacity;\n + \n + void main()\n + {\n + gl_FragColor = vec4(mixColor, opacity)*uColor;\n + }\n +); + +struct TriggerFunctor +{ + TriggerFunctor( TriggerEventInterface* notification ) + : mNotification( notification ) + { + } + + void operator()( bool& current, const PropertyInputContainer& inputs ) + { + if( mNotification != NULL ) + { + mNotification->Trigger(); + } + } + + TriggerEventInterface* mNotification; +}; + } // anonymous namepsace VideoView::VideoView() -: Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), +: Control( ControlBehaviour( ACTOR_BEHAVIOUR_DEFAULT | DISABLE_STYLE_CHANGE_SIGNALS ) ), + mUpdateTriggerPropertyIndex( Property::INVALID_INDEX), + mNotification( NULL ), mCurrentVideoPlayPosition( 0 ), - mSetRenderingTarget( false ), + mIsNativeImageTarget( true ), mIsPlay( false ), mIsPause( false ) { mVideoPlayer = Dali::VideoPlayer::New(); + + TriggerEventFactory triggerEventFactory; + mNotification = triggerEventFactory.CreateTriggerEvent( MakeCallback(this, &VideoView::UpdateDisplayArea ), + TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER); } VideoView::~VideoView() { + if( mNotification != NULL ) + { + delete mNotification; + } } Toolkit::VideoView VideoView::New() @@ -96,23 +157,33 @@ Toolkit::VideoView VideoView::New() return handle; } +void VideoView::OnInitialize() +{ + Any source; + Dali::NativeImageSourcePtr nativeImageSourcePtr = Dali::NativeImageSource::New( source ); + mNativeImage = Dali::NativeImage::New( *nativeImageSourcePtr ); + + mVideoPlayer.SetRenderingTarget( nativeImageSourcePtr ); + mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish ); + + mUpdateTriggerPropertyIndex = Self().RegisterProperty( "updateTrigger", true ); +} + void VideoView::SetUrl( const std::string& url ) { if( mUrl != url || !mPropertyMap.Empty() ) { - mPropertyMap.Clear(); - mUrl = url; + mPropertyMap.Clear(); } - if( mSetRenderingTarget ) + if( mIsNativeImageTarget ) { - mVideoPlayer.SetUrl( mUrl ); - } - else - { - SetNativeImageTarget(); + Actor self( Self() ); + Internal::InitializeVisual( self, mVisual, mNativeImage ); } + + mVideoPlayer.SetUrl( mUrl ); } void VideoView::SetPropertyMap( Property::Map map ) @@ -120,7 +191,7 @@ void VideoView::SetPropertyMap( Property::Map map ) mPropertyMap = map; Actor self( Self() ); - InitializeVisual( self, mRenderer, mPropertyMap ); + Internal::InitializeVisual( self, mVisual, mPropertyMap ); Property::Value* widthValue = mPropertyMap.Find( "width" ); if( widthValue ) @@ -142,6 +213,18 @@ void VideoView::SetPropertyMap( Property::Map map ) } } + Property::Value* target = map.Find( RENDERING_TARGET ); + std::string targetType; + + if( target && target->Get( targetType ) && targetType == WINDOW_SURFACE_TARGET ) + { + this->SetWindowSurfaceTarget(); + } + else if( target && target->Get( targetType ) && targetType == NATIVE_IMAGE_TARGET ) + { + this->SetNativeImageTarget(); + } + RelayoutRequest(); } @@ -318,25 +401,33 @@ void VideoView::SetProperty( BaseObject* object, Property::Index index, const Pr case Toolkit::VideoView::Property::VIDEO: { std::string videoUrl; + Property::Map map; + if( value.Get( videoUrl ) ) { impl.SetUrl( videoUrl ); } - - Property::Map map; - if( value.Get( map ) ) + else if( value.Get( map ) ) { - impl.SetPropertyMap( map ); + Property::Value* shaderValue = map.Find( Toolkit::Visual::Property::SHADER, CUSTOM_SHADER ); - Property::Value* target = map.Find( RENDERING_TARGET ); - std::string targetType; - if( target && target->Get( targetType ) && targetType == WINDOW_SURFACE_TARGET ) + if( map.Count() > 1u || !shaderValue ) { - impl.SetWindowSurfaceTarget(); + impl.SetPropertyMap( map ); } - else if( target && target->Get( targetType ) && targetType == NATIVE_IMAGE_TARGET ) + else if( impl.mVisual && map.Count() == 1u && shaderValue ) { - impl.SetNativeImageTarget(); + Property::Map shaderMap; + if( shaderValue->Get( shaderMap ) ) + { + Internal::Visual::Base& visual = Toolkit::GetImplementation( impl.mVisual ); + visual.SetCustomShader( shaderMap ); + if( videoView.OnStage() ) + { + visual.SetOffStage( videoView ); + visual.SetOnStage( videoView ); + } + } } } break; @@ -430,29 +521,29 @@ Property::Value VideoView::GetProperty( BaseObject* object, Property::Index prop void VideoView::SetDepthIndex( int depthIndex ) { - if( mRenderer ) + if( mVisual ) { - mRenderer.SetDepthIndex( depthIndex ); + mVisual.SetDepthIndex( depthIndex ); } } void VideoView::OnStageConnection( int depth ) { - Control::OnStageConnection( depth ); - - if( mRenderer ) + if( mVisual ) { CustomActor self = Self(); - mRenderer.SetOnStage( self ); + Toolkit::GetImplementation(mVisual).SetOnStage( self ); } + + Control::OnStageConnection( depth ); } void VideoView::OnStageDisconnection() { - if( mRenderer ) + if( mVisual ) { CustomActor self = Self(); - mRenderer.SetOffStage( self ); + Toolkit::GetImplementation(mVisual).SetOffStage( self ); } Control::OnStageDisconnection(); @@ -504,12 +595,21 @@ void VideoView::SetWindowSurfaceTarget() Actor self = Self(); int curPos = mVideoPlayer.GetPlayPosition(); - mSetRenderingTarget = true; - mRenderer.RemoveAndReset( self ); + if( mVisual ) + { + Toolkit::GetImplementation(mVisual).SetOffStage(self); + mVisual.Reset(); + } + + Constraint constraint = Constraint::New( self, mUpdateTriggerPropertyIndex, TriggerFunctor( mNotification ) ); + constraint.AddSource( Source( self, Actor::Property::POSITION ) ); + constraint.AddSource( Source( self, Actor::Property::SIZE ) ); + constraint.Apply(); mVideoPlayer.SetRenderingTarget( Dali::Adaptor::Get().GetNativeWindowHandle() ); mVideoPlayer.SetUrl( mUrl ); - mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish ); + + mIsNativeImageTarget = false; if( mIsPlay ) { @@ -520,7 +620,23 @@ void VideoView::SetWindowSurfaceTarget() mVideoPlayer.Play(); mVideoPlayer.Pause(); } - mVideoPlayer.SetPlayPosition( curPos ); + + if( curPos > 0 ) + { + mVideoPlayer.SetPlayPosition( curPos ); + } + + // For underlay rendering mode, video display area have to be transparent. + Geometry geometry = VisualFactoryCache::CreateQuadGeometry(); + Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER ); + Renderer renderer = Renderer::New( geometry, shader ); + + renderer.SetProperty( Renderer::Property::BLEND_MODE, BlendMode::ON ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_RGB, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_RGB, BlendFactor::ZERO ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_SRC_ALPHA, BlendFactor::ONE ); + renderer.SetProperty( Renderer::Property::BLEND_FACTOR_DEST_ALPHA, BlendFactor::ZERO ); + self.AddRenderer( renderer ); } void VideoView::SetNativeImageTarget() @@ -528,17 +644,15 @@ void VideoView::SetNativeImageTarget() Actor self( Self() ); int curPos = mVideoPlayer.GetPlayPosition(); - mSetRenderingTarget = true; - Any source; Dali::NativeImageSourcePtr nativeImageSourcePtr = Dali::NativeImageSource::New( source ); mNativeImage = Dali::NativeImage::New( *nativeImageSourcePtr ); mVideoPlayer.SetRenderingTarget( nativeImageSourcePtr ); mVideoPlayer.SetUrl( mUrl ); - mVideoPlayer.FinishedSignal().Connect( this, &VideoView::EmitSignalFinish ); - InitializeVisual( self, mRenderer, mNativeImage ); + Internal::InitializeVisual( self, mVisual, mNativeImage ); + mIsNativeImageTarget = true; if( mIsPlay ) { @@ -550,11 +664,32 @@ void VideoView::SetNativeImageTarget() mVideoPlayer.Play(); mVideoPlayer.Pause(); } - mVideoPlayer.SetPlayPosition( curPos ); + if( curPos > 0 ) + { + mVideoPlayer.SetPlayPosition( curPos ); + } +} + +void VideoView::UpdateDisplayArea() +{ + Actor self( Self() ); + + bool positionUsesAnchorPoint = self.GetProperty( DevelActor::Property::POSITION_USES_ANCHOR_POINT ).Get< bool >(); + Vector3 actorSize = self.GetCurrentSize() * self.GetCurrentScale(); + Vector3 anchorPointOffSet = actorSize * ( positionUsesAnchorPoint ? self.GetCurrentAnchorPoint() : AnchorPoint::TOP_LEFT ); + + Vector2 screenPosition = self.GetProperty( DevelActor::Property::SCREEN_POSITION ).Get< Vector2 >(); + + mDisplayArea.x = screenPosition.x - anchorPointOffSet.x; + mDisplayArea.y = screenPosition.y - anchorPointOffSet.y; + mDisplayArea.width = actorSize.x; + mDisplayArea.height = actorSize.y; + + mVideoPlayer.SetDisplayArea( mDisplayArea ); } } // namespace Internal -} // namespace Toolkit +} // namespace toolkit } // namespace Dali