[prev in list] [next in list] [prev in thread] [next in thread]
List: helix-datatype-cvs
Subject: [Datatype-cvs] mdf/video/renderer/mdfdevice/server
From: rrajesh () helixcommunity ! org
Date: 2008-01-25 22:08:15
Message-ID: 200801252208.m0PM8WEm023790 () mailer ! progressive-comp ! com
[Download RAW message or body]
Update of /cvsroot/datatype/mdf/video/renderer/mdfdevice/server
In directory cvs01.internal.helixcommunity.org:/tmp/cvs-serv8131/mdfdevice/server
Modified Files:
CMDFDevVideoServer.h CMDFDevVideoServerSession.cpp
Log Message:
"Nokia submits this code under the terms of a commercial contribution agreement with \
RealNetworks, and I am authorized to contribute this code under said agreement."
Modified by: rajesh.rathinasamy@nokia.com
Reviewed by:
Date: 24-Jan-2008
Project: SymbianMmf_rel
ErrorId: RRAY-7B7RDS
Synopsis: CR: Runtime log config option for MDF DevVideo server
The Logging on the devVideo server session can be set runtime instead of compile \
time. The logic uses the same config parameters from the cfg file.
ServerCtx constructor takes log config option and stores it on the TLS which is used \
while executing every log statement on the server thread.
Cfg option "Logging\\File\\Enabled" is used to enable or disable logging
Cfg option "Logging\\File\\Filename" is used to detect whether the logs have to go to \
console (Rdebug) or File (RFileLogger, c:\logs\hlx). Please not that for RFileLogger \
to work, dir c:\Logs\hlx directory has to be created. If console is not the filename, \
the logs will go to RFileLogger.
Root Cause of the problem: N/A
Files Modified:
===========
Datatype/mdf/video/renderer/Umakefil
Datatype/mdf/video/renderer/mdfvideoadapter.cpp
Datatype/mdf/video/renderer/umakedll
Datatype/mdf/video/renderer/pub/mdfvideoadapter.h
Datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServer.h
Datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.cpp
Datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.h
Common\system\pub\platform\symbian\CHXSymbianServer.h
Common\system\pub\platform\symbian\CHXSymbianServerDebug.h
Common\system\platform\symbian\CHXSymbianServer.cpp
Image Size and Heap Use impact: no major impact
Module Release testing (STIF) : Passed.
Test case(s) Added : No.
Memory leak check performed : Yes. No new leaks introduced.
Platforms and Profiles Build Verified: helix-client-s60-32-mmf-mdf-arm
Platforms and Profiles Functionality verified: armv5,winscw
Branch: 210CayS, Head
Index: CMDFDevVideoServer.h
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CMDFDevVideoServer.h 23 Jan 2008 23:37:39 -0000 1.1
+++ CMDFDevVideoServer.h 25 Jan 2008 22:08:13 -0000 1.2
@@ -79,7 +79,7 @@
class CMDFDevVideoServerCtx : public CHXSymbianServerCtx
{
public:
- CMDFDevVideoServerCtx() {}
+ CMDFDevVideoServerCtx(TInt lLogMode):CHXSymbianServerCtx(lLogMode) {}
~CMDFDevVideoServerCtx() {}
Index: CMDFDevVideoServerSession.cpp
===================================================================
RCS file: /cvsroot/datatype/mdf/video/renderer/mdfdevice/server/CMDFDevVideoServerSession.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- CMDFDevVideoServerSession.cpp 23 Jan 2008 23:37:39 -0000 1.1
+++ CMDFDevVideoServerSession.cpp 25 Jan 2008 22:08:13 -0000 1.2
@@ -103,7 +103,7 @@
//
CMDFDevVideoServerSession::~CMDFDevVideoServerSession()
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::~CMDFDevVideoServerSession"), \
this); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::~CMDFDevVideoServerSession"), this) ); \
if(m_pServer != NULL) {
m_pServer->SessionClosed(this);
@@ -134,7 +134,7 @@
{
CMDFDevVideoServerSession* pSession = new (ELeave) \
CMDFDevVideoServerSession(pServer);
- SERVER_LOG(_L("CMDFDevVideoServerSession::NewL Server:%x Session:%x"), pServer, \
pSession); + SERVER_LOG( (_L("CMDFDevVideoServerSession::NewL Server:%x \
Session:%x"), pServer, pSession) );
pSession->Init();
@@ -162,7 +162,7 @@
// to avoid too much of logs
if( (lFunction != MDF_AsyncGetNextPicture) && (lFunction != \
MDF_SyncPlaybackPosition) ) {
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::ServiceL cmd:%d"), this, \
lFunction); + SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ServiceL \
cmd:%d"), this, lFunction) ); }
if( // other than create, all other function requires existence
@@ -173,7 +173,7 @@
((lFunction > MDF_PostInitCmdBase) && (m_DevVideoState < \
EDevVideoInitialized)) )
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::ServiceL cmd:%d state:%d \
KErrNotReady"), this, lFunction, m_DevVideoState); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::ServiceL cmd:%d state:%d KErrNotReady"), this, \
lFunction, m_DevVideoState) ); lRetval = KErrNotReady;
}
@@ -441,7 +441,7 @@
}
default:
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::ServiceL WARNING \
Function::%d NOT SUPPORTED"), this, lFunction); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::ServiceL WARNING Function::%d NOT SUPPORTED"), \
this, lFunction) ); lRetval = KErrNotSupported;
break;
}
@@ -450,7 +450,7 @@
if(lRetval != KErrNone)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::ServiceL Cmd:%d state:%d \
Error::%d "), this, lFunction, m_DevVideoState, lRetval); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::ServiceL Cmd:%d state:%d Error::%d "), this, \
lFunction, m_DevVideoState, lRetval) ); }
if(bCompleteMsg)
@@ -485,15 +485,15 @@
// RDebug & RFileLogger requires 16 bit descriptor for debug statements
TBuf<100> PrintBuff;
PrintBuff.Copy(mimetypehelix);
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL mimetypehelix \
::%S"), this, &PrintBuff); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL mimetypehelix ::%S"), this, \
&PrintBuff) ); PrintBuff.Copy(mimetypevidhw);
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL mimetypevidhw \
::%S"), this, &PrintBuff); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL mimetypevidhw ::%S"), this, \
&PrintBuff) ); }
#endif // End of #ifdef HELIX_FEATURE_LOGLEVEL_NONE
// Connect to window session
lRetval = m_WsSession.Connect();
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Window Session \
Connect ::%d"), this, lRetval); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Window Session Connect ::%d"), \
this, lRetval) ); User::LeaveIfError(lRetval);
if(m_pFbsBitGc == NULL)
@@ -504,7 +504,7 @@
TInt colors;
if( HAL::Get(HALData::EDisplayColors, colors) == KErrNone )
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Colors ::%d"), \
this, colors); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Colors ::%d"), this, colors) ); \
switch (colors) {
case 16:
@@ -525,7 +525,7 @@
}
}
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL DisplayMode \
::%d"), this, m_DisplayMode); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL DisplayMode ::%d"), this, \
m_DisplayMode) );
if(!m_pFbsScreenDevice )
{
@@ -533,13 +533,13 @@
TInt screenNumber( 0 );
if( pInitParams->m_pPluginPkg->IsScreenNumberSet( screenNumber ) )
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL \
ScreenNumber::%d"), this, screenNumber); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL ScreenNumber::%d"), this, \
screenNumber) );
m_pFbsScreenDevice = CFbsScreenDevice::NewL( screenNumber, m_DisplayMode \
); }
else
#endif //SYMBIAN_ENABLE_MMF_MULTISCREEN_SUPPORT
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL No Multi \
Screen support"), this); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL No Multi Screen support"), this) \
);
m_pFbsScreenDevice = CFbsScreenDevice::NewL(_L("scdv"), m_DisplayMode);
}
m_pFbsBitGc->Activate( ( CFbsDevice* ) m_pFbsScreenDevice );
@@ -547,9 +547,9 @@
m_bReturnPictures = pInitParams->m_bReturnPictures;
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL IsDecodeOnlyMode:: \
%d"), this, m_bReturnPictures); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL IsDecodeOnlyMode:: %d"), this, \
m_bReturnPictures) ); m_pDevVideoPlay = CMMFDevVideoPlay::NewL(*this);
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL DevVideoPlay:%x"), \
this, m_pDevVideoPlay); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL DevVideoPlay:%x"), this, \
m_pDevVideoPlay) );
m_DecoderHwDeviceId = m_pDevVideoPlay->SelectDecoderL( decoderId );
@@ -582,10 +582,10 @@
}
}
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Dec:0x%x \
PP:0x%x"), this,
- m_DecoderHwDeviceId, m_PostProcessorHwDeviceId);
+ SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Dec:0x%x \
PP:0x%x"), this, + m_DecoderHwDeviceId, m_PostProcessorHwDeviceId) );
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Sync Decoding: \
%d"), this, pInitParams->m_bSyncDecoding); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL Sync Decoding: %d"), this, \
pInitParams->m_bSyncDecoding) ); \
m_pDevVideoPlay->SynchronizeDecoding(pInitParams->m_bSyncDecoding);
m_pDevVideoPlay->SetClockSource( pInitParams->m_pClockSource );
@@ -593,7 +593,7 @@
m_pPayloadFormatPluginDevice = pInitParams->m_pPayloadFormatPluginDevice;
m_pMDFEncodedFrameQ = pInitParams->m_pMDFEncodedFrameQ;
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL SecureOutput flag: \
%d"), this, pInitParams->m_bCopyRestricted); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL SecureOutput flag: %d"), this, \
pInitParams->m_bCopyRestricted) );
if((pInitParams->m_bCopyRestricted) && (!pInitParams->m_bDisablePostProcessor))
{
// Hlx error code stored for proper error reporting
@@ -607,7 +607,7 @@
if(pSecureOutput)
{
TRAPD(lRetval, \
pSecureOutput->MmvsoSetSecureOutputL(pInitParams->m_bCopyRestricted) \
);
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL \
MmvsoSetSecureOutputL : %d"), this, lRetval); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL MmvsoSetSecureOutputL : %d"), \
this, lRetval) ); if(lRetval == KErrNone)
{
// Changing to default value
@@ -616,7 +616,7 @@
}
else
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL \
MMmfVideoSecureOutput NOT SUPPORTED"), this); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL MMmfVideoSecureOutput NOT \
SUPPORTED"), this) ); }
#endif
@@ -627,8 +627,8 @@
MMmfVideoResourcePriority* pPriorityIntfc =
(MMmfVideoResourcePriority *) m_pDevVideoPlay->CustomInterface( \
m_DecoderHwDeviceId, KUidMmfVideoResourcePriority );
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL PriorityIntfc:%x \
Priority:%d"), this,
- pPriorityIntfc, pInitParams->m_lResourcePriority);
+ SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::CreateDevVideoL PriorityIntfc:%x \
Priority:%d"), this, + pPriorityIntfc, pInitParams->m_lResourcePriority) );
if( pPriorityIntfc )
{
pPriorityIntfc->MmvpSetResourcePriority(pInitParams->m_lResourcePriority);
@@ -648,7 +648,7 @@
//
void CMDFDevVideoServerSession::ConfigureDecoderL(TVideoPictureHeader* \
pPictureHeader) {
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::ConfigureDecoderL "), this);
+ SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::ConfigureDecoderL "), this) );
m_pPictureHeader = pPictureHeader;
#ifdef SYMBIAN_MDF_API_V2
@@ -675,7 +675,7 @@
//
void CMDFDevVideoServerSession::CreateAndInitL(CDevVideoInitParams* pInitParams)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CreateAndInitL Arg:%x"), this, \
pInitParams); + SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::CreateAndInitL \
Arg:%x"), this, pInitParams) ); ValidateInitParamL(pInitParams);
CreateDevVideoL(pInitParams);
ConfigureDecoderL(pInitParams->m_pPictureHeader);
@@ -688,7 +688,7 @@
//
void CMDFDevVideoServerSession::ValidateInitParamL(CDevVideoInitParams* pInitParams)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::ValidateInitParamL Arg:%x"), this, \
pInitParams); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::ValidateInitParamL Arg:%x"), this, pInitParams) \
); if((pInitParams == NULL) ||
(pInitParams->m_pPluginPkg == NULL) ||
(pInitParams->m_pClockSource == NULL) ||
@@ -706,7 +706,7 @@
//
void CMDFDevVideoServerSession::CancelAllObservers()
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CancelAllObservers "), this);
+ SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::CancelAllObservers "), this) );
CompleteMessage(m_FatalErrorMessage, KErrCancel);
CompleteMessage(m_ResourceLostMessage, KErrCancel);
@@ -729,7 +729,7 @@
}
else
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::CompleteMessage WARNING NULL \
MESSAGE RetCode:%d"), this, aReturnCode); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::CompleteMessage WARNING NULL MESSAGE \
RetCode:%d"), this, aReturnCode) ); }
return lRetval;
@@ -741,7 +741,7 @@
//
void CMDFDevVideoServerSession::MdvpoFatalError(TInt aError)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MdvpoFatalError st:%d ERROR :%d"), \
this, m_DevVideoState, aError); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MdvpoFatalError st:%d ERROR :%d"), this, \
m_DevVideoState, aError) );
HandleFatalError(aError);
}
@@ -752,7 +752,7 @@
//
void CMDFDevVideoServerSession::MdvpoInitComplete(TInt aError)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MdvpoInitComplete Retval:%d"), \
this, aError); + SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MdvpoInitComplete \
Retval:%d"), this, aError) ); if(aError == KErrNone)
{
m_DevVideoState = EDevVideoInitialized;
@@ -763,7 +763,7 @@
(MMmfVideoResourceHandler *) m_pDevVideoPlay->CustomInterface( \
m_DecoderHwDeviceId, KUidMmfVideoResourceManagement ); if(pResourceManagment)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MdvpoInitComplete \
SetObserver :%x"), this, pResourceManagment); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MdvpoInitComplete SetObserver :%x"), this, \
pResourceManagment) ); pResourceManagment->MmvrhSetObserver(this);
}
#endif
@@ -837,14 +837,14 @@
videoInputBufferP->iOptions = \
TVideoInputBuffer::EPresentationTimestamp;
videoInputBufferP->iPresentationTimestamp = presentationTime;
- //SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::BltL \
WriteCodedData"), this); + //SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::BltL WriteCodedData"), this) );
m_pDevVideoPlay->WriteCodedDataL( videoInputBufferP );
}
else
{
// no buffers available on DevVideo
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::BltL ERROR: Buffer \
MUST NOT be empty"), this); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::BltL ERROR: Buffer MUST NOT be empty"), this) ); \
break; }
@@ -853,7 +853,7 @@
else
{
// no packet on Q
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::BltL No packets on \
Q"), this); + SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::BltL No \
packets on Q"), this) ); break;
}
} // End of while( m_pDevVideoPlay->NumFreeBuffers())
@@ -861,7 +861,7 @@
} // End of if(m_DevVideoState >= EDevVideoInitialized)
else
{
- //SERVER_LOG(_L("CMDFDevVideoServerSession::BltL State MISMATCH: %d"), \
m_DevVideoState); + //SERVER_LOG( (_L("CMDFDevVideoServerSession::BltL State \
MISMATCH: %d"), m_DevVideoState) ); }
@@ -875,13 +875,13 @@
//
void CMDFDevVideoServerSession::MmvroResourcesLost(TUid aMediaDevice)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesLost Uid: %d"), \
this, aMediaDevice.iUid); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesLost Uid: %d"), this, \
aMediaDevice.iUid) );
Pause();
if(!m_ResourceLostMessage.IsNull())
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesLost Completing \
Msg"), this); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesLost Completing Msg"), this) ); \
m_ResourceLostMessage.Complete(KErrNone); }
@@ -896,11 +896,11 @@
//
void CMDFDevVideoServerSession::MmvroResourcesRestored(TUid aMediaDevice)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesRestored Uid: %d"), \
this, aMediaDevice.iUid); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesRestored Uid: %d"), this, \
aMediaDevice.iUid) );
if(!m_ResourceRestoredMessage.IsNull())
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesRestored \
Completing Msg"), this); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MmvroResourcesRestored Completing Msg"), this) ); \
m_ResourceRestoredMessage.Complete(KErrNone); }
}
@@ -911,7 +911,7 @@
//
void CMDFDevVideoServerSession::Pause()
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::Pause() m_DevVideoState: %d"), \
this, m_DevVideoState); + SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::Pause() \
m_DevVideoState: %d"), this, m_DevVideoState) ); if(m_pDevVideoPlay != NULL)
{
m_pDevVideoPlay->Pause();
@@ -926,7 +926,7 @@
//
void CMDFDevVideoServerSession::RunL()
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::RunL State: %d status:%d "), this, \
m_DevVideoState, iStatus.Int()); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::RunL State: %d status:%d "), this, \
m_DevVideoState, iStatus.Int()) ); if(iStatus.Int() == KErrNone)
{
if(m_DevVideoState == EDevVideoStartInitiated)
@@ -936,7 +936,7 @@
TRAPD(lRetval, BltL());
if(lRetval != KErrNone)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::RunL BltL error \
Calling FATAL Error: %d"), this, lRetval); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::RunL BltL error Calling FATAL Error: %d"), this, \
lRetval) ); HandleFatalError(lRetval);
}
}
@@ -963,7 +963,7 @@
TRAPD(lRetval, BltL());
if(lRetval != KErrNone)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[]::MdvpoNewBuffers ERROR : %d"), \
lRetval); + SERVER_LOG( (_L("CMDFDevVideoServerSession[]::MdvpoNewBuffers \
ERROR : %d"), lRetval) ); HandleFatalError(lRetval);
}
}
@@ -1016,7 +1016,7 @@
TRAP(lRetVal, HandleNewPicturesL());
if (lRetVal != KErrNone)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MdvpoNewPictures() \
Err:%d"), this, lRetVal); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::MdvpoNewPictures() Err:%d"), this, lRetVal) ); \
HandleFatalError(lRetVal); }
}
@@ -1027,7 +1027,7 @@
//
void CMDFDevVideoServerSession::MdvpoStreamEnd()
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::MdvpoStreamEnd()"), this);
+ SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::MdvpoStreamEnd()"), this) );
}
@@ -1097,11 +1097,11 @@
//
void CMDFDevVideoServerSession::HandleFatalError(TInt lRetval)
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::HandleFatalError() Err:%d"), this, \
lRetval); + SERVER_LOG( (_L("CMDFDevVideoServerSession[%x]::HandleFatalError() \
Err:%d"), this, lRetval) ); m_DevVideoState = EDevVideoError;
if(!m_FatalErrorMessage.IsNull())
{
- SERVER_LOG(_L("CMDFDevVideoServerSession[%x]::HandleFatalError() Completing \
msg"), this); + SERVER_LOG( \
(_L("CMDFDevVideoServerSession[%x]::HandleFatalError() Completing msg"), this) ); \
m_FatalErrorMessage.Complete(lRetval); }
}
@@ -1125,3 +1125,4 @@
m_ArrOfPictures.Reset();
}
+
_______________________________________________
Datatype-cvs mailing list
Datatype-cvs@helixcommunity.org
http://lists.helixcommunity.org/mailman/listinfo/datatype-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic