diff options
Diffstat (limited to 'nodes')
6 files changed, 11 insertions, 26 deletions
diff --git a/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.cpp b/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.cpp index aa9a6814b..3a53d1068 100644 --- a/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.cpp +++ b/nodes/pvaacffparsernode/src/pvmf_aacffparser_node.cpp @@ -1239,17 +1239,9 @@ void PVMFAACFFParserNode::DoReset(PVMFAACFFParserNodeCommand& aCmd) iDownloadProgressInterface->cancelResumeNotification(); } - if (iFileHandle != NULL) + if ((iAACParser) && (iCPM)) { - /* Indicates that the init was successfull */ - if ((iCPM)) - { - SendUsageComplete(); - } - else - { - CompleteReset(); - } + SendUsageComplete(); } else { diff --git a/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.cpp b/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.cpp index 4b6dc5989..b4c9ef8e3 100644 --- a/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.cpp +++ b/nodes/pvamrffparsernode/src/pvmf_amrffparser_node.cpp @@ -1655,17 +1655,9 @@ void PVMFAMRFFParserNode::DoReset(PVMFAMRFFNodeCommand& aCmd) iDownloadProgressInterface->cancelResumeNotification(); } MoveCmdToCurrentQueue(aCmd); - if (iFileHandle != NULL) + if ((iAMRParser) && (iCPM)) { - /* Indicates that the init was successfull */ - if ((iCPM)) - { - SendUsageComplete(); - } - else - { - CompleteReset(); - } + SendUsageComplete(); } else { diff --git a/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.cpp b/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.cpp index f53cd64fd..2ac093cbe 100644 --- a/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.cpp +++ b/nodes/pvmediainputnode/src/pvmf_media_input_node_outport.cpp @@ -66,8 +66,7 @@ PvmfMediaInputNodeOutPort::PvmfMediaInputNodeOutPort(PvmfMediaInputNode* aNode, iMediaDataAlloc = OSCL_NEW(PvmfMediaInputDataBufferAlloc, (iMediaDataAllocMemPool)); iDataPathLogger = PVLogger::GetLoggerObject("datapath.sourcenode"); - //OSCL_TRY(err, iPrivateDataFsiFragmentAlloc.size(4, sizeof(OsclAny *))); //TODO REMOVE THE HARDCODED VALUE - iPrivateDataFsiFragmentAlloc.size(4, sizeof(OsclAny *)); //TODO REMOVE THE HARDCODED VALUE + iPrivateDataFsiFragmentAlloc.size(32, sizeof(OsclAny *)); //TODO REMOVE THE HARDCODED VALUE #ifdef _TEST_AE_EROR_HANDLING iTimeStampJunk = 0x000FFFFF; #endif diff --git a/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp b/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp index 6e1a70e35..c3761bdbe 100644 --- a/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp +++ b/nodes/pvomxencnode/src/pvmf_omx_enc_node.cpp @@ -3990,7 +3990,7 @@ bool PVMFOMXEncNode::SendInputBufferToOMXComponent() iDataIn->getFormatSpecificInfo(fsifrag); if(sizeof(OsclAny*) != fsifrag.getMemFrag().len ) { - PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_STACK_ERR, + PVLOGGER_LOGMSG(PVLOGMSG_INST_LLDBG, iLogger, PVLOGMSG_ERR, (0, "PVMFOMXEncNode-%s::SendInputBufferToOMXComponent() - ERROR buffer size %d", iNodeTypeId, fsifrag.getMemFrag().len )); return false; } diff --git a/nodes/pvprotocolenginenode/protocol_common/src/pvmf_protocol_engine_node_common.h b/nodes/pvprotocolenginenode/protocol_common/src/pvmf_protocol_engine_node_common.h index 8b3ce5dc7..dd00ae56b 100644 --- a/nodes/pvprotocolenginenode/protocol_common/src/pvmf_protocol_engine_node_common.h +++ b/nodes/pvprotocolenginenode/protocol_common/src/pvmf_protocol_engine_node_common.h @@ -1426,6 +1426,8 @@ class InterfacingObjectContainer void setSocketReconnectCmdSent(const bool aSocketReconnectCmdSent = true) { iSocketReconnectCmdSent = aSocketReconnectCmdSent; + iCurrSocketConnection = true; + iPrevSocketConnection = true; } bool ignoreCurrentInputData() const { diff --git a/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.cpp b/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.cpp index 1b288e50d..81be8aee1 100644 --- a/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.cpp +++ b/nodes/pvwavffparsernode/src/pvmf_wavffparser_node.cpp @@ -1840,7 +1840,7 @@ PVMFStatus PVMFWAVFFParserNode::GetMediaPresentationInfo(PVMFMediaPresentationIn uint32 duration_sec = wavinfo.NumSamples / wavinfo.SampleRate; uint32 duration_msec = wavinfo.NumSamples % wavinfo.SampleRate; - uint32 duration = (duration_msec * 1000) / wavinfo.NumSamples + duration_sec * 1000 ; + uint32 duration = (duration_msec * 1000) / wavinfo.SampleRate + duration_sec * 1000 ; aInfo.setDurationValue(duration); // Current version of WAV parser is limited to 1 channel @@ -1998,7 +1998,7 @@ void PVMFWAVFFParserNode::DoSetDataSourcePosition(PVMFWAVFFNodeCommand& aCmd) // see if targetNPT is greater than or equal to clip duration. uint32 duration_sec = wavinfo.NumSamples / wavinfo.SampleRate; uint32 duration_msec = wavinfo.NumSamples % wavinfo.SampleRate; - uint32 duration = (duration_msec * 1000) / wavinfo.NumSamples + duration_sec * 1000 ; + uint32 duration = (duration_msec * 1000) / wavinfo.SampleRate + duration_sec * 1000 ; uint32 tempTargetNPT = targetNPT; if (tempTargetNPT >= duration) { @@ -2581,7 +2581,7 @@ PVMFStatus PVMFWAVFFParserNode::DoGetNodeMetadataValue(PVMFWAVFFNodeCommand& aCm { uint32 duration_sec = wavinfo.NumSamples / wavinfo.SampleRate; uint32 duration_msec = wavinfo.NumSamples % wavinfo.SampleRate; - uint32 duration = (duration_msec * 1000) / wavinfo.NumSamples + duration_sec * 1000 ; + uint32 duration = (duration_msec * 1000) / wavinfo.SampleRate + duration_sec * 1000 ; KeyVal.value.uint32_value = duration; } // Set the length and capacity |