# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268401405 -7200 # Node ID 6bc4220d7f67945d3c97591693ce89ad3daba143 # Parent bcdc0181a9f12a87841ea3740fda9b0dd04452f0 Revision: 201007 Kit: 201008 diff -r bcdc0181a9f1 -r 6bc4220d7f67 camappengine/Engine/Inc/CaeEngineImp.h --- a/camappengine/Engine/Inc/CaeEngineImp.h Fri Feb 19 22:59:30 2010 +0200 +++ b/camappengine/Engine/Inc/CaeEngineImp.h Fri Mar 12 15:43:25 2010 +0200 @@ -70,8 +70,6 @@ public MCameraObserver2 { - friend void CCaeCallbackActive::RunL(); - friend void CCaeCallbackActive::DoCancel(); public: // Construction and destruction diff -r bcdc0181a9f1 -r 6bc4220d7f67 camappengine/Engine/Src/CaeEngineImpVideoNameCustom.cpp --- a/camappengine/Engine/Src/CaeEngineImpVideoNameCustom.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camappengine/Engine/Src/CaeEngineImpVideoNameCustom.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -22,6 +22,10 @@ #include "CaeEngineImp.h" // For Camera Application Engine implementation. #include "CamCControllerCustomCommands.h" // For Camcorder plug-in custom commands and UId. #include // For MMF definitions (as TMMFFileConfig) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CaeEngineImpVideoNameCustomTraces.h" +#endif // ----------------------------------------------------------------------------- // CCaeEngineImp::ChangeVideoFileNameL @@ -29,6 +33,7 @@ // void CCaeEngineImp::ChangeVideoFileNameL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_CHANGE_VIDEO_FILE_NAME 1" ); LOGTEXT( _L( "Cae: CCaeEngineImp::ChangeVideoFileNameL() entering" ) ); if ( iVideoControllerUid == KCamCControllerImplementationUid ) @@ -37,18 +42,22 @@ // We know that the custom command is available with this specific implementation. TMMFFileConfig pckg; pckg().iPath = iVideoClipFileName->Des(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_CUSTOM_COMMAND 1" ); TInt err = iVideoRecorder->CustomCommandSync( TMMFMessageDestination( iVideoControllerUid, KMMFObjectHandleController ), ECamCControllerCCNewFilename, pckg, KNullDesC8 ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_CUSTOM_COMMAND 0" ); if (err) { LOGTEXT2( _L( "Cae: CCaeEngineImp::ChangeVideoFileNameL() CustomCommandSync failed err=%d, leaving" ), err ); User::Leave(err); } iPrepPars = EFalse; + OstTrace0( CAMERASRV_PERFORMANCE, DUP4_CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_VIDEORECORDER_PREPARE 1" ); iVideoRecorder->Prepare(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP5_CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_VIDEORECORDER_PREPARE 0" ); } else { @@ -59,14 +68,16 @@ iVideoOpened = ETrue; // This is always set to ETrue when // OpenFileL has been called to allow // freeing resources by CloseVideoRecording(). + OstTrace0( CAMERASRV_PERFORMANCE, DUP6_CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_VIDEORECORDER_OPENFILE 1" ); iVideoRecorder->OpenFileL( iVideoClipFileName->Des(), iCameraHandle, iVideoControllerUid, iVideoFormatUid, iVideoType->Des(), iVideoAudioType ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP7_CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_VIDEORECORDER_OPENFILE 0" ); } - + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_CHANGEVIDEOFILENAMEL, "e_CAM_CAE_CHANGE_VIDEO_FILE_NAME 0" ); LOGTEXT( _L( "Cae: CCaeEngineImp::ChangeVideoFileNameL() returning" ) ); } diff -r bcdc0181a9f1 -r 6bc4220d7f67 camappengine/Engine/Src/CaeEngineImpVideoRecording.cpp --- a/camappengine/Engine/Src/CaeEngineImpVideoRecording.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camappengine/Engine/Src/CaeEngineImpVideoRecording.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -31,6 +31,10 @@ #include "CaeEngineImpTestErrors.h" // For TEST_VERSION compilation only #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CaeEngineImpVideoRecordingTraces.h" +#endif // ============================ MEMBER FUNCTIONS =============================== @@ -42,6 +46,7 @@ // void CCaeEngineImp::InitVideoRecorderL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_INITVIDEORECORDERL, "e_CAM_CAE_INITVIDEORECORDER 1" ); LOGTEXT( _L( "Cae: CCaeEngineImp::InitVideoRecorderL() entering" ) ); iVideoInitialized = EFalse; @@ -94,6 +99,7 @@ iVideoInitialized = ETrue; LOGTEXT( _L( "Cae: CCaeEngineImp::InitVideoRecorderL() returning" ) ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_INITVIDEORECORDERL, "e_CAM_CAE_INITVIDEORECORDER 0" ); } @@ -210,6 +216,7 @@ const TDesC8& aVideoType, const TDesC8& aAudioType ) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_PREPAREVIDEORECORDINGL, "e_CAM_CAE_PREPAREVIDEORECORDING 1" ); LOGTEXT3( _L( "Cae: CCaeEngineImp::PrepareVideoRecordingL() entering aFrameSize wxh=%dx%d" ), aFrameSize.iWidth, aFrameSize.iHeight ); @@ -257,14 +264,17 @@ iVideoOpened = ETrue; // This is always set to ETrue when // OpenFileL has been called to allow // freeing resources by CloseVideoRecording(). + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_PREPAREVIDEORECORDINGL, "e_CAM_CAE_VIDEORECORDER_OPENFILE 1" ); iVideoRecorder->OpenFileL( iVideoClipFileName->Des(), iCameraHandle, iVideoControllerUid, iVideoFormatUid, iVideoType->Des(), iVideoAudioType ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_PREPAREVIDEORECORDINGL, "e_CAM_CAE_VIDEORECORDER_OPENFILE 0" ); LOGTEXT( _L( "Cae: CCaeEngineImp::PrepareVideoRecordingL() returning" ) ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_PREPAREVIDEORECORDINGL, "e_CAM_CAE_PREPAREVIDEORECORDING 0" ); } @@ -274,6 +284,7 @@ // void CCaeEngineImp::CloseVideoRecording() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_CLOSEVIDEORECORDING, "e_CAM_CAE_CLOSEVIDEORECORDING 1" ); LOGTEXT( _L( "Cae: CCaeEngineImp::CloseVideoRecording() entering" ) ); if ( iVideoPrepared ) @@ -284,11 +295,14 @@ if ( iVideoOpened ) { + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_CLOSEVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_CLOSE 1" ); iVideoRecorder->Close(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_CLOSEVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_CLOSE 0" ); iVideoOpened = EFalse; } LOGTEXT( _L( "Cae: CCaeEngineImp::CloseVideoRecording() returning" ) ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_CLOSEVIDEORECORDING, "e_CAM_CAE_CLOSEVIDEORECORDING 0" ); } @@ -396,7 +410,9 @@ { iPrepPars = ETrue; iVideoRecorder->SetMaxClipSizeL( iMaxClipSizeInBytesPrep ); + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_SETVIDEOCLIPMAXSIZEL, "e_CAM_CAE_VIDEORECORDER_PREPARE 1" ); iVideoRecorder->Prepare(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_SETVIDEOCLIPMAXSIZEL, "e_CAM_CAE_VIDEORECORDER_PREPARE 0" ); } LOGTEXT( _L( "Cae: CCaeEngineImp::SetVideoClipMaxSizeL() returning" ) ); @@ -440,7 +456,9 @@ iVideoAudioEnabledPrep = aAudioEnabled; iVideoRecorder->SetAudioEnabledL( iVideoAudioEnabledPrep ); iPrepPars = ETrue; + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_SETVIDEOAUDIOL, "e_CAM_CAE_VIDEORECORDER_PREPARE 1" ); iVideoRecorder->Prepare(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_SETVIDEOAUDIOL, "e_CAM_CAE_VIDEORECORDER_PREPARE 0" ); LOGTEXT( _L( "Cae: CCaeEngineImp::SetVideoAudioL() returning" ) ); } @@ -524,6 +542,7 @@ // void CCaeEngineImp::StartVideoRecording() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_STARTVIDEORECORDING, "e_CAM_CAE_STARTVIDEORECORDING 1" ); LOGTEXT( _L( "Cae: CCaeEngineImp::StartVideoRecording() entering" ) ); TInt error( KErrNone ); @@ -538,7 +557,9 @@ iPrevTimeRemaining = 0; // Start video recording. + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_STARTVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_RECORD 1" ); iVideoRecorder->Record(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_STARTVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_RECORD 0" ); if ( iVideoTimesInterval > TTimeIntervalMicroSeconds32( 0 ) ) { // Start generating video recording time information for the client. @@ -553,9 +574,12 @@ } + OstTrace0( CAMERASRV_PERFORMANCE, DUP4_CCAEENGINEIMP_STARTVIDEORECORDING, "e_CAM_CAE_MCAEOVIDEORECORDINGON 1" ); iCaeObserver->McaeoVideoRecordingOn( error ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP5_CCAEENGINEIMP_STARTVIDEORECORDING, "e_CAM_CAE_MCAEOVIDEORECORDINGON 0" ); LOGTEXT( _L( "Cae: CCaeEngineImp::StartVideoRecording() returning" ) ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_STARTVIDEORECORDING, "e_CAM_CAE_STARTVIDEORECORDING 0" ); } @@ -570,6 +594,7 @@ // void CCaeEngineImp::StopVideoRecording() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_STOPVIDEORECORDING 1" ); LOGTEXT( _L( "Cae: CCaeEngineImp::StopVideoRecording() entering" ) ); TInt stoppingError( KErrNone ); @@ -596,21 +621,29 @@ if ( iAsyncVideoStopEnabled ) { LOGTEXT( _L( "Cae: CCaeEngineImp::StopVideoRecording(). using custom command ECamCControllerCCVideoStopAsync" )); + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP_ASYNC 1" ); asyncStopErr = iVideoRecorder->CustomCommandSync( TMMFMessageDestination( iVideoControllerUid, KMMFObjectHandleController ), ECamCControllerCCVideoStopAsync, KNullDesC8, KNullDesC8 ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP_ASYNC 0" ); if ( asyncStopErr ) // async stop was not supported, use sync stop { LOGTEXT2( _L( "Cae: CCaeEngineImp::StopVideoRecording(). async stop err=%d, using sync stop" ), asyncStopErr); + OstTrace0( CAMERASRV_PERFORMANCE, DUP4_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP 1" ); stoppingError = iVideoRecorder->Stop(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP5_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP 0" ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP8_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_MCAEOVIDEORECORDINGSTOPPED 1" ); iCaeObserver->McaeoVideoRecordingStopped(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP9_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_MCAEOVIDEORECORDINGSTOPPED 0" ); } } else { // Synchronous, quaranteed that video recording is stopped when returning. + OstTrace0( CAMERASRV_PERFORMANCE, DUP6_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP 1" ); stoppingError = iVideoRecorder->Stop(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP7_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP 0" ); } // Can't be paused anymore. @@ -659,11 +692,14 @@ if ( !iAsyncVideoStopEnabled || asyncStopErr ) { + OstTrace0( CAMERASRV_PERFORMANCE, DUP10_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_MCAEOVIDEORECORDINGCOMPLETE 1" ); iCaeObserver->McaeoVideoRecordingComplete( stoppingError ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP11_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_MCAEOVIDEORECORDINGCOMPLETE 0" ); } LOGTEXT( _L( "Cae: CCaeEngineImp::StopVideoRecording() returning" ) ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_STOPVIDEORECORDING, "e_CAM_CAE_STOPVIDEORECORDING 0" ); } @@ -727,7 +763,9 @@ if ( iVideoRecordingRunning && iVideoRecordingPaused ) { // Start video recording. + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_RESUMEVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_RECORD 1" ); iVideoRecorder->Record(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_RESUMEVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_RECORD 0" ); iVideoRecordingPaused = EFalse; if ( iVideoTimesInterval > TTimeIntervalMicroSeconds32( 0 ) ) { @@ -792,6 +830,7 @@ const TDesC8& aVideoType, const TDesC8& aAudioType ) { + OstTrace0( CAMERASRV_PERFORMANCE, DUP4_CCAEENGINEIMP_PREPAREVIDEORECORDINGL, "e_CAM_CAE_PREPAREVIDEORECORDINGL 1" ); // Memorize video audio bit rate value to be prepared. iVideoAudioBitRatePrep = aAudioBitRate; // Force audio bit rate preparation. @@ -808,6 +847,7 @@ aPreferredSupplier, aVideoType, aAudioType ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP5_CCAEENGINEIMP_PREPAREVIDEORECORDINGL, "e_CAM_CAE_PREPAREVIDEORECORDINGL 0" ); } @@ -837,12 +877,16 @@ TRAP( aError, PrepareVideoSettingsL() ); if ( aError != KErrNone ) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_MVRUOOPENCOMPLETE, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 1" ); iCaeObserver->McaeoVideoPrepareComplete( aError ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_MVRUOOPENCOMPLETE, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 0" ); } } else { + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_MVRUOOPENCOMPLETE, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 1" ); iCaeObserver->McaeoVideoPrepareComplete( aError ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_MVRUOOPENCOMPLETE, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 0" ); } LOGTEXT( _L( "Cae: CCaeEngineImp::MvruoOpenComplete() returning" ) ); @@ -896,7 +940,9 @@ } } + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_MVRUOPREPARECOMPLETE, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 1" ); iCaeObserver->McaeoVideoPrepareComplete( aError ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_MVRUOPREPARECOMPLETE, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 0" ); LOGTEXT( _L( "Cae: CCaeEngineImp::MvruoPrepareComplete() returning" ) ); } @@ -942,9 +988,13 @@ // In async stop mode call also the other call-back to play stop sound if ( iAsyncVideoStopEnabled ) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_MVRUORECORDCOMPLETE, "e_CAM_CAE_MCAEOVIDEORECORDINGSTOPPED 1" ); iCaeObserver->McaeoVideoRecordingStopped(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_MVRUORECORDCOMPLETE, "e_CAM_CAE_MCAEOVIDEORECORDINGSTOPPED 0" ); } + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_MVRUORECORDCOMPLETE, "e_CAM_CAE_MCAEOVIDEORECORDINGCOMPLETE 1" ); iCaeObserver->McaeoVideoRecordingComplete( aError ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_MVRUORECORDCOMPLETE, "e_CAM_CAE_MCAEOVIDEORECORDINGCOMPLETE 0" ); } LOGTEXT( _L( "Cae: CCaeEngineImp::MvruoRecordComplete() returning" ) ); @@ -964,17 +1014,23 @@ if ( aEvent.iEventType.iUid == KCamCControllerCCVideoRecordStopped.iUid ) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_MVRUOEVENT, "e_CAM_CAE_MCAEOVIDEORECORDINGSTOPPED 1" ); iCaeObserver->McaeoVideoRecordingStopped(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_MVRUOEVENT, "e_CAM_CAE_MCAEOVIDEORECORDINGSTOPPED 0" ); } else if ( aEvent.iEventType.iUid == KCamCControllerCCVideoFileComposed.iUid ) { + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_MVRUOEVENT, "e_CAM_CAE_MCAEOVIDEORECORDINGCOMPLETE 1" ); iCaeObserver->McaeoVideoRecordingComplete( aEvent.iErrorCode ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_MVRUOEVENT, "e_CAM_CAE_MCAEOVIDEORECORDINGCOMPLETE 0" ); } else { // Send others events as error to UI iVideoPrepared = EFalse; // mark that re-preparation is needed + OstTrace0( CAMERASRV_PERFORMANCE, DUP4_CCAEENGINEIMP_MVRUOEVENT, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 1" ); iCaeObserver->McaeoVideoPrepareComplete( aEvent.iErrorCode ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP5_CCAEENGINEIMP_MVRUOEVENT, "e_CAM_CAE_MCAEOVIDEOPREPARECOMPLETE 0" ); } LOGTEXT( _L( "Cae: CCaeEngineImp::MvruoEvent() returning" ) ); @@ -1004,7 +1060,9 @@ iPrevTimeRemaining = 0; // Stop video recording. Do not call McaeoVideoRecordingComplete() + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_CANCELVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP 1" ); (void) iVideoRecorder->Stop(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_CANCELVIDEORECORDING, "e_CAM_CAE_VIDEORECORDER_STOP 0" ); iVideoRecordingPaused = EFalse; } @@ -1019,6 +1077,7 @@ // void CCaeEngineImp::PrepareVideoSettingsL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAEENGINEIMP_PREPAREVIDEOSETTINGSL, "e_CAM_CAE_PREPAREVIDEOSETTINGS 1" ); LOGTEXT( _L( "Cae: CCaeEngineImp::PrepareVideoSettingsL() entering" ) ); #ifdef CAE_TEST_VERSION @@ -1047,9 +1106,12 @@ LOGTEXT2( _L( "Cae: CCaeEngineImp::PrepareVideoSettingsL() GainL set to %d" ), gain ); iPrepPars = ETrue; + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAEENGINEIMP_PREPAREVIDEOSETTINGSL, "e_CAM_CAE_VIDEORECORDER_PREPARE 1" ); iVideoRecorder->Prepare(); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAEENGINEIMP_PREPAREVIDEOSETTINGSL, "e_CAM_CAE_VIDEORECORDER_PREPARE 0" ); LOGTEXT( _L( "Cae: CCaeEngineImp::PrepareVideoSettingsL() returning" ) ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAEENGINEIMP_PREPAREVIDEOSETTINGSL, "e_CAM_CAE_PREPAREVIDEOSETTINGS 0" ); } diff -r bcdc0181a9f1 -r 6bc4220d7f67 camappengine/Engine/traces/OstTraceDefinitions.h --- a/camappengine/Engine/traces/OstTraceDefinitions.h Fri Feb 19 22:59:30 2010 +0200 +++ b/camappengine/Engine/traces/OstTraceDefinitions.h Fri Mar 12 15:43:25 2010 +0200 @@ -19,5 +19,5 @@ // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler // REMOVE BEFORE CHECK-IN TO VERSION CONTROL //#define OST_TRACE_COMPILER_IN_USE -#include +#include #endif diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/controller/Group/CamCController.mmp --- a/camcordermmfplugin/controller/Group/CamCController.mmp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/controller/Group/CamCController.mmp Fri Mar 12 15:43:25 2010 +0200 @@ -39,6 +39,7 @@ USERINCLUDE ../Inc USERINCLUDE ../../../inc // ADo level inc dir USERINCLUDE ../../mediarecorder/Inc +USERINCLUDE ../traces LIBRARY euser.lib LIBRARY mmfcontrollerframework.lib diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/controller/Src/CamCController.cpp --- a/camcordermmfplugin/controller/Src/CamCController.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/controller/Src/CamCController.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -40,6 +40,10 @@ #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CamCControllerTraces.h" +#endif // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -69,6 +73,7 @@ // CCamCController::~CCamCController() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_CCAMCCONTROLLER, "e_CCamCController::~CCamCController 1" ); PRINT((_L("CCamCController::~CCamCController enter "))); delete iMediaRecorder; @@ -95,6 +100,7 @@ delete iIdleStop; PRINT((_L("CCamCController::~CCamCController exit "))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_CCAMCCONTROLLER, "e_CCamCController::~CCamCController 0" ); } // ----------------------------------------------------------------------------- @@ -105,6 +111,7 @@ // void CCamCController::ConstructL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_CONSTRUCTL, "e_CCamCController::ConstructL 1" ); PRINT((_L("CCamCController::ConstructL() in"))); iMediaRecorder = NULL; @@ -149,6 +156,7 @@ iIdleStop = CIdle::NewL( CActive::EPriorityIdle ); PRINT((_L("CCamCController::ConstructL() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_CONSTRUCTL, "e_CCamCController::ConstructL 0" ); } // ----------------------------------------------------------------------------- @@ -275,10 +283,12 @@ // void CCamCController::PlayL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_PLAYL, "e_CCamCController::PlayL 1" ); PRINT((_L("CCamCController::PlayL() in"))); if ( iState == EStateRecording ) { + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_PLAYL, "e_CCamCController::PlayL 0" ); return; } @@ -329,6 +339,7 @@ } iState = EStateRecording; PRINT((_L("CCamCController::PlayL() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAMCCONTROLLER_PLAYL, "e_CCamCController::PlayL 0" ); } // ----------------------------------------------------------------------------- @@ -356,6 +367,7 @@ // void CCamCController::StopL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_STOPL, "e_CCamCController::StopL 1" ); PRINT((_L("CCamCController::StopL() in"))); if ( ( iState != EStateRecording ) && ( iState != EStatePaused ) ) @@ -424,6 +436,7 @@ } PRINT((_L("CCamCController::StopL() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_STOPL, "e_CCamCController::StopL 0" ); } // ----------------------------------------------------------------------------- @@ -507,6 +520,7 @@ // void CCamCController::CustomCommand( TMMFMessage& aMessage ) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_CUSTOMCOMMAND, "e_CCamCController::CustomCommand 1" ); PRINT((_L("CCamCController::CustomCommand() in"))); if ( aMessage.Destination().InterfaceId().iUid != KCamCUidControllerImplementation ) { @@ -544,6 +558,7 @@ } } PRINT((_L("CCamCController::CustomCommand() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_CUSTOMCOMMAND, "e_CCamCController::CustomCommand 0" ); } // ----------------------------------------------------------------------------- @@ -574,6 +589,7 @@ // void CCamCController::MmroPrepareComplete(TInt aError) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_MMROPREPARECOMPLETE, "e_CCamCController::MmroPrepareComplete 1" ); PRINT((_L("CCamCController::MmroPrepareComplete() error= %d "), aError)); if ( aError == KErrNone ) @@ -585,6 +601,7 @@ iMRPrepareCompleteSent = ETrue; DoSendEventToClient(TMMFEvent(KMMFEventCategoryVideoPrepareComplete, aError)); } + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_MMROPREPARECOMPLETE, "e_CCamCController::MmroPrepareComplete 0" ); } // ----------------------------------------------------------------------------- @@ -1197,6 +1214,7 @@ // void CCamCController::MvrcPrepareL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_MVRCPREPAREL, "e_CCamCController::MvrcPrepareL 1" ); PRINT((_L("CCamCController::MvrcPrepareL() in"))); if ( iState == EStatePrepared ) @@ -1256,6 +1274,7 @@ } PRINT((_L("CCamCController::MvrcPrepareL() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_MVRCPREPAREL, "e_CCamCController::MvrcPrepareL 0" ); } // ----------------------------------------------------------------------------- @@ -1401,6 +1420,7 @@ // void CCamCController::NewFilenameL( TMMFMessage& aMessage ) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_NEWFILENAMEL, "e_CCamCController::NewFilenameL 1" ); PRINT((_L("CCamCController::NewFilename() in"))); if ( iState == EStatePrepared ) @@ -1432,6 +1452,7 @@ iForceDataSinkFileName = ETrue; PRINT((_L("CCamCController::NewFilename() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_NEWFILENAMEL, "e_CCamCController::NewFilenameL 0" ); } // ----------------------------------------------------------------------------- @@ -1494,6 +1515,7 @@ // void CCamCController::DoIdleStop() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMCCONTROLLER_DOIDLESTOP, "e_CCamCController::DoIdleStop 1" ); PRINT((_L("CCamCController::DoIdleStop() in"))); TInt error = KErrNone; @@ -1520,6 +1542,7 @@ iFileComposerReady = EFalse; iAsyncStop = EFalse; PRINT((_L("CCamCController::DoIdleStop() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMCCONTROLLER_DOIDLESTOP, "e_CCamCController::DoIdleStop 0" ); } diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/controller/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/camcordermmfplugin/controller/traces/OstTraceDefinitions.h Fri Mar 12 15:43:25 2010 +0200 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: OstTraceDefinitions.h +* +*/ + +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp --- a/camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/filecomposer/Group/camc3GPDataSink.mmp Fri Mar 12 15:43:25 2010 +0200 @@ -32,7 +32,8 @@ USERINCLUDE ../Inc USERINCLUDE ../../mediarecorder/Inc -USERINCLUDE ../../../inc // ADo level inc dir +USERINCLUDE ../../../inc // ADo level inc dir +USERINCLUDE ../traces // Default system include paths for application layer modules. MW_LAYER_SYSTEMINCLUDE diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp --- a/camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/filecomposer/Src/CamC3GPDataSinkImp.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -39,6 +39,11 @@ #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CamC3GPDataSinkImpTraces.h" +#endif + // CONSTANTS const TUint KVideoAverageBitRate = 48000; // Default average bitrate for video const TUint KVideoMaxBitRate = 64000; // Default maximum bitrate for video @@ -96,6 +101,7 @@ // CCamC3GPDataSinkImp::~CCamC3GPDataSinkImp(void) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMC3GPDATASINKIMP_CCAMC3GPDATASINKIMP, "e_CCamC3GPDataSinkImp::~CCamC3GPDataSinkImp 1" ); PRINT(_L("CCamC3GPDataSinkImp::~CCamC3GPDataSinkImp enter")); if ( iFileName != KNullDesC ) @@ -139,6 +145,7 @@ delete iDeleteFileQueue; iDeleteFileQueue = 0; PRINT(_L("CCamC3GPDataSinkImp::~CCamC3GPDataSinkImp exit")); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMC3GPDATASINKIMP_CCAMC3GPDATASINKIMP, "e_CCamC3GPDataSinkImp::~CCamC3GPDataSinkImp 0" ); } @@ -150,6 +157,7 @@ // void CCamC3GPDataSinkImp::ConstructL(M3GPDataSinkObserver *aObserver) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMC3GPDATASINKIMP_CONSTRUCTL, "e_CCamC3GPDataSinkImp::ConstructL 1" ); PRINT(_L("CCamC3GPDataSinkImp::ConstructL enter")); iObserver = aObserver; @@ -209,6 +217,7 @@ iIdleDelete = CIdle::NewL( CActive::EPriorityIdle ); PRINT(_L("CCamC3GPDataSinkImp::ConstructL exit")); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMC3GPDATASINKIMP_CONSTRUCTL, "e_CCamC3GPDataSinkImp::ConstructL 0" ); } // ----------------------------------------------------------------------------- @@ -238,6 +247,7 @@ { MP4Err error; + OstTrace0( CAMERASRV_PERFORMANCE, CCAMC3GPDATASINKIMP_OPENFILEL, "e_CCamC3GPDataSinkImp::OpenFileL 1" ); PRINT((_L("CCamC3GPDataSinkImp::OpenFileL TFileName enter"))); if (iMP4Handle) @@ -261,6 +271,7 @@ iFileName = aFileName; TInt errorcode; + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAMC3GPDATASINKIMP_OPENFILEL, "e_CCamC3GPDataSinkImp::OpenFileL_create_temp_files 1" ); if (!iFS) // Don't allocate new file server, if there is one already { iFS = new (ELeave) RFs; @@ -350,6 +361,7 @@ } PRINT((_L("CCamC3GPDataSinkImp::OpenFileL Temp files cleared"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCAMC3GPDATASINKIMP_OPENFILEL, "e_CCamC3GPDataSinkImp::OpenFileL_create_temp_files 0" ); // Find used audio codec if ( ( aAudioCodecType == TFourCC(KCMRFourCCIdAMRNB) ) ) // AMR-NB @@ -729,6 +741,7 @@ } PRINT((_L("CCamC3GPDataSinkImp::OpenFileL exit"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMC3GPDATASINKIMP_OPENFILEL, "e_CCamC3GPDataSinkImp::OpenFileL 0" ); } @@ -989,10 +1002,12 @@ { MP4Err error; + OstTrace0( CAMERASRV_PERFORMANCE, CCAMC3GPDATASINKIMP_SINKSTOPL, "e_CCamC3GPDataSinkImp::SinkStopL 1" ); PRINT((_L("CCamC3GPDataSinkImp::SinkStopL enter"))); if (!iMP4Handle) { + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCAMC3GPDATASINKIMP_SINKSTOPL, "e_CCamC3GPDataSinkImp::SinkStopL 0" ); return; } @@ -1110,6 +1125,7 @@ } PRINT((_L("CCamC3GPDataSinkImp::SinkStopL exit"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMC3GPDATASINKIMP_SINKSTOPL, "e_CCamC3GPDataSinkImp::SinkStopL 0" ); } @@ -2214,6 +2230,7 @@ // void CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName( MP4FileName tempFileName ) { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMC3GPDATASINKIMP_M3GPMP4LIBDELETETEMPFILENAME, "e_CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName 1" ); PRINT((_L("CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName entering"))); MP4FileName* tempFileNamePtr = NULL; TInt result = KErrNoMemory; @@ -2254,6 +2271,7 @@ } PRINT((_L("CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName exiting"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMC3GPDATASINKIMP_M3GPMP4LIBDELETETEMPFILENAME, "e_CCamC3GPDataSinkImp::M3GPMP4LibDeleteTempFileName 0" ); } @@ -2273,6 +2291,7 @@ // TInt CCamC3GPDataSinkImp::DoIdleDelete() { + OstTrace0( CAMERASRV_PERFORMANCE, CCAMC3GPDATASINKIMP_DOIDLEDELETE, "e_CCamC3GPDataSinkImp::DoIdleDelete 1" ); PRINT((_L("CCamC3GPDataSinkImp::DoIdleDelete() in"))); TInt err = KErrNone; MP4FileName tempFileName; @@ -2304,6 +2323,7 @@ } PRINT((_L("CCamC3GPDataSinkImp::DoIdleDelete() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCAMC3GPDATASINKIMP_DOIDLEDELETE, "e_CCamC3GPDataSinkImp::DoIdleDelete 0" ); return ( filesLeft ); } diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/filecomposer/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/camcordermmfplugin/filecomposer/traces/OstTraceDefinitions.h Fri Mar 12 15:43:25 2010 +0200 @@ -0,0 +1,24 @@ +/* +* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: OstTraceDefinitions.h +* +*/ + +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/mediarecorder/Src/CCMRAudioInput.cpp --- a/camcordermmfplugin/mediarecorder/Src/CCMRAudioInput.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/mediarecorder/Src/CCMRAudioInput.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -45,6 +45,11 @@ #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CCMRAudioInputTraces.h" +#endif + // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -53,6 +58,7 @@ // CCMRAudioInput::~CCMRAudioInput() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRAUDIOINPUT_CCMRAUDIOINPUT, "e_CCMRAudioInput::~CCMRAudioInput 1" ); if ( iInputEmpty ) { @@ -106,6 +112,7 @@ { iMutexObj.Close(); } + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRAUDIOINPUT_CCMRAUDIOINPUT, "e_CCMRAudioInput::~CCMRAudioInput 0" ); } // ----------------------------------------------------------------------------- diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/mediarecorder/Src/CCMRAudioInputHW.cpp --- a/camcordermmfplugin/mediarecorder/Src/CCMRAudioInputHW.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/mediarecorder/Src/CCMRAudioInputHW.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -38,6 +38,11 @@ #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CCMRAudioInputHWTraces.h" +#endif + // ============================ MEMBER FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -60,6 +65,7 @@ // CCMRHWAudioInput::~CCMRHWAudioInput() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRHWAUDIOINPUT_CCMRHWAUDIOINPUT, "e_CCMRHWAudioInput::~CCMRHWAudioInput 1" ); // allocated bufs can be either in iInputEmpty, iInputFilled, iOutputFilled, or iOutputEmptied CMMFDataBuffer* tmp; TInt i = 0; @@ -110,6 +116,7 @@ } PRINT((_L("CCMRHWAudioInput::~CCMRHWAudioInput() deleted %d bufs from iOutputEmptied queue"), i )); } + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRHWAUDIOINPUT_CCMRHWAUDIOINPUT, "e_CCMRHWAudioInput::~CCMRHWAudioInput 0" ); } // ----------------------------------------------------------------------------- diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/mediarecorder/Src/CCMRAudioRecorder.cpp --- a/camcordermmfplugin/mediarecorder/Src/CCMRAudioRecorder.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/mediarecorder/Src/CCMRAudioRecorder.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -37,11 +37,16 @@ // Debug print macro #ifdef _DEBUG #include + #define PRINT(x) RDebug::Print x #else #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CCMRAudioRecorderTraces.h" +#endif @@ -68,6 +73,7 @@ // CCMRAudioRecorder::~CCMRAudioRecorder() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRAUDIORECORDER_CCMRAUDIORECORDER, "e_CCMRAudioRecorder::~CCMRAudioRecorder 1" ); PRINT((_L("CCMRAudioRecorder::~CCMRAudioRecorder() in"))); delete iThreadEventMonitor; @@ -88,6 +94,7 @@ iAudioCodecs = NULL; PRINT((_L("CCMRAudioRecorder::~CCMRAudioRecorder() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRAUDIORECORDER_CCMRAUDIORECORDER, "e_CCMRAudioRecorder::~CCMRAudioRecorder 0" ); } diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp --- a/camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/mediarecorder/Src/CCMRMDFVideoRecorder.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -46,11 +46,17 @@ // Debug print macro #ifdef _DEBUG #include + #define PRINT(x) RDebug::Print x; #else #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CCMRMDFVideoRecorderTraces.h" +#endif + // ============================= LOCAL FUNCTIONS =============================== // ----------------------------------------------------------------------------- @@ -227,6 +233,7 @@ // CCMRVideoRecorder::~CCMRVideoRecorder() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder 1" ); PRINT((_L("CCMRVideoRecorder::~CCMRVideoRecorder(), In"))); // This is the counterpart to NewL & OpenL, e.g. Close & Delete // free all memory allocated and uninitalize & delete objects created, e.g. DevVideoRecord @@ -242,8 +249,10 @@ iClockSource = NULL; // delete DevVideoRecord instance + OstTrace0( CAMERASRV_PERFORMANCE, DUP6_CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder_delete_DevVideoRec 1" ); delete iDevVideoRec; PRINT((_L("CCMRVideoRecorder::~CCMRVideoRecorder() devvideorec deleted"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP7_CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder_delete_DevVideoRec 0" ); iAvailableVideoFrameSizesRates.Close(); iAvailableVideoEncoders.Close(); @@ -254,6 +263,7 @@ delete iVideoCodecData; iVideoCodecData = NULL; + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder_delete_SourceFifo 1" ); // empty the source fifo, just in case once more; this should be done a) by encoder and b) by MdvroStreamEnd() MFrameBuffer* cbuffer; if ( iSourceFifo ) @@ -267,6 +277,8 @@ delete iSourceFifo; iSourceFifo = NULL; } + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder_delete_SourceFifo 0" ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP4_CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder_delete_CodingFifo 1" ); TVideoPicture* picture; if ( iCodingFifo ) { @@ -280,6 +292,7 @@ delete iCodingFifo; iCodingFifo = NULL; } + OstTrace0( CAMERASRV_PERFORMANCE, DUP5_CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder_delete_CodingFifo 0" ); PRINT((_L("CCMRVideoRecorder::~CCMRVideoRecorder() fifos deleted"))); if ( iDecSpecInfo ) @@ -314,6 +327,7 @@ SetState(EStateNone); PRINT((_L("CCMRVideoRecorder::~CCMRVideoRecorder(), Out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRVIDEORECORDER_CCMRVIDEORECORDER, "e_CCMRVideoRecorder::~CCMRVideoRecorder 0" ); } diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/mediarecorder/Src/CCMRMediaRecorderImp.cpp --- a/camcordermmfplugin/mediarecorder/Src/CCMRMediaRecorderImp.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/mediarecorder/Src/CCMRMediaRecorderImp.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -42,6 +42,11 @@ #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CCMRMediaRecorderImpTraces.h" +#endif + // ================= MEMBER FUNCTIONS ======================= @@ -93,13 +98,14 @@ // void CCMRMediaRecorderImp::ConstructL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRMEDIARECORDERIMP_CONSTRUCTL, "e_CCMRMediaRecorderImp::ConstructL 1" ); iState = EStateNone; // create video recorder iVideoRecorder = CCMRVideoRecorderClient::NewL(); // create audio recorder iAudioRecorder = CCMRAudioRecorder::NewL(); - + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRMEDIARECORDERIMP_CONSTRUCTL, "e_CCMRMediaRecorderImp::ConstructL 0" ); } // ----------------------------------------------------------------------------- @@ -109,6 +115,7 @@ // CCMRMediaRecorderImp::~CCMRMediaRecorderImp() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp 1" ); PRINT((_L("CCMRMediaRecorderImp::~CCMRMediaRecorderImp() in"))); // note, adding "this->" below disabled a PC Lint warning since it makes State explicitly to refer to this class if ( (this->State() == EStateRecording) || (this->State() == EStatePaused) ) @@ -130,14 +137,22 @@ iAudioSource = NULL; + OstTrace0( CAMERASRV_PERFORMANCE, DUP2_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_AudioRecorder 1" ); delete iAudioRecorder; + OstTrace0( CAMERASRV_PERFORMANCE, DUP3_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_AudioRecorder 0" ); PRINT((_L("CCMRMediaRecorderImp::~CCMRMediaRecorderImp() iAudioRecorder deleted"))); delete iPerfMonitor; delete iConfig; + OstTrace0( CAMERASRV_PERFORMANCE, DUP4_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_VideoRecorder 1" ); delete iVideoRecorder; + OstTrace0( CAMERASRV_PERFORMANCE, DUP5_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_VideoRecorder 0" ); PRINT((_L("CCMRMediaRecorderImp::~CCMRMediaRecorderImp() iVideoRecorder deleted"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP6_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_AudioOutput 1" ); delete iAudioOutput; + OstTrace0( CAMERASRV_PERFORMANCE, DUP7_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_AudioOutput 0" ); + OstTrace0( CAMERASRV_PERFORMANCE, DUP8_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_VideoOutput 1" ); delete iVideoOutput; + OstTrace0( CAMERASRV_PERFORMANCE, DUP9_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp_delete_VideoOutput 0" ); if ( iErrorReporter ) { @@ -146,6 +161,7 @@ } PRINT((_L("CCMRMediaRecorderImp::~CCMRMediaRecorderImp() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRMEDIARECORDERIMP_CCMRMEDIARECORDERIMP, "e_CCMRMediaRecorderImp::~CCMRMediaRecorderImp 0" ); //#pragma attol insert _ATCPQ_DUMP(0); } @@ -162,6 +178,7 @@ TFourCC aAudioType) { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRMEDIARECORDERIMP_OPENL, "e_CCMRMediaRecorderImp::OpenL 1" ); PRINT((_L("CCMRMediaRecorderImp::OpenL() in, thread id %x"),TInt(RThread().Id()))); if ( State() != EStateNone ) { @@ -241,6 +258,7 @@ iState = EStateOpen; PRINT((_L("CCMRMediaRecorderImp::OpenL() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRMEDIARECORDERIMP_OPENL, "e_CCMRMediaRecorderImp::OpenL 0" ); } @@ -810,6 +828,7 @@ // void CCMRMediaRecorderImp::PrepareL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRMEDIARECORDERIMP_PREPAREL, "e_CCMRMediaRecorderImp::PrepareL 1" ); PRINT((_L("CCMRMediaRecorderImp::PrepareL()"))); if ( (State() != EStateOpen) && (State() != EStateReadyToRecord) ) @@ -879,6 +898,7 @@ } } + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRMEDIARECORDERIMP_PREPAREL, "e_CCMRMediaRecorderImp::PrepareL 0" ); } @@ -965,6 +985,7 @@ // void CCMRMediaRecorderImp::StopL() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRMEDIARECORDERIMP_STOPL, "e_CCMRMediaRecorderImp::StopL 1" ); PRINT((_L("CCMRMediaRecorderImp::StopL() in"))); if ( (State() == EStateRecording) || (State() == EStatePaused) ) { @@ -1050,6 +1071,7 @@ PRINT((_L("CCMRMediaRecorderImp::StopL() already stopped, ignoring"))); } PRINT((_L("CCMRMediaRecorderImp::StopL() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRMEDIARECORDERIMP_STOPL, "e_CCMRMediaRecorderImp::StopL 0" ); } // ----------------------------------------------------------------------------- diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/mediarecorder/Src/CCMRVideoCameraSource.cpp --- a/camcordermmfplugin/mediarecorder/Src/CCMRVideoCameraSource.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/mediarecorder/Src/CCMRVideoCameraSource.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -20,7 +20,6 @@ #include "CCMRVideoCameraSource.h" #include "CCMRFrameBuffer.h" - #ifdef _DEBUG #include #define PRINT(x) RDebug::Print x @@ -28,6 +27,11 @@ #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CCMRVideoCameraSourceTraces.h" +#endif + // ================= MEMBER FUNCTIONS ======================= @@ -127,6 +131,7 @@ // CCMRVideoCameraSource::~CCMRVideoCameraSource() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRVIDEOCAMERASOURCE_CCMRVIDEOCAMERASOURCE, "e_CCMRVideoCameraSource::~CCMRVideoCameraSource 1" ); // verify that camera has been released if ( iReserved && iCamera ) { @@ -135,6 +140,7 @@ iObserver = NULL; delete iCamera; + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRVIDEOCAMERASOURCE_CCMRVIDEOCAMERASOURCE, "e_CCMRVideoCameraSource::~CCMRVideoCameraSource 0" ); } // --------------------------------------------------------- diff -r bcdc0181a9f1 -r 6bc4220d7f67 camcordermmfplugin/mediarecorder/Src/CCMRVideoRecorderClient.cpp --- a/camcordermmfplugin/mediarecorder/Src/CCMRVideoRecorderClient.cpp Fri Feb 19 22:59:30 2010 +0200 +++ b/camcordermmfplugin/mediarecorder/Src/CCMRVideoRecorderClient.cpp Fri Mar 12 15:43:25 2010 +0200 @@ -38,6 +38,10 @@ #define PRINT(x) #endif +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CCMRVideoRecorderClientTraces.h" +#endif // ================= MEMBER FUNCTIONS ======================= @@ -88,6 +92,7 @@ // CCMRVideoRecorderClient::~CCMRVideoRecorderClient() { + OstTrace0( CAMERASRV_PERFORMANCE, CCMRVIDEORECORDERCLIENT_CCMRVIDEORECORDERCLIENT, "e_CCMRVideoRecorderClient::~CCMRVideoRecorderClient 1" ); PRINT((_L("CCMRVideoRecorderClient::~CCMRVideoRecorderClient() in"))); @@ -113,6 +118,7 @@ // enable for RTRT code coverage //#pragma attol insert _ATCPQ_DUMP(0); PRINT((_L("CCMRVideoRecorderClient::~CCMRVideoRecorderClient() out"))); + OstTrace0( CAMERASRV_PERFORMANCE, DUP1_CCMRVIDEORECORDERCLIENT_CCMRVIDEORECORDERCLIENT, "e_CCMRVideoRecorderClient::~CCMRVideoRecorderClient 0" ); } // --------------------------------------------------------- diff -r bcdc0181a9f1 -r 6bc4220d7f67 configmanagers/imagingconfigmanager/conf/imagingconfigmanager.confml Binary file configmanagers/imagingconfigmanager/conf/imagingconfigmanager.confml has changed