[Opalvoip-svn] SF.net SVN: opalvoip:[23165] opal/branches/v3_6
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2009-07-29 04:57:36
|
Revision: 23165 http://opalvoip.svn.sourceforge.net/opalvoip/?rev=23165&view=rev Author: rjongbloed Date: 2009-07-29 04:57:29 +0000 (Wed, 29 Jul 2009) Log Message: ----------- Fixed bug ID: 2820939 "compilation failure with --enable-fax --disable-statistics", thanks Mounir Lamouri Modified Paths: -------------- opal/branches/v3_6/include/codec/vidcodec.h opal/branches/v3_6/include/t38/t38proto.h opal/branches/v3_6/src/codec/opalpluginmgr.cxx opal/branches/v3_6/src/codec/vidcodec.cxx opal/branches/v3_6/src/t38/t38proto.cxx Modified: opal/branches/v3_6/include/codec/vidcodec.h =================================================================== --- opal/branches/v3_6/include/codec/vidcodec.h 2009-07-29 04:33:19 UTC (rev 23164) +++ opal/branches/v3_6/include/codec/vidcodec.h 2009-07-29 04:57:29 UTC (rev 23165) @@ -159,10 +159,8 @@ bool forceIFrame; bool lastFrameWasIFrame; -#if OPAL_STATISTICS DWORD m_totalFrames; DWORD m_keyFrames; -#endif }; Modified: opal/branches/v3_6/include/t38/t38proto.h =================================================================== --- opal/branches/v3_6/include/t38/t38proto.h 2009-07-29 04:33:19 UTC (rev 23164) +++ opal/branches/v3_6/include/t38/t38proto.h 2009-07-29 04:57:29 UTC (rev 23165) @@ -174,7 +174,11 @@ PINDEX writeBufferLen; PString m_stationId; +#if OPAL_STATISTICS OpalMediaStatistics::Fax m_statistics; +#else + int m_result; +#endif }; /////////////////////////////////////////////////////////////////////////////// Modified: opal/branches/v3_6/src/codec/opalpluginmgr.cxx =================================================================== --- opal/branches/v3_6/src/codec/opalpluginmgr.cxx 2009-07-29 04:33:19 UTC (rev 23164) +++ opal/branches/v3_6/src/codec/opalpluginmgr.cxx 2009-07-29 04:57:29 UTC (rev 23165) @@ -967,11 +967,9 @@ } while ((flags & PluginCodec_ReturnCoderLastFrame) == 0); PTRACE(5, "OpalPlugin\tEncoded video frame into " << dstList.GetSize() << " packets."); -#if OPAL_STATISTICS m_totalFrames++; if (lastFrameWasIFrame) m_keyFrames++; -#endif #if PTRACING if (!lastFrameWasIFrame) @@ -1047,11 +1045,9 @@ PTRACE(5, "OpalPlugin\tVideo decoder returned I-frame"); } -#if OPAL_STATISTICS m_totalFrames++; if (lastFrameWasIFrame) m_keyFrames++; -#endif } } } Modified: opal/branches/v3_6/src/codec/vidcodec.cxx =================================================================== --- opal/branches/v3_6/src/codec/vidcodec.cxx 2009-07-29 04:33:19 UTC (rev 23164) +++ opal/branches/v3_6/src/codec/vidcodec.cxx 2009-07-29 04:57:29 UTC (rev 23165) @@ -99,10 +99,8 @@ , videoEncoderMaxOutputSize(10*1024) , forceIFrame(true) , lastFrameWasIFrame(false) -#if OPAL_STATISTICS , m_totalFrames(0) , m_keyFrames(0) -#endif { } Modified: opal/branches/v3_6/src/t38/t38proto.cxx =================================================================== --- opal/branches/v3_6/src/t38/t38proto.cxx 2009-07-29 04:33:19 UTC (rev 23164) +++ opal/branches/v3_6/src/t38/t38proto.cxx 2009-07-29 04:57:29 UTC (rev 23165) @@ -515,11 +515,13 @@ } +#if OPAL_STATISTICS void OpalFaxMediaStream::GetStatistics(OpalMediaStatistics & statistics, bool fromPatch) const { OpalMediaStream::GetStatistics(statistics, fromPatch); statistics.m_fax = m_statistics; } +#endif static bool ExtractValue(const PString & msg, PINDEX & position, int & value, char sep = '=') @@ -549,7 +551,11 @@ if (c < 0) { PTRACE(2, "Fax\tError reading from " << m_faxCallInfo->spanDSP.GetName() << ": " << m_faxCallInfo->spanDSP.GetErrorText(PChannel::LastReadError)); +#if OPAL_STATISTICS m_connection.OnFaxCompleted(m_statistics.m_result != 0); +#else + m_connection.OnFaxCompleted(m_result != 0); +#endif return; } @@ -572,8 +578,9 @@ continue; } + PINDEX position = 0; +#if OPAL_STATISTICS int result, errorCorrection; - PINDEX position = 0; if (ExtractValue(msg, position, result) && ExtractValue(msg, position, m_statistics.m_bitRate) && ExtractValue(msg, position, m_statistics.m_compression) && @@ -593,6 +600,9 @@ m_statistics.m_result = result; // Only set this if everything parsed correctly m_statistics.m_errorCorrection = errorCorrection != 0; } +#else + ExtractValue(msg, position, m_result); +#endif PTRACE(4, "Fax\tSpanDSP Output:\n" << msg); notInStats = true; msg.MakeEmpty(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |