FCL/sf/app/videoplayer: comparison videoplayback/videoplaybackview/viewsrc/videoplaybackdisplayhandler.cpp

equal deleted inserted replaced

-:4707a0db12f6
+:adb51f74b890
 *
 * Description:   Implementation of video playback display handler
 *
 */
-// Version : %version:  29 %
+// Version : %version:  31 %
 #include <sysutil.h>
 #include <s32file.h>
 #include <mpxcommand.h>
 #include <mpxcommandgeneraldefs.h>
-#include <mpxplaybackutility.h>
 #include <mpxvideoplaybackdefs.h>
 #include "videocontainer.h"
 #include "mpxvideoviewwrapper.h"
 #include "videoplaybackdisplayhandler.h"
 const TReal32 KTRANSITIONEFFECTCNT = 8;
 _LIT( KAspectRatioFile, "c:\\private\\200159b2\\mpxvideoplayer_aspect_ratio.dat" );
-CVideoPlaybackDisplayHandler::CVideoPlaybackDisplayHandler( MMPXPlaybackUtility* aPlayUtil,
+CVideoPlaybackDisplayHandler::CVideoPlaybackDisplayHandler( CMPXVideoViewWrapper* aViewWrapper )
-CMPXVideoViewWrapper* aViewWrapper )
+: iTransitionEffectCnt( 0 )
-: iPlaybackUtility( aPlayUtil )
-, iTransitionEffectCnt( 0 )
 , iViewWrapper( aViewWrapper )
 , iScaleWidth( 100.0f )
 , iScaleHeight( 100.0f )
 , iHorizontalPosition( EHorizontalAlignCenter )
 , iVerticalPosition( EVerticalAlignCenter )
 iVideoContainer = NULL;
 }
 }
 CVideoPlaybackDisplayHandler*
-CVideoPlaybackDisplayHandler::NewL( MMPXPlaybackUtility* aPlayUtil,
+CVideoPlaybackDisplayHandler::NewL( CMPXVideoViewWrapper* aViewWrapper )
-CMPXVideoViewWrapper* aViewWrapper )
 {
 MPX_ENTER_EXIT(_L("CVideoPlaybackDisplayHandler::NewL()"));
 CVideoPlaybackDisplayHandler* self =
-new(ELeave) CVideoPlaybackDisplayHandler( aPlayUtil, aViewWrapper );
+new(ELeave) CVideoPlaybackDisplayHandler( aViewWrapper );
 CleanupStack::PushL( self );
 self->ConstructL();
 CleanupStack::Pop();
 return self;
 //
 void CVideoPlaybackDisplayHandler::CreateDisplayWindowL(
 RWsSession& /*aWs*/,
 CWsScreenDevice& aScreenDevice,
 RWindow& aWin,
-TRect aDisplayRect )
+TRect aDisplayRect,
+VideoPlaybackViewFileDetails* aFileDetails )
 {
 MPX_ENTER_EXIT(_L("CVideoPlaybackDisplayHandler::CreateDisplayWindowL()"));
+iFileDetails = aFileDetails;
+//
+// get window aspect ratio
+//   if device is in landscape mode, width > height
+//   if device is in portrait mode, width < height
+//
+TReal32 width = (TReal32) aDisplayRect.Width();
+TReal32 height = (TReal32) aDisplayRect.Height();
+iDisplayAspectRatio = (width > height)? (width / height) : (height / width);
 if ( ! iVideoContainer )
 {
 iVideoContainer = new ( ELeave ) CVideoContainer();
 iVideoContainer->ConstructL();
 iVideoContainer->SetRect( aDisplayRect );
 }
 RWindowBase *videoWindow = iVideoContainer->DrawableWindow();
+((RWindow*)videoWindow )->SetBackgroundColor( KRgbBlack );
 videoWindow->SetOrdinalPosition( -1 );
 (&aWin)->SetOrdinalPosition( 0 );
 MPX_DEBUG(_L("VideoWindow ordinal position is: %d"), videoWindow->OrdinalPosition());
 MPX_DEBUG(_L("UiWindow ordinal position is: %d"), (&aWin)->OrdinalPosition());
 return aspectRatio;
 }
 // -------------------------------------------------------------------------------------------------
-//   CVideoPlaybackDisplayHandler::SetDefaultAspectRatioL
+//   CVideoPlaybackDisplayHandler::CalculateAspectRatioL
 // -------------------------------------------------------------------------------------------------
 //
-TInt CVideoPlaybackDisplayHandler::SetDefaultAspectRatioL(
+TInt CVideoPlaybackDisplayHandler::CalculateAspectRatioL()
-VideoPlaybackViewFileDetails* aFileDetails, TReal32 aDisplayAspectRatio )
+{
-{
+MPX_ENTER_EXIT(_L("CVideoPlaybackDisplayHandler::CalculateAspectRatioL()"));
-MPX_ENTER_EXIT(_L("CVideoPlaybackDisplayHandler::SetDefaultAspectRatioL()"));
 TInt newAspectRatio = EMMFNatural;
-if ( aFileDetails->mVideoHeight > 0 && aFileDetails->mVideoWidth > 0 )
+if ( iFileDetails->mVideoHeight > 0 && iFileDetails->mVideoWidth > 0 )
 {
 TMMFScalingType scalingType = EMMFNatural;
-TReal32 videoAspectRatio = (TReal32)aFileDetails->mVideoWidth /
+TReal32 videoAspectRatio = (TReal32)iFileDetails->mVideoWidth /
-(TReal32)aFileDetails->mVideoHeight;
+(TReal32)iFileDetails->mVideoHeight;
+//
+//  If the pixel aspect ratio is valid, use it to modify the videoAspectRatio
+//
+if ( iAspectRatio.iDenominator )
+{
+MPX_DEBUG(_L("VideoPlaybackDisplayHandler::CalculateAspectRatioL() iAspectRatio = (%d,%d)"),
+iAspectRatio.iNumerator, iAspectRatio.iDenominator );
+TReal32 par = (TReal32)iAspectRatio.iNumerator / (TReal32)iAspectRatio.iDenominator;
+videoAspectRatio *= par;
+}
 TInt cnt = iAspectRatioArray.Count();
 TInt i = 0;
 //
 //  check whether dat file has the information about (videoRatio + screenRatio)
 //
 for ( ; i < cnt ; i++ )
 {
-if ( iAspectRatioArray[i].videoRatio == videoAspectRatio &&
+if ( IsAspectRatioEqual( iAspectRatioArray[i].videoRatio, videoAspectRatio ) &&
-iAspectRatioArray[i].screenRatio == aDisplayAspectRatio &&
+IsAspectRatioEqual( iAspectRatioArray[i].screenRatio, iDisplayAspectRatio ) &&
 ( scalingType = iAspectRatioArray[i].scalingType ) > 0 )
 {
 break;
 }
 }
 //
 //  if can't find out match aspect ratio in dat file,
 //  choose the scaling type through the rule
-//      aspectRatioDiff =  videoAspectRatio - aDisplayAspectRatio
+//      aspectRatioDiff =  videoAspectRatio - iDisplayAspectRatio
-//      aspectRatioDiff ==  0        ==> natural
+//      aspectRatioDiff >= - 0.00001 and <= 0.00001    ==> natural
-//      aspectRatioDiff > 0.1        ==> zoom
+//      aspectRatioDiff > 0.1                          ==> zoom
-//      aspectRatioDiff < - 0.3      ==> natural
+//      aspectRatioDiff < - 0.3                        ==> natural
-//      aspectRatioDiff >= - 0.3 and <= 0.1   ==> stretch
+//      aspectRatioDiff >= - 0.3 and <= 0.1            ==> stretch
+//
+//               -0.3      -0.00001       0.00001         0.1
+//     ------------------------------------------------------------
+//         Natural |   Stretch  |   Natural  |   Stretch   |  Zoom
 //
 if ( i == cnt )
 {
-if ( videoAspectRatio - aDisplayAspectRatio > 0.1 )
+TReal32 aspectRatioDiff = videoAspectRatio - iDisplayAspectRatio;
+MPX_DEBUG(_L("VideoPlaybackDisplayHandler::CalculateAspectRatioL() videoAspectRatio = d,iDisplayAspectRatio = %d)"),
+videoAspectRatio, iDisplayAspectRatio );
+if ( IsAspectRatioEqual( videoAspectRatio, iDisplayAspectRatio )  )
+{
+scalingType = EMMFNatural;
+}
+else if ( aspectRatioDiff > 0.1 )
 {
 scalingType = EMMFZoom;
 }
-else if ( ( videoAspectRatio != aDisplayAspectRatio ) &&
+else if ( aspectRatioDiff > - 0.3 )
-( videoAspectRatio - aDisplayAspectRatio > (- 0.3) ) )
 {
 scalingType = EMMFStretch;
 }
 TMPXAspectRatio ratio;
 ratio.videoRatio = videoAspectRatio;
-ratio.screenRatio = aDisplayAspectRatio;
+ratio.screenRatio = iDisplayAspectRatio;
 ratio.scalingType = scalingType;
 iAspectRatioArray.Append( ratio );
 }
+iFileDetails->mAspectRatioChangeable =
+! IsAspectRatioEqual( videoAspectRatio, iDisplayAspectRatio );
 iCurrentIndexForAspectRatio = i;
 TMPXVideoPlaybackCommand aspectRatioCmd = EPbCmdNaturalAspectRatio;
 {
 MPX_ENTER_EXIT(_L("CVideoPlaybackDisplayHandler::SetVideoRectL()"));
 if ( iVideoDisplay )
 {
-iVideoDisplay->SetVideoExtentL( *iWindowBase, aRect, TRect( iWindowBase->Size() ) );
+TRect temp = aRect;
+MPX_DEBUG(_L("CVideoPlaybackDisplayHandler::SetVideoRectL() origianl rect %d %d %d %d"),
+temp.iTl.iX, temp.iTl.iY, temp.iBr.iX, temp.iBr.iY );
+//
+// Need to transform based on rotation clockwise
+// since the input rect is based on orbit orientation(which can be landscape or potrait)
+// and the video surface is always in device orientation(can't be changed by anything).
+// If iRotation is EVideoRotationNone,
+// we don't need to transfrom the rect since video and ui surfaces are in same orietation.
+// but if iRotation is not EVideoRotationNone,
+// we need to transform the rect based on clockwise.
+//
+switch( iRotation )
+{
+case EVideoRotationClockwise90:
+{
+int screenWidth = iWindowBase->Size().iWidth;
+temp = TRect( screenWidth - aRect.iBr.iY,
+aRect.iTl.iX,
+screenWidth - aRect.iTl.iY,
+aRect.iBr.iX );
+break;
+}
+}
+MPX_DEBUG(_L("CVideoPlaybackDisplayHandler::SetVideoRectL() transformed rect %d %d %d %d"),
+temp.iTl.iX, temp.iTl.iY, temp.iBr.iX, temp.iBr.iY );
+iVideoDisplay->SetVideoExtentL( *iWindowBase, temp, iCropRect );
 }
 }
 // -------------------------------------------------------------------------------------------------
 //   CVideoPlaybackDisplayHandler::AddDisplayWindowL()
 iVerticalPosition,
 aWin );
 );
 MPX_DEBUG(_L("CVideoPlaybackDisplayHandler::AddDisplayWindowL() Display Added"));
 //
 //  Check if surface was created before window was ready
 //
 if ( iSurfaceCached )
 {
 //
 iSurfaceId = aMessage->ValueTObjectL<TSurfaceId>( KMPXMediaVideoDisplayTSurfaceId );
 iCropRect = aMessage->ValueTObjectL<TRect>( KMPXMediaVideoDisplayCropRect );
 iAspectRatio = aMessage->ValueTObjectL<TVideoAspectRatio>( KMPXMediaVideoDisplayAspectRatio );
+iViewWrapper->SetDefaultAspectRatio( CalculateAspectRatioL() );
 if ( iVideoDisplay )
 {
 //
 //  Remove old surface if one exists
 //
 //  Extract the surface parameters from the message
 //
 iSurfaceId = aMessage->ValueTObjectL<TSurfaceId>( KMPXMediaVideoDisplayTSurfaceId );
 iCropRect = aMessage->ValueTObjectL<TRect>( KMPXMediaVideoDisplayCropRect );
 iAspectRatio = aMessage->ValueTObjectL<TVideoAspectRatio>( KMPXMediaVideoDisplayAspectRatio );
+iViewWrapper->SetDefaultAspectRatio( CalculateAspectRatioL() );
 if ( iVideoDisplay )
 {
 //
 //  Add new surface
 }
 return aspectRatio;
 }
+// -------------------------------------------------------------------------------------------------
+//   CVideoPlaybackDisplayHandler::IsAspectRatioEqual()
+// -------------------------------------------------------------------------------------------------
+//
+TBool CVideoPlaybackDisplayHandler::IsAspectRatioEqual( TReal32 aRatio1, TReal32 aRatio2 )
+{
+MPX_DEBUG(_L("CVideoPlaybackDisplayHandler::IsAspectRatioEqual() ar1 = %f ar2 = %f)"),
+aRatio1, aRatio2 );
+TBool valuesEqual = EFalse;
+TReal32 arDiff = aRatio1 - aRatio2;
+if ( arDiff < 0.00001 && arDiff > -0.00001 )
+{
+valuesEqual = ETrue;
+}
+MPX_DEBUG(_L("CVideoPlaybackDisplayHandler::IsAspectRatioEqual(%d)"), valuesEqual);
+return valuesEqual;
+}
 // End of File

changeset 66	adb51f74b890
parent 55	4bfa887905cf
child 67	72c709219fcd