RIO-8864: BaseNode shall use the logger tag supplied by node and enab…

…le complete node logging. Change-Id: I9b84f1445995362607e3f212ac3ae9a6a82cb1cc
lhzhang · Jun 23, 2010 · 2215d20 · 2215d20
1 parent e8b7348
commit 2215d20
Show file tree

Hide file tree

Showing 33 changed files with 25 additions and 77 deletions.
diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PV2WAY_ENGINE_SDKINFO_LABEL "1497191"
-#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100615
+#define PV2WAY_ENGINE_SDKINFO_LABEL "1500561"
+#define PV2WAY_ENGINE_SDKINFO_DATE 0x20100616
 
 #endif //PV_2WAY_SDKINFO_H_INCLUDED
diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1497191"
-#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100615
+#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1500561"
+#define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100616
 
 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED
diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h
@@ -21,7 +21,7 @@
 // This header file is automatically generated at build-time
 // *** OFFICIAL RELEASE INFO -- Will not auto update
 
-#define PVPLAYER_ENGINE_SDKINFO_LABEL "1497191"
-#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100615
+#define PVPLAYER_ENGINE_SDKINFO_LABEL "1500561"
+#define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100616
 
 #endif //PV_PLAYER_SDKINFO_H_INCLUDED
diff --git a/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.cpp b/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.cpp
@@ -34,7 +34,6 @@ PVMFAACFFParserNode::PVMFAACFFParserNode(int32 aPriority)
     iAACParser = NULL;
     iUseCPMPluginRegistry = false;
     iFileHandle = NULL;
-    iLogger = NULL;
     iFirstFrame = true;
     iDataPathLogger            = NULL;
     iClientClock               = NULL;
@@ -99,14 +98,12 @@ void PVMFAACFFParserNode::ConstructL()
     iAvailableMetadataKeys.reserve(PVMF_AAC_NUM_METADATA_VALUES);
     iAvailableMetadataKeys.clear();
 
-    iLogger = PVLogger::GetLoggerObject("PVMFAACParserNode");
     iDataPathLogger = PVLogger::GetLoggerObject("datapath.sourcenode.aacparsernode");
     iFileServer.Connect();
 }
 
 PVMFAACFFParserNode::~PVMFAACFFParserNode()
 {
-    iLogger = NULL;
     iDataPathLogger = NULL;
 
     if (iDataStreamInterface != NULL)

diff --git a/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.h b/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.h
@@ -563,9 +563,6 @@ class PVMFAACFFParserNode
         void LogMediaData(PVMFSharedMediaDataPtr data, PVMFPortInterface* aPort);
         PVMFStatus ParseAACFile();
 
-
-
-        PVLogger* iLogger;
         OsclFileHandle *iFileHandle;
         Oscl_FileServer iFileServer;
         OSCL_wHeapString<OsclMemAllocator> iSourceURL;

diff --git a/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.cpp b/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.cpp
@@ -48,11 +48,9 @@ static const char PVAMRMETADATA_INDEX0[] = "index=0";
 PVMFAMRFFParserNode::PVMFAMRFFParserNode(int32 aPriority) :
         PVMFNodeInterfaceImpl(aPriority, "PVMFAMRFFParserNode"),
         iOutPort(NULL),
-        iLogger(NULL),
         iFileHandle(NULL),
         iAMRParser(NULL)
 {
-    iLogger                    = NULL;
     iDataPathLogger            = NULL;
     iClockLogger               = NULL;
     iDownloadComplete          = false;
@@ -166,7 +164,6 @@ void PVMFAMRFFParserNode::Construct()
     iFileServer.Connect();
     iAvailableMetadataKeys.reserve(4);
     iAvailableMetadataKeys.clear();
-    iLogger = PVLogger::GetLoggerObject("PVMFAMRParserNode");
     iDataPathLogger = PVLogger::GetLoggerObject("datapath.sourcenode.amrparsernode");
 }
 

diff --git a/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.h b/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.h
@@ -276,7 +276,6 @@ class PVMFAMRFFParserNode :  public PVMFNodeInterfaceImpl
         uint32 iLastNPTCalcInConvertSizeToTime;
         uint32 iFileSizeLastConvertedToTime;
 
-        PVLogger* iLogger;
         PVLogger* iDataPathLogger;
         PVLogger* iClockLogger;
 

diff --git a/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.cpp b/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.cpp
@@ -267,8 +267,6 @@ PVMFStatus PVMFDownloadManagerNode::ThreadLogon()
     if (status != PVMFSuccess)
         return status;
 
-    iLogger = PVLogger::GetLoggerObject("pvdownloadmanagernode");
-
     //logon the sub-nodes.
     if (iProtocolEngineNode.iNode)
         iProtocolEngineNode.iNode->ThreadLogon();
@@ -283,8 +281,6 @@ PVMFStatus PVMFDownloadManagerNode::ThreadLogon()
 //Public API From node interface.
 PVMFStatus PVMFDownloadManagerNode::ThreadLogoff()
 {
-    iLogger = NULL;
-
     //logoff the sub-nodes.
     if (iFormatParserNode.iNode)
         iFormatParserNode.iNode->ThreadLogoff();

diff --git a/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.h b/nodes/pvdownloadmanagernode/src/pvmf_downloadmanager_node.h
@@ -576,7 +576,6 @@ class PVMFDownloadManagerNode
         OSCL_wHeapString<OsclMemAllocator> iSourceURL;
         OsclAny*iSourceData;
 
-        PVLogger* iLogger;
         friend class PVMFDownloadManagerSubNodeContainerBase;
         friend class PVMFDownloadManagerSubNodeContainer;
         friend class PVMFDownloadManagerRecognizerContainer;

diff --git a/nodes/pvfileoutputnode/src/pvmf_fileoutput_node.cpp b/nodes/pvfileoutputnode/src/pvmf_fileoutput_node.cpp
@@ -39,7 +39,6 @@ PVMFFileOutputNode::PVMFFileOutputNode(int32 aPriority)
         , iFileHandle(NULL)
         , iFileOpened(0)
         , iFirstMediaData(false)
-        , iLogger(NULL)
         , iFormat(PVMF_MIME_FORMAT_UNKNOWN)
         , iMaxFileSizeEnabled(false)
         , iMaxDurationEnabled(false)
@@ -80,8 +79,6 @@ PVMFFileOutputNode::PVMFFileOutputNode(int32 aPriority)
         OSCL_CLEANUP_BASE_CLASS(PVMFNodeInterfaceImpl);
         OSCL_LEAVE(err);
     }
-
-    iLogger = PVLogger::GetLoggerObject("PVMFFileOutputNode");
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -101,7 +98,6 @@ PVMFFileOutputNode::~PVMFFileOutputNode()
     {
         OSCL_DELETE(iAlloc);
     }
-    iLogger = NULL;
 }
 
 ////////////////////////////////////////////////////////////////////////////

diff --git a/nodes/pvfileoutputnode/src/pvmf_fileoutput_node.h b/nodes/pvfileoutputnode/src/pvmf_fileoutput_node.h
@@ -303,9 +303,6 @@ class PVMFFileOutputNode :  public PVMFNodeInterfaceImpl,
         int32 iFileOpened;
 
         bool iFirstMediaData;
-
-        PVLogger* iLogger;
-
         PVMFFormatType iFormat;
 
         PVMFPortVector<PVMFFileOutputInPort, PVMFFileOutputNodeAllocator> iPortVector;

diff --git a/nodes/pvmediaoutputnode/src/pv_media_output_node.cpp b/nodes/pvmediaoutputnode/src/pv_media_output_node.cpp
@@ -62,8 +62,6 @@ PVMediaOutputNode::~PVMediaOutputNode()
     if (IsAdded())
         RemoveFromScheduler();
 
-    iLogger = NULL;
-
     if (iMIOControl)
     {
         //call disconnect to make sure that there are no
@@ -517,7 +515,6 @@ PVMediaOutputNode::PVMediaOutputNode()
         , iLateMargin(DEFAULT_LATE_MARGIN)
         , iDiagnosticsLogger(NULL)
         , iDiagnosticsLogged(false)
-        , iLogger(NULL)
         , iReposLogger(NULL)
         , iRecentBOSStreamID(0)
 {
@@ -526,7 +523,6 @@ PVMediaOutputNode::PVMediaOutputNode()
 ////////////////////////////////////////////////////////////////////////////
 void PVMediaOutputNode::ConstructL(PvmiMIOControl* aIOInterfacePtr)
 {
-    iLogger = NULL;
     iMIOControl = aIOInterfacePtr;
     iInPortVector.Construct(0);//reserve zero
     iMediaIORequest = ENone;
@@ -535,7 +531,6 @@ void PVMediaOutputNode::ConstructL(PvmiMIOControl* aIOInterfacePtr)
     iMIOClockExtensionPVI = NULL;
     iClockRate = 100000;
 
-    iLogger = PVLogger::GetLoggerObject("PVMediaOutputNode");
     iReposLogger = PVLogger::GetLoggerObject("pvplayerrepos.mionode");
     iDiagnosticsLogger = PVLogger::GetLoggerObject("pvplayerdiagnostics.mionode");
 

diff --git a/nodes/pvmediaoutputnode/src/pv_media_output_node.h b/nodes/pvmediaoutputnode/src/pv_media_output_node.h
@@ -255,7 +255,6 @@ class PVMediaOutputNode
         bool SkipMediaDataComplete();
 
         //logger
-        PVLogger* iLogger;
         PVLogger* iReposLogger;
 
         OSCL_HeapString<OsclMemAllocator> iSinkFormatString;

diff --git a/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.cpp b/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.cpp
@@ -28,7 +28,6 @@ PVMFMP3FFParserNode::PVMFMP3FFParserNode(int32 aPriority)
         iConfigOk(0),
         iMaxFrameSize(PVMP3FF_DEFAULT_MAX_FRAMESIZE),
         iMP3FormatBitrate(0),
-        iLogger(NULL),
         iGaplessLogger(NULL),
         iSendDecodeFormatSpecificInfo(true),
         iCurrSampleDuration(0)
@@ -114,7 +113,6 @@ void PVMFMP3FFParserNode::Construct()
     iSubNodeCmdVec.reserve(9);
     // initialize clip information vector
     iClipInfoList.reserve(PVMF_MP3_MAX_NUM_TRACKS_GAPLESS);
-    iLogger = PVLogger::GetLoggerObject("PVMFMP3FFParserNode");
     iGaplessLogger = PVLogger::GetLoggerObject("sourcenode.gapless");
 }
 

diff --git a/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.h b/nodes/pvmp3ffparsernode/src/pvmf_mp3ffparser_node.h
@@ -601,7 +601,6 @@ class PVMFMP3FFParserNode : public PVMFNodeInterfaceImpl,
         bool iFileSizeRecvd;
         uint32 iFileSize;
         // Logger
-        PVLogger *iLogger;
         PVLogger *iGaplessLogger;
 
         // Channel sample info stored in a OsclRefCounterMemFrag

diff --git a/nodes/pvmp4ffcomposernode/src/pvmp4ffcn_node.cpp b/nodes/pvmp4ffcomposernode/src/pvmp4ffcn_node.cpp
@@ -338,7 +338,6 @@ PVMp4FFComposerNode::PVMp4FFComposerNode(int32 aPriority)
     iFileObject = NULL;
     oDiagnosticsLogged = false;
     iDiagnosticsLogger = PVLogger::GetLoggerObject("pvauthordiagnostics.composer.mp4");
-    iLogger = PVLogger::GetLoggerObject("PVMp4FFComposerNode");
     iDataPathLogger = PVLogger::GetLoggerObject("datapath.sinknode.mp4composer");
     int32 err;
     OSCL_TRY(err,
@@ -387,8 +386,6 @@ PVMp4FFComposerNode::PVMp4FFComposerNode(int32 aPriority)
 ////////////////////////////////////////////////////////////////////////////
 PVMp4FFComposerNode::~PVMp4FFComposerNode()
 {
-
-    iLogger = NULL;
     iDataPathLogger = NULL;
 
     if (!oDiagnosticsLogged)

diff --git a/nodes/pvmp4ffcomposernode/src/pvmp4ffcn_node.h b/nodes/pvmp4ffcomposernode/src/pvmp4ffcn_node.h
@@ -345,7 +345,6 @@ class PVMp4FFComposerNode
         MediaClockConverter iClockConverter;
 
         // Debug logging
-        PVLogger* iLogger;
         PVLogger* iDataPathLogger;
 
         uint32 iExtensionRefCount;

diff --git a/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp b/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.cpp
@@ -62,7 +62,6 @@ static const uint32 MAX32BITUINT = 0xFFFFFFFF;
 PVMFMP4FFParserNode::PVMFMP4FFParserNode(int32 aPriority) :
         PVMFNodeInterfaceImpl(aPriority, "PVMFMP4FFParserNode")
         , iPortIter(NULL)
-        , iLogger(NULL)
         , iGaplessLogger(NULL)
         , iBackwardReposFlag(false) /* To avoid backwardlooping :: A flag to remember backward repositioning */
         , iForwardReposFlag(false)
@@ -170,7 +169,6 @@ PVMFMP4FFParserNode::PVMFMP4FFParserNode(int32 aPriority) :
     iJitterBufferDurationInMs = PVMF_MP4FFPARSER_NODE_PSEUDO_STREAMING_BUFFER_DURATION_IN_MS;
     iBaseKey = INVALID;
 
-    iLogger = PVLogger::GetLoggerObject("PVMFMP4FFParserNode");
     iDataPathLogger = PVLogger::GetLoggerObject("datapath.sourcenode.mp4parsernode");
     iAVCDataPathLogger = PVLogger::GetLoggerObject("datapath.sourcenode.mp4parsernode.avc");
     if (iAVCDataPathLogger != NULL)
@@ -297,7 +295,6 @@ PVMFMP4FFParserNode::~PVMFMP4FFParserNode()
         iCPM = NULL;
     }
 
-    iLogger = NULL;
     iDataPathLogger = NULL;
     iAVCDataPathLogger = NULL;
     iClockLogger = NULL;
@@ -6758,6 +6755,7 @@ void PVMFMP4FFParserNode::GetCPMContentType()
 
 bool PVMFMP4FFParserNode::GetCPMMetaDataExtensionInterface()
 {
+    iCPMSequenceInProgress = true;
     PVInterface* temp = NULL;
     bool retVal =
         iCPM->queryInterface(KPVMFMetadataExtensionUuid, temp);

diff --git a/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.h b/nodes/pvmp4ffparsernode/src/pvmf_mp4ffparser_node.h
@@ -511,8 +511,6 @@ class PVMFMP4FFParserNode
         // stream id
         uint32 iStreamID;
 
-
-        PVLogger* iLogger;
         PVLogger* iDataPathLogger;
         PVLogger* iAVCDataPathLogger;
         PVLogger* iClockLogger;

diff --git a/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp b/nodes/pvomxaudiodecnode/src/pvmf_omx_audiodec_node.cpp
@@ -125,10 +125,8 @@ PVMFOMXAudioDecNode::PVMFOMXAudioDecNode(int32 aPriority) :
     // Do This first in case of Query
     OSCL_TRY(err, iFsiFragmentAlloc.size(PVOMXAUDIODEC_MEDIADATA_POOLNUM, sizeof(channelSampleInfo)));
 
-
     OSCL_TRY(err, iPrivateDataFsiFragmentAlloc.size(PVOMXAUDIODEC_MEDIADATA_POOLNUM, sizeof(OsclAny *)));
 
-    iLogger = PVLogger::GetLoggerObject("PVMFOMXAudioDecNode");
     iRunlLogger = PVLogger::GetLoggerObject("Run.PVMFOMXAudioDecNode");
     iDataPathLogger = PVLogger::GetLoggerObject("datapath");
     iClockLogger = PVLogger::GetLoggerObject("clock");

diff --git a/nodes/pvomxbasedecnode/include/pvmf_omx_basedec_node.h b/nodes/pvomxbasedecnode/include/pvmf_omx_basedec_node.h
@@ -622,7 +622,6 @@ class PVMFOMXBaseDecNode: public PVMFNodeInterfaceImpl
         bool iIsAdded;
 
         // Log related
-        PVLogger* iLogger;
         PVLogger* iDataPathLogger;
         PVLogger* iClockLogger;
         PVLogger *iRunlLogger;

diff --git a/nodes/pvomxbasedecnode/src/pvmf_omx_basedec_node.cpp b/nodes/pvomxbasedecnode/src/pvmf_omx_basedec_node.cpp
@@ -279,7 +279,6 @@ OSCL_EXPORT_REF PVMFOMXBaseDecNode::PVMFOMXBaseDecNode(int32 aPriority, const ch
         iSeqNum(0),
         iSeqNum_In(0),
         iIsAdded(true),
-        iLogger(NULL),
         iDataPathLogger(NULL),
         iClockLogger(NULL),
         iExtensionRefCount(0),

diff --git a/nodes/pvomxvideodecnode/src/pvmf_omx_videodec_node.cpp b/nodes/pvomxvideodecnode/src/pvmf_omx_videodec_node.cpp
@@ -110,7 +110,6 @@ PVMFOMXVideoDecNode::PVMFOMXVideoDecNode(int32 aPriority) :
     iNodeConfig.iSkipNUntilKeyFrame = PVOMXVIDEODECNODE_CONFIG_SKIPNUNTILKEYFRAME_DEF;
 
     // Get logger objects
-    iLogger = PVLogger::GetLoggerObject("PVMFOMXVideoDecNode");
     iRunlLogger = PVLogger::GetLoggerObject("Run.PVMFOMXVideoDecNode");
     iDataPathLogger = PVLogger::GetLoggerObject("datapath");
     iClockLogger = PVLogger::GetLoggerObject("clock");

diff --git a/nodes/pvprotocolenginenode/base/src/pvmf_protocol_engine_node.cpp b/nodes/pvprotocolenginenode/base/src/pvmf_protocol_engine_node.cpp
@@ -71,7 +71,6 @@ PVMFProtocolEngineNode::PVMFProtocolEngineNode(int32 aPriority) :
         iPortOut(NULL),
         iCurrentCmdId(0),
         iCmdRespPort(NULL),
-        iLogger(NULL),
         iDataPathLogger(NULL),
         iCurrentDataStreamCmdId(0)
 
@@ -108,15 +107,12 @@ PVMFProtocolEngineNode::PVMFProtocolEngineNode(int32 aPriority) :
 
     for (uint32 i = 0; i < EVENT_HANDLER_TOTAL; i++) iEventHandlers[i] = NULL;
 
-    iLogger = PVLogger::GetLoggerObject("PVMFProtocolEngineNode");
     iDataPathLogger = PVLogger::GetLoggerObject(NODEDATAPATHLOGGER_TAG);
 }
 
 PVMFProtocolEngineNode::~PVMFProtocolEngineNode()
 {
-    iLogger = NULL;
     iDataPathLogger = NULL;
-
     Clear(true);
 }
 

diff --git a/nodes/pvprotocolenginenode/base/src/pvmf_protocol_engine_node.h b/nodes/pvprotocolenginenode/base/src/pvmf_protocol_engine_node.h
@@ -527,7 +527,6 @@ class PVMFProtocolEngineNode :  public PVMFNodeInterfaceImpl,
         PVMFCommandId iCurrentCmdId;
         PVMFPortInterface* iCmdRespPort;
 
-        PVLogger* iLogger;
         PVLogger* iDataPathLogger;
 
         PvmiDataStreamCommandId iCurrentDataStreamCmdId;

diff --git a/nodes/pvsocketnode/include/pvmf_socket_node.h b/nodes/pvsocketnode/include/pvmf_socket_node.h
@@ -899,7 +899,6 @@ class PVMFSocketNode
         * Loggers, Error Trap, Allocator
         **********************************************/
 
-        PVLogger *iLogger;
         PVLogger *iDataPathLogger;
         PVLogger *iDataPathLoggerRTP;
         PVLogger *iDataPathLoggerRTCP;

diff --git a/nodes/pvsocketnode/src/pvmf_socket_node.cpp b/nodes/pvsocketnode/src/pvmf_socket_node.cpp
@@ -287,7 +287,6 @@ OSCL_EXPORT_REF PVMFSocketNode::PVMFSocketNode(int32 aPriority)
         , iMaxTCPRecvBufferSizeToConfigure(-1)
         , iMaxTCPRecvBufferCntToConfigure(-1)
 {
-    iLogger = NULL;
     iDataPathLogger = NULL;
     iDataPathLoggerRTP = NULL;
     iDataPathLoggerRTCP = NULL;
@@ -332,7 +331,6 @@ OSCL_EXPORT_REF PVMFSocketNode::PVMFSocketNode(int32 aPriority)
         OSCL_LEAVE(err);
     }
 
-    iLogger = PVLogger::GetLoggerObject("PVMFSocketNode");
     iDataPathLogger = PVLogger::GetLoggerObject("datapath.socketnode");
     iDataPathLoggerRTP = PVLogger::GetLoggerObject("datapath.socketnode.rtp");
     iDataPathLoggerRTCP = PVLogger::GetLoggerObject("datapath.socketnode.rtcp");

diff --git a/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.cpp b/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.cpp
@@ -44,7 +44,6 @@ static const char PVWAVMETADATA_INDEX0[] = "index=0";
 PVMFWAVFFParserNode::PVMFWAVFFParserNode(int32 aPriority) :
         PVMFNodeInterfaceImpl(aPriority, "PVMFWAVFFParserNode"),
         iOutPort(NULL),
-        iLogger(NULL),
         iWAVParser(NULL),
         iFileHandle(NULL)
 {

diff --git a/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.h b/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.h
@@ -259,8 +259,6 @@ class PVMFWAVFFParserNode : public PVMFNodeInterfaceImpl,
         Oscl_Vector<PVMFPortActivity, OsclMemAllocator> iPortActivityQueue;
         // output port
         PVMFWAVFFParserOutPort* iOutPort;
-        // logger object
-        PVLogger* iLogger;
         // file info struct
         PVWAVFileInfo wavinfo;
         // buffer size for track data