MCL/sf/app/videoplayer: comparison videoplayback/videoplaybackviews/src/mpxvideobaseplaybackview.cpp

equal deleted inserted replaced

-:ce5ada96ab30
+:5294c000a26d
 *
 * Description:   Implementation of Video base playback view
 *
 */
-// Version : %version: 63 %
+// Version : %version: 66 %
 //  Include Files
 #include <aknViewAppUi.h>
 MPX_DEBUG(_L("CMPXVideoBasePlaybackView::HandleCommandL() EMPXPbvCmdClose"));
 //
 //  The display window must be removed before closing the playback plugin
 //
-if ( iDisplayHandler )
+RemoveBackgroundSurfaceL();
-{
-//
-//  Remove the display window so the surface can be released
-//
-iDisplayHandler->RemoveDisplayWindow();
-}
 CreateGeneralPlaybackCommandL( EPbCmdClose );
 break;
 }
 case EMPXPbvCmdSeekForward:
 }
 case EMPXPbvCmdShowFileDetails:
 {
 if ( AknLayoutUtils::PenEnabled() )
 {
-iContainer->HandleEventL(EMPXControlCmdShowFileDetailsViewer);
+iContainer->HandleEventL( EMPXControlCmdShowFileDetailsViewer );
 }
 else
 {
 ShowFileDetailsDialogL();
 }
 break;
 }
 case KMpxVideoPlaybackPdlReloading:
 {
 iPdlReloading = ETrue;
+break;
+}
+case EMPXPbvCmdRealOneBitmapTimeout:
+{
+HandleRealOneBitmapTimeoutL();
 break;
 }
 }
 }
 //  Observe the View Framework when the view is active
 //
 iViewUtility->AddObserverL( this );
 //
-//  Create Video Playback Display Handler
-//
-iDisplayHandler = CMPXVideoPlaybackDisplayHandler::NewL( iPlaybackUtility );
-//
 //  Disable tool bar in playback view
 //
 AppUi()->CurrentFixedToolbar()->SetToolbarVisibility( EFalse );
 if ( ! iContainer )
 iContainer = CMPXVideoPlaybackContainer::NewL( this );
 AppUi()->AddToStackL( *this, iContainer );
 iContainer->GetWindow().SetVisible( ETrue );
-}
+//
-// Deactivate the CBA set the LSK&RSK to empty
+//  Create Video Playback Display Handler
-Cba()->SetCommandSetL(R_AVKON_SOFTKEYS_EMPTY);
+//
+iDisplayHandler = CMPXVideoPlaybackDisplayHandler::NewL( iPlaybackUtility, iContainer );
+//
+//  Delay the adding of the display window while the Real One Bitmap is being shown
+//
+if ( ! iContainer->IsRealOneBitmapTimerActive() )
+{
+//
+//  Setup the display window
+//
+iDisplayHandler->CreateDisplayWindowL( *(CCoeEnv::Static()->ScreenDevice()),
+iContainer->GetWindow() );
+}
+}
+//
+//  Deactivate the CBA set the LSK & RSK to empty
+//
+Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_EMPTY );
 //
 //  Determine if the playback is from a playlist on view activation
 //
 MMPXSource* s = iPlaybackUtility->Source();
 TMPXVideoPlaybackCommand videoCmd = EPbCmdHandleBackground;
 if ( aForeground )
 {
 videoCmd = EPbCmdHandleForeground;
-iContainer->HandleEventL(EMPXControlCmdHandleForegroundEvent);
+iContainer->HandleEventL( EMPXControlCmdHandleForegroundEvent );
 }
 else
 {
-iContainer->HandleEventL(EMPXControlCmdHandleBackgroundEvent);
+iContainer->HandleEventL( EMPXControlCmdHandleBackgroundEvent );
 }
 //
 //  create command to pass to playback plugin
 //
 {
 HandleVideoPlaybackMessage( aMessage );
 }
 else if ( KMPXMediaIdVideoDisplaySyncMessage == id )
 {
-if ( iDisplayHandler )
+iDisplayHandler->HandleVideoDisplaySyncMessageL( aMessage );
-{
-TMPXVideoDisplayCommand cmdId = iDisplayHandler->HandleVideoDisplayMessageL( aMessage );
-if ( cmdId == EPbMsgVideoSurfaceCreated )
-{
-//
-//  Notify container that surface has been created to make window transparent
-//
-if ( iContainer )
-{
-iContainer->HandleCommandL( EMPXPbvSurfaceCreated );
-}
-}
-}
-//
-//  Signal Sync Message handling is complete
-//
-iPlaybackUtility->CommandL( EPbCmdSyncMsgComplete );
 }
 }
 // -------------------------------------------------------------------------------------------------
 //   CMPXVideoBasePlaybackView::HandleGeneralPlaybackMessageL()
 {
 TInt event( *aMessage->Value<TInt>( KMPXMessageGeneralEvent ) );
 TInt type( *aMessage->Value<TInt>( KMPXMessageGeneralType ) );
 TInt data( *aMessage->Value<TInt>( KMPXMessageGeneralData ) );
-MPX_DEBUG(
+MPX_ENTER_EXIT(_L("CMPXVideoBasePlaybackView::HandleGeneralPlaybackMessageL()"),
-_L("CMPXVideoBasePlaybackView::HandleGeneralPlaybackMessageL() event = %d type = %d  value = %d"),
+_L("event = %d type = %d  value = %d"), event, type, data );
-event, type, data );
 switch ( event )
 {
 case TMPXPlaybackMessage::EStateChanged:
 {
 break;
 }
 case TMPXPlaybackMessage::EPropertyChanged:
 {
-TMPXPlaybackProperty property(
+TMPXPlaybackProperty property( static_cast<TMPXPlaybackProperty>( type ) );
-static_cast<TMPXPlaybackProperty>( type ) );
 HandlePropertyL( property, data, KErrNone );
 break;
 }
 case TMPXPlaybackMessage::EDownloadPositionChanged:
 {
 HandlePdlStateChangeL( data );
 break;
 }
-case TMPXPlaybackMessage::ECommandReceived:
-{
-break;
-}
 case TMPXPlaybackMessage::EReachedEndOfPlaylist:
 {
 HandleCommandL( EAknSoftkeyBack );
-break;
-}
-case TMPXPlaybackMessage::ESongChanged:
-{
 break;
 }
 }
 }
 {
 MPX_ENTER_EXIT(_L("CMPXVideoBasePlaybackView::HandleClosePlaybackViewL()"));
 if ( IsMultiItemPlaylist() )
 {
-if ( iDisplayHandler )
+RemoveBackgroundSurfaceL();
-{
-//
-//  Remove the display window so the surface can be released
-//
-iDisplayHandler->RemoveDisplayWindow();
-}
 iPlaybackUtility->CommandL( EPbCmdNext );
 }
 else
 {
 switch ( aNewState )
 {
 case EPbStateInitialising:
 {
 //
-//  Get playlist information
+//  For multi item playlists, reset the container and controls for next
-//  Source if available once the plugin is initializing
+//  item in playlist
 //
-if ( iContainer )
+if ( IsMultiItemPlaylist() && iContainer )
 {
 //
 //  If transitioning from Not Initialized to Initialising there is
 //  no need to update the playback information that was gathered
 //  when the container was created
 //
 if ( oldState != EPbStateNotInitialised )
 {
 iMediaRequested = EFalse;
 iContainer->HandleCommandL( EMPXPbvCmdResetControls );
+//
+//  Delay the adding of the display window while the Real One Bitmap
+//  is being shown
+//
+if ( ! iContainer->IsRealOneBitmapTimerActive() && iDisplayHandler )
+{
+//
+//  Setup the display window since it was destroyed to free the surface
+//
+iDisplayHandler->CreateDisplayWindowL(
+*(CCoeEnv::Static()->ScreenDevice()),
+iContainer->GetWindow() );
+}
 if ( iFileDetails )
 {
 if ( iFileDetailsDialog )
 {
 {
 MPX_ENTER_EXIT( _L("CMPXVideoBasePlaybackView::DoHandleErrorPlaybackMessageL()"),
 _L("aError = %d"), aError );
 iContainer->HandleCommandL( EMPXPbvCmdResetControls );
-HandlePluginErrorL(aError);
+HandlePluginErrorL( aError );
 }
 // -------------------------------------------------------------------------------------------------
 // CMPXVideoBasePlaybackView::HandlePlaybackCommandComplete()
 // -------------------------------------------------------------------------------------------------
 TReal displayAspectRatio = (TReal32)displayRect.Width() / (TReal32)displayRect.Height();
 TInt newAspectRatio = iDisplayHandler->SetDefaultAspectRatioL( iFileDetails,
 displayAspectRatio );
-//
-//  Setup the display window and issue play command
-//
-iDisplayHandler->CreateDisplayWindowL( *(CCoeEnv::Static()->ScreenDevice()),
-iContainer->GetWindow() );
 iContainer->HandleEventL( EMPXControlCmdSetAspectRatio, newAspectRatio );
 }
-CreateGeneralPlaybackCommandL( EPbCmdPlay );
+//
+//  Delay the play command while the Real One Bitmap is being shown
+//
+if ( iContainer->IsRealOneBitmapTimerActive() )
+{
+iRealOneDelayedPlay = ETrue;
+}
+else
+{
+CreateGeneralPlaybackCommandL( EPbCmdPlay );
+}
 }
 }
 // -------------------------------------------------------------------------------------------------
 //   CMPXVideoBasePlaybackView::UpdatePbPluginMedia()
 {
 //
 //  set attributes on the command
 //
 aCmd->SetTObjectValueL<TBool>( KMPXCommandGeneralDoSync, ETrue );
 aCmd->SetTObjectValueL<TInt>( KMPXCommandGeneralId, KMPXMediaIdVideoPlayback );
 aCmd->SetTObjectValueL<TMPXVideoPlaybackCommand>( KMPXMediaVideoPlaybackCommand,
 EPbCmdInitView );
 iPlaybackUtility->CommandL( *aCmd );
 }
 //
 //  Hide controls and window since view will be deactivated.
 //  This prevents black boxes on the view switching
 //
 iContainer->HandleEventL( EMPXControlCmdHideControls );
-iContainer->GetWindow().SetVisible( EFalse );
 }
 else
 {
 CloseEmbeddedPlaybackViewL();
 }
 iFileDetailsDialog = CMPFileDetailsDialog::NewL();
 CMPFileDetails* fileDetailsDialogParams = new (ELeave) CMPFileDetails();
 CleanupStack::PushL( fileDetailsDialogParams );
-if ( iFileDetails->iClipName )
+HBufC* fileName = iFileDetails->GenerateFileNameL();
-{
-fileDetailsDialogParams->iFileName = iFileDetails->iClipName->AllocL();
+if ( fileName && fileName->Length() )
-}
+{
+fileDetailsDialogParams->iFileName = fileName;
-if ( iFileDetails->iTitle )
+}
+if ( iFileDetails->iTitle && iFileDetails->iTitle->Length() )
 {
 fileDetailsDialogParams->iTitle = iFileDetails->iTitle->AllocL();
 }
-if ( iFileDetails->iArtist )
+if ( iFileDetails->iArtist && iFileDetails->iArtist->Length() )
 {
 fileDetailsDialogParams->iArtist = iFileDetails->iArtist->AllocL();
 }
-if ( iFileDetails->iMimeType )
+if ( iFileDetails->iMimeType && iFileDetails->iMimeType->Length() )
 {
 fileDetailsDialogParams->iFormat = iFileDetails->iMimeType->AllocL();
 }
-fileDetailsDialogParams->iResolutionHeight = iFileDetails->iVideoHeight;
+if ( iFileDetails->iVideoHeight && iFileDetails->iVideoWidth )
-fileDetailsDialogParams->iResolutionWidth = iFileDetails->iVideoWidth;
+{
-fileDetailsDialogParams->iDurationInSeconds = iFileDetails->iDuration / KPbMilliMultiplier;
+fileDetailsDialogParams->iResolutionHeight = iFileDetails->iVideoHeight;
-fileDetailsDialogParams->iBitrate = iFileDetails->iBitRate;
+fileDetailsDialogParams->iResolutionWidth = iFileDetails->iVideoWidth;
+}
+if ( iFileDetails->iDuration > 0 )
+{
+fileDetailsDialogParams->iDurationInSeconds = iFileDetails->iDuration / KPbMilliMultiplier;
+}
+if (iFileDetails->iBitRate > 0 )
+{
+fileDetailsDialogParams->iBitrate = iFileDetails->iBitRate;
+}
 if ( iFileDetails->iDrmProtected )
 {
 fileDetailsDialogParams->iDrmProtected = iFileDetails->iDrmProtected;
 fileDetailsDialogParams->iFilePath = iFileDetails->iClipName->AllocL();
 return openError;
 }
 #endif // SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API
+// -------------------------------------------------------------------------------------------------
+//   CMPXVideoBasePlaybackView::RemoveBackgroundSurfaceL()
+// -------------------------------------------------------------------------------------------------
+//
+void CMPXVideoBasePlaybackView::RemoveBackgroundSurfaceL()
+{
+MPX_ENTER_EXIT(_L("CMPXVideoBasePlaybackView::RemoveBackgroundSurfaceL()"));
+if ( iDisplayHandler )
+{
+//
+//  Remove the display window so the surface can be released
+//
+iDisplayHandler->RemoveDisplayWindow();
+}
+}
+// -------------------------------------------------------------------------------------------------
+//   CMPXVideoBasePlaybackView::HandleRealOneBitmapTimeoutL()
+// -------------------------------------------------------------------------------------------------
+//
+void CMPXVideoBasePlaybackView::HandleRealOneBitmapTimeoutL()
+{
+MPX_ENTER_EXIT(_L("CMPXVideoBasePlaybackView::HandleRealOneBitmapTimeoutL()"));
+//
+//  Check if this clip has video
+//  If video exists, setup the display window
+//  If the video is not enabled, redraw container to remove Real One Bitmap
+//
+if ( iFileDetails && iFileDetails->iVideoEnabled )
+{
+if ( iDisplayHandler )
+{
+//
+//  Setup the display window
+//
+iDisplayHandler->CreateDisplayWindowL( *(CCoeEnv::Static()->ScreenDevice()),
+iContainer->GetWindow() );
+}
+}
+else
+{
+iContainer->DrawNow();
+}
+if ( iRealOneDelayedPlay )
+{
+CreateGeneralPlaybackCommandL( EPbCmdPlay );
+iRealOneDelayedPlay = EFalse;
+}
+}
 // EOF

branch	RCL_3
changeset 9	5294c000a26d
parent 8	ce5ada96ab30
child 10	112a725ff2c2