MCL/sf/app/videoplayer: comparison videoplayback/videoplaybackcontrols/src/mpxvideoplaybackcontrolscontroller.cpp

equal deleted inserted replaced

-:ce5ada96ab30
+:5294c000a26d
 *
 * Description:  Implementation of MPXVideoPlaybackControlsController
 *
 */
-// Version : %version: 27 %
+// Version : %version: e003sa33#30 %
 // INCLUDE FILES
 #include <fbs.h>
 #include <coecntrl.h>
 using namespace AknLayoutScalable_Avkon;
 const TInt KMPXControlsTimeOut = 4000000;
 const TInt KMP4LayoutSet = 6;
 // ================= MEMBER FUNCTIONS ==============================================================
 // -------------------------------------------------------------------------------------------------
 // CMPXVideoPlaybackControlsController::CMPXVideoPlaybackControlsController
 // C++ default constructor can NOT contain any code, that might leave.
 //
 CMPXVideoPlaybackControlsController::CMPXVideoPlaybackControlsController(
 CMPXVideoPlaybackContainer* aContainer, TRect aRect )
 : iControls( EMPXControlsCount ),
 iRect( aRect ),
-iContainer( aContainer ),
+iSurfaceCreated( EFalse ),
-iSurfaceCreated(EFalse)
+iContainer( aContainer )
 {
 }
 // -------------------------------------------------------------------------------------------------
 // CMPXVideoPlaybackControlsController::ConstructL()
 iVideoResourceOffset = coeEnv->AddResourceFileL( resourceFile );
 iFileDetails = aDetails;
 iTvOutConnected = iFileDetails->iTvOutConnected;
-iFileDetails->iRNFormat = IsRealFormatL( iFileDetails->iClipName->Des() );
+iRNFormat = IsRealFormatL( iFileDetails->iClipName->Des() );
-if ( iFileDetails->iRNFormat )
-{
-	CreateRealOneBitmapL();
-}
 iControlsPolicy = CMPXVideoPlaybackControlPolicy::NewL();
 iControlsConfig = CMPXVideoPlaybackControlConfiguration::NewL( this );
 iControlsTimer = CPeriodic::NewL( CActive::EPriorityStandard );
 {
 MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::~CMPXVideoPlaybackControlsController"));
 iFs.Close();
 #ifdef RD_TACTILE_FEEDBACK
-if (iFeedback)
+if ( iFeedback )
 {
 iFeedback->RemoveFeedbackForControl( iContainer );
 }
 #endif //RD_TACTILE_FEEDBACK
 CMPXVideoPlaybackViewFileDetails* aDetails )
 {
 MPX_ENTER_EXIT(_L("CMPXVideoPlaybackControlsController::AddFileDetailsL()"));
 iFileDetails = aDetails;
-iFileDetails->iRNFormat = IsRealFormatL( iFileDetails->iClipName->Des() );
 iControlsConfig->UpdateControlsWithFileDetailsL();
 ControlsListUpdatedL();
 {
 ShowControls();
 break;
 }
 case EMPXControlCmdSurfaceCreated:
-		{
+{
-			//
+iSurfaceCreated = ETrue;
-			//  When surface is created, remove the Real One Bitmap
+SetRealOneBitmapVisibility( EFalse );
-			//
+break;
-			iSurfaceCreated = ETrue;
+}
-			SetRealOneBitmapVisibility( EFalse );
+case EMPXControlCmdSurfaceRemoved:
-			break;
+{
-		}
+iSurfaceCreated = EFalse;
+break;
+}
 }
 }
 // -------------------------------------------------------------------------------------------------
 // CMPXVideoPlaybackControlsController::HandleStateChange
 //
 // Somehow EPbStatePlaying, EPbStatePaused gets called twice continously
 //
 if ( aNewState != iState )
 {
-	TBool hideControls( EFalse );
+TBool hideControls( EFalse );
 iState = aNewState;
 switch ( aNewState )
 {
 case EPbStateInitialised:
 //  remove branding control when the state is transitioned to Initialized
 //
 if ( iFileDetails->iPlaybackMode == EMPXVideoStreaming ||
 iFileDetails->iPlaybackMode == EMPXVideoLiveStreaming )
 {
-iControlsConfig->UpdateControlListL( EMPXControlCmdPluginInitialized );
+TRAP_IGNORE(
-ControlsListUpdatedL();
+iControlsConfig->UpdateControlListL( EMPXControlCmdPluginInitialized );
+ControlsListUpdatedL();
+);
 }
 break;
 }
 case EPbStatePlaying:
 {
 HideAllControls();
 }
 else
 {
-	UpdateControlsVisibility();
+UpdateControlsVisibility();
 }
 break;
 }
 }
 // -------------------------------------------------------------------------------------------------
 //
 void CMPXVideoPlaybackControlsController::CreateRealOneBitmapL()
 {
 MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::CreateRealOneBitmapL()"));
 TFileName iconsPath;
 LocateBitmapFileL( iconsPath );
 iRealOneBitmap = CreateBitmapL( iconsPath,
 brandingPaneRect.Rect().iBr.iX-20,
 brandingPaneRect.Rect().iBr.iY-50 );
 CMPXVideoPlaybackBrandingAnimation* brandingAnimation =
 CMPXVideoPlaybackBrandingAnimation::NewL( this,
 brandingLogoRect,
-iFileDetails->iRNFormat );
+iRNFormat );
 CleanupStack::PushL( brandingAnimation );
 CMPXVideoPlaybackControl* control =
 CMPXVideoPlaybackControl::NewL( this,
 else
 {
 label->SetAlignment( EHRightVBottom );
 }
 }
 skRect = label->Rect();
 // Enlarge the button region to make it easy to be touched.
 skRect.iTl.iY -= 6;
 skRect.iBr.iY += 6;
 TBool realFormat = EFalse;
 _LIT(KMPXReal, "real" );
 _LIT(KMPXRN, "rn" );
-if (iFileDetails->iMimeType)
+if ( iFileDetails->iMimeType )
 {
 iFileDetails->iMimeType->Des().LowerCase();
 if ( iFileDetails->iMimeType->Find( KMPXReal ) >= 0 ||
 iFileDetails->iMimeType->Find( KMPXRN ) >= 0 )
 {
+//
+// RN clip and local mode, add RN logo bitmap to show while initializing
+//
+CreateRealOneBitmapL();
+SetRealOneBitmapVisibility( ETrue );
 realFormat = ETrue;
 }
 }
 MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::RealFormatForLocalL() [%d]"), realFormat);
 {
 MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::SetRealOneBitmapVisibility(%d)"), aVisible);
 if ( iRealOneBitmap )
 {
-	iRealOneBitmap->MakeVisible( aVisible );
+iRealOneBitmap->MakeVisible( aVisible );
 }
 }
 // -------------------------------------------------------------------------------------------------
 // CMPXVideoPlaybackControlsController::HandleErrors
 if ( iFileDetails->iPlaybackMode == EMPXVideoStreaming )
 {
 StopBrandingAnimation();
 }
-break;
-}
-default :
-{
 break;
 }
 }
 }
 delete iMediaDetailsViewerControl;
 iMediaDetailsViewerControl = NULL;
 }
 }
+// -------------------------------------------------------------------------------------------------
+//   CMPXVideoPlaybackControlsController::SetBackgroundBlack
+// -------------------------------------------------------------------------------------------------
+//
 TBool CMPXVideoPlaybackControlsController::SetBackgroundBlack()
 {
-TBool backgroundBlack = iSurfaceCreated && !iTvOutConnected;
+TBool backgroundBlack = iSurfaceCreated && ! iTvOutConnected;
 MPX_DEBUG(_L("CMPXVideoPlaybackControlsController::SetBackgroundBlack(%d)"), backgroundBlack);
 return backgroundBlack;
 }
+// -------------------------------------------------------------------------------------------------
+//   CMPXVideoPlaybackControlsController::IsSameAspectRatio
+// -------------------------------------------------------------------------------------------------
+//
+TBool CMPXVideoPlaybackControlsController::IsSameAspectRatio()
+{
+	MPX_ENTER_EXIT( _L( "CMPXVideoPlaybackControlsController::IsSameAspectRatio()" ) );
+TBool retVal = EFalse;
+if ( iFileDetails->iVideoEnabled &&
+	 iFileDetails->iVideoHeight > 0 &&
+	     iFileDetails->iVideoWidth > 0 )
+{
+TRect displayRect = iContainer->Rect();
+TReal displayAspectRatio = ( TReal32 )displayRect.Width() / ( TReal32 )displayRect.Height();
+TReal videoAspectRatio = ( TReal32 )iFileDetails->iVideoWidth /
+		                 ( TReal32 )iFileDetails->iVideoHeight;
+if ( displayAspectRatio == videoAspectRatio )
+{
+retVal = ETrue;
+}
+}
+MPX_DEBUG( _L( "CMPXVideoPlaybackControlsController::IsSameAspectRatio(%d)" ), retVal );
+return retVal;
+}
 // End of File

branch	RCL_3
changeset 9	5294c000a26d
parent 6	7d91903f795f
child 10	112a725ff2c2