FCL/sf/app/jrt: comparison javauis/mmapi_qt/baseline/src.nga/cmmavideoplayer.cpp

equal deleted inserted replaced

-:98ccebc37403
+:dc7c549001d5
 self->ConstructL();
 return self;
 }
 CMMAVideoPlayer::~CMMAVideoPlayer()
 {
-LOG(EJavaMMAPI,EInfo, "MMA::CMMAVideoPlayer::~CMMAVideoPlayer" );
+LOG(EJavaMMAPI,EInfo, "MMA::CMMAVideoPlayer::~CMMAVideoPlayer");
 // Window is not able to send any
 // callback requests to UI from now.
 if (iSurfaceWindow)
 {
 iSurfaceWindow->SetDisplay(NULL);
 }
-if ( iDisplay && iDisplay->HasContainer() )
+if (iDisplay && iDisplay->HasContainer())
 {
 // Window will delete itself
 // after all pending events are processed
 // (lazy delete)
 //       iDisplay->UIGetCallback(
 //             *iSurfaceWindow, CMMASurfaceWindow::EDestroyWindow );
-iDisplay->GetCallbackInUiThread((TInt)CMMASurfaceWindow::EDestroyWindow );
+iDisplay->GetCallbackInUiThread((TInt)CMMASurfaceWindow::EDestroyWindow);
 }
 else
 {
 delete iSurfaceWindow;
 }
 EXPORT_C void CMMAVideoPlayer::SetDisplayL(MMMADisplay* aDisplay)
 {
 // now it is ready to draw
 iDisplay = aDisplay;
-		iDisplay->SetWindowL( iSurfaceWindow );
+iDisplay->SetWindowL(iSurfaceWindow);
-iSurfaceWindow->SetDisplay( aDisplay );
+iSurfaceWindow->SetDisplay(aDisplay);
 iDisplay->SetUIPlayer(this);
 /*
 // if state < prefeteched then we dont know actual source size yet
 // and it will be set after prefetch
 if ( iState >= EPrefetched )
 {
 SourceSizeChanged();
 }
 */
 }
 void CMMAVideoPlayer::RealizeL()
 {
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::RealizeL" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::RealizeL");
 // DataSource must have at least 1 stream or
 // we must have file to play
 if ((iSourceStreams.Count() == 0) && !iFileName)
 {
 User::Leave(KErrNotEnoughStreams);
 }
 }
 void CMMAVideoPlayer::PrefetchL()
 {
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::PrefetchL" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::PrefetchL");
 if (iFileName)
 {
 // File has already been prefetched when realizing
 // If initDisplayMode was called before prefetch,
 {
 SourceSizeChanged();
 }
 PostActionCompletedFile();
-ChangeState( EPrefetched );
+ChangeState(EPrefetched);
 }
 else
 {
 // Using TDes -- load the whole video
 iSourceStreams[ 0 ]->ReadAllL();
 // CMMASourceStream will notify with ReadCompleted
 }
 EXPORT_C void CMMAVideoPlayer::ReadCompletedL(TInt aStatus, const TDesC8& aData)
 {
-LOG1( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::ReadCompletedL: status = %d", aStatus );
+LOG1(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::ReadCompletedL: status = %d", aStatus);
 if (aStatus < KErrNone)
 {
 PostActionCompleted(aStatus);
 }
 else
 }
 }
 void CMMAVideoPlayer::HandleEvent(const TMMFEvent& aEvent)
 {
-LOG1( EJavaMMAPI, EInfo,  "MMA:CMMAVideoPlayer::HandleEvent %d", aEvent.iEventType.iUid );
+LOG1(EJavaMMAPI, EInfo,  "MMA:CMMAVideoPlayer::HandleEvent %d", aEvent.iEventType.iUid);
 // event KMMFEventCategoryPlaybackComplete is handled by both Video
 // and Audio players. first it should be handled by Video player
 if (aEvent.iEventType == KMMFEventCategoryPlaybackComplete)
 {
 iSurfaceWindow->RemoveSurface();
 {
 // free Surface
 TInt error = iVideoPlaySurfaceSupportCustomCommands.SurfaceRemoved(iMMASurface.iPrevSurfaceId);
 if (KErrNone != error)
 {
-	ELOG1( EJavaMMAPI, "CMMAVideoPlayer::HandleEvent:SurfaceRemoved error, %d", aEvent.iErrorCode);
+ELOG1(EJavaMMAPI, "CMMAVideoPlayer::HandleEvent:SurfaceRemoved error, %d", aEvent.iErrorCode);
 }
 }
 iMMASurface.iPrevSurfaceId = surfaceId;
 iMMASurface.iPrevSurfaceAvailable = ETrue;
 iSurfaceWindow->SetSurfaceParameters(surfaceId,
 cropRect,
 pixelAspectRatio);
-						LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: KMMFEventCategoryVideoSurfaceCreated, surface parameters set" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: KMMFEventCategoryVideoSurfaceCreated, surface parameters set");
 }
 else
 {
-		ELOG1( EJavaMMAPI,  "CMMAVideoPlayer::HandleEvent: error getting surface parameters, %d", aEvent.iErrorCode );
+ELOG1(EJavaMMAPI,  "CMMAVideoPlayer::HandleEvent: error getting surface parameters, %d", aEvent.iErrorCode);
 }
 }
 else if (aEvent.iEventType == KMMFEventCategoryVideoSurfaceParametersChanged)
 {
 if (aEvent.iErrorCode == KErrNone)
 {
 // free Surface
 TInt error = iVideoPlaySurfaceSupportCustomCommands.SurfaceRemoved(iMMASurface.iPrevSurfaceId);
 if (KErrNone != error)
 {
-	LOG1( EJavaMMAPI, EInfo, "CMMAVideoPlayer::HandleEvent:SurfaceRemoved error, %d", aEvent.iErrorCode);
+LOG1(EJavaMMAPI, EInfo, "CMMAVideoPlayer::HandleEvent:SurfaceRemoved error, %d", aEvent.iErrorCode);
 }
 }
 iMMASurface.iPrevSurfaceAvailable = ETrue;
 iMMASurface.iPrevSurfaceId = surfaceId;
 iSurfaceWindow->SetChangedSurfaceParameters(surfaceId,
 cropRect,
 pixelAspectRatio);
-						LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: KMMFEventCategoryVideoSurfaceParametersChanged" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: KMMFEventCategoryVideoSurfaceParametersChanged");
 }
 else
 {
-	ELOG1( EJavaMMAPI,  "CMMAVideoPlayer::HandleEvent: surface parameters changed error, %d", aEvent.iErrorCode );
+ELOG1(EJavaMMAPI,  "CMMAVideoPlayer::HandleEvent: surface parameters changed error, %d", aEvent.iErrorCode);
 }
 }
 else if (aEvent.iEventType == KMMFEventCategoryVideoRemoveSurface)
 {
-	  if (aEvent.iErrorCode == KErrNone)
+if (aEvent.iErrorCode == KErrNone)
 {
 if (iMMASurface.iPrevSurfaceAvailable)
 {
 // free Surface
 TInt error = iVideoPlaySurfaceSupportCustomCommands.SurfaceRemoved(iMMASurface.iPrevSurfaceId);
 if (KErrNone != error)
 {
-				  ELOG1( EJavaMMAPI,  "CMMAVideoPlayer::HandleEvent:SurfaceRemoved error, %d", aEvent.iErrorCode);
+ELOG1(EJavaMMAPI,  "CMMAVideoPlayer::HandleEvent:SurfaceRemoved error, %d", aEvent.iErrorCode);
 }
 iMMASurface.iPrevSurfaceAvailable = EFalse;
 }
 }
 else
 {
-ELOG1( EJavaMMAPI, "CMMAVideoPlayer::HandleEvent:KMMFEventCategoryVideoRemoveSurface error, %d", aEvent.iErrorCode);
+ELOG1(EJavaMMAPI, "CMMAVideoPlayer::HandleEvent:KMMFEventCategoryVideoRemoveSurface error, %d", aEvent.iErrorCode);
 }
 }
 // video opened, preparing
 else if (aEvent.iEventType == KMMFEventCategoryVideoOpenComplete)
 {
 if (aEvent.iErrorCode == KErrNone)
 {
 TInt error = iVideoPlaySurfaceSupportCustomCommands.UseSurfaces();
-				ELOG1( EJavaMMAPI,  "MMA::CMMAVideoPlayer::HandleEvent::After UseSurfaces(), error = %d", error );
+ELOG1(EJavaMMAPI,  "MMA::CMMAVideoPlayer::HandleEvent::After UseSurfaces(), error = %d", error);
 TInt prepareError(iVideoPlayControllerCustomCommands.Prepare());
 if (prepareError != KErrNone)
 {
 // opening failed, notifying java
 PostActionCompleted(prepareError);
 // locator is used, this callback is made in realized state. For
 // stream it is made in prefetched state.
 PrepareDisplay();
 if (iFileName)
 {
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: Using filename, change state to REALIZED" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: Using filename, change state to REALIZED");
 // If there is an error condition, then the player state is not
 // changed, which indicates the error condition to StartL when
 // the ActiveSchedulerWait returns. KNotCompleteVideoError is not
 // considered as an error condition, instead it indicates that some
 __ASSERT_DEBUG(iActiveSchedulerWait->IsStarted(), User::Invariant());
 iActiveSchedulerWait->AsyncStop();
 }
 else
 {
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: Not using filename, change state to PREFETCHED" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::HandleEvent: Not using filename, change state to PREFETCHED");
 CompletePrefetch(aEvent.iErrorCode);
 }
 }
 else            // in case of any other event
 {
 }
 }
 void CMMAVideoPlayer::CompletePrefetch(TInt aError)
 {
-ELOG1( EJavaMMAPI,  "CMMAVideoPlayer::CompletePrefetch + error = %d",aError);
+ELOG1(EJavaMMAPI,  "CMMAVideoPlayer::CompletePrefetch + error = %d",aError);
 // Post KNotCompleteVideoError as KErrNone to the Java side, because
 // video can be played.
 if (aError == KNotCompleteVideoError)
 {
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::CompletePrefetch  KNotCompleteVideoError ");
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::CompletePrefetch  KNotCompleteVideoError ");
 // release java
 PostActionCompleted(KErrNone);
 }
 else
 {
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::CompletePrefetch  CompleteVideoError ");
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::CompletePrefetch  CompleteVideoError ");
 // release java
 PostActionCompleted(aError);
 }
 if (aError == KErrNone || aError == KNotCompleteVideoError)
 {
 ChangeState(EPrefetched);
 }
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::CompletePrefetch - ");
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::CompletePrefetch - ");
 }
 void CMMAVideoPlayer::PrepareDisplay()
 {
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::PrepareDisplay +" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::PrepareDisplay +");
 // construction should have leaved if iSurfaceWindow does not exist
 __ASSERT_DEBUG(iSurfaceWindow,
 User::Panic(_L("CMMVideoPlayer::iSurfaceWindow is null"),
 KErrArgument));
 //First place where we are certain that source size can be fetched
 TSize sourceSize;
 TInt err = iVideoControllerCustomCommands.GetVideoFrameSize(sourceSize);
-ELOG1( EJavaMMAPI,  "MID::CMMAVideoPlayer::PrepareDisplay: GetVideoFrameSize err = %d", err );
+ELOG1(EJavaMMAPI,  "MID::CMMAVideoPlayer::PrepareDisplay: GetVideoFrameSize err = %d", err);
 // Still we did not get the size of video
 if ((err != KErrNone) ||
 (sourceSize.iWidth <= 0) ||
 (sourceSize.iHeight <= 0))
 {
-LOG( EJavaMMAPI, EInfo,  "MID::CMMAVideoPlayer::PrepareDisplay: No sourcesize found, using SurfaceWindow size" );
+LOG(EJavaMMAPI, EInfo,  "MID::CMMAVideoPlayer::PrepareDisplay: No sourcesize found, using SurfaceWindow size");
 // setting size to window size (client rect)
 sourceSize = iSurfaceWindow->WindowSize();
 }
 // If 1x1 was got (the default size of form), it must be replaced
 // with a valid size as controller will not accept 1x1.
 if ((sourceSize.iWidth < KMMAVideoMinDimension) ||
 (sourceSize.iHeight < KMMAVideoMinDimension))
 {
-LOG( EJavaMMAPI, EInfo,  "MID::CMMAVideoPlayer::PrepareDisplay: Unacceptable source size, using failsafe" );
+LOG(EJavaMMAPI, EInfo,  "MID::CMMAVideoPlayer::PrepareDisplay: Unacceptable source size, using failsafe");
 // This is a special case and ought to be used only in
 // the rare case that real size is not got from stream.
 sourceSize = TSize(KMMAVideoMinDimension, KMMAVideoMinDimension);
 }
 iSourceSize = sourceSize;
 // If init has been already done
 if (iDisplay)
 {
-LOG( EJavaMMAPI, EInfo,  "MID::CMMAVideoPlayer::PrepareDisplay: display exists, changing source size" );
+LOG(EJavaMMAPI, EInfo,  "MID::CMMAVideoPlayer::PrepareDisplay: display exists, changing source size");
 SourceSizeChanged();
 }
 // Setting (in)visible if something has changed the DSA state
 // (e.g. prepare). If initDisplayMode is not called, this will always
 // set visibility to false.
 iSurfaceWindow->SetVisible(iSurfaceWindow->IsVisible(), EFalse);
-LOG( EJavaMMAPI, EInfo,  "CMMAVideoPlayer::PrepareDisplay -" );
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::PrepareDisplay -");
 }
 EXPORT_C const TDesC& CMMAVideoPlayer::Type()
 {
 return KMMAVideoPlayer;
 return this;
 }
 void CMMAVideoPlayer::SourceSizeChanged()
 {
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::SourceSizeChanged() +");
 iDisplay->SourceSizeChanged(iSourceSize);
+LOG(EJavaMMAPI, EInfo,  "CMMAVideoPlayer::SourceSizeChanged() -");
 NotifyWithStringEvent(CMMAPlayerEvent::ESizeChanged, KVideoControlName);
 }
 //  END OF FILE

changeset 26	dc7c549001d5
parent 23	98ccebc37403