[Opalvoip-svn] SF.net SVN: opalvoip:[23166] opal/trunk

[<rjo...@us...>]

Revision: 23166
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=23166&view=rev
Author:   rjongbloed
Date:     2009-07-29 05:04:11 +0000 (Wed, 29 Jul 2009)

Log Message:
-----------
Fixed bug ID: 2820939 "compilation failure with --enable-fax --disable-statistics", thanks Mounir Lamouri 

Modified Paths:
--------------
    opal/trunk/include/codec/vidcodec.h
    opal/trunk/src/codec/opalpluginmgr.cxx
    opal/trunk/src/codec/vidcodec.cxx

Property Changed:
----------------
    opal/trunk/


Property changes on: opal/trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /opal/branches/autoconf:20594-21001
/opal/branches/rjongbloed/BarnardPlus:20584,20656,20749,20751,20756,20762,20786,20789,20814,20820,20829,20831,20841,20843,20923,20927,20938,22016-22017,22518,22582,22941
/opal/branches/v3_2:21143,21220,21227,21253,21455
/opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143
/opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157
/opal/trunk:22308
/ptlib/trunk:20820
   + /opal/branches/autoconf:20594-21001
/opal/branches/rjongbloed/BarnardPlus:20584,20656,20749,20751,20756,20762,20786,20789,20814,20820,20829,20831,20841,20843,20923,20927,20938,22016-22017,22518,22582,22941
/opal/branches/v3_2:21143,21220,21227,21253,21455
/opal/branches/v3_4:21060,21062,21088,21092,21111,21113,21115,21119,21143,21148,21151-21152,21155,21158,21184,21188,21253,21265-21266,21283-21284,21298,21300,21303,21307,21309,21311,21327,21331,21333,21359,21367,21369,21488,21556,21564-21565,21568,21570,21620,21625,21631,21748,21751,21756,21759,21761,21767,21770,22246,23044,23140,23143
/opal/branches/v3_6:22169,22178,22184,22186,22197,22204,22216,22251,22253,22255,22258,22260,22291,22296,22300,22306,22308,22313,22319,22336,22353,22358,22436,22447,22449,22497,22511,22517,22519-22521,22527,22536,22538,22589,22596,22599,22617,22620,22622,22630,22640,22655,22675,22682,22726-22728,22730,22733,22738,22745-22746,22800,22820-22821,22842,22844-22845,22851,22853,22889,22896,22902,22904,22906,22924,22928,22946,22965,22967,22976,22978,22980,22982,22994,23028,23123,23125-23126,23128,23157,23165
/opal/trunk:22308
/ptlib/trunk:20820

Modified: opal/trunk/include/codec/vidcodec.h
===================================================================
--- opal/trunk/include/codec/vidcodec.h	2009-07-29 04:57:29 UTC (rev 23165)
+++ opal/trunk/include/codec/vidcodec.h	2009-07-29 05:04:11 UTC (rev 23166)
@@ -159,10 +159,8 @@
     bool   forceIFrame;
     bool   lastFrameWasIFrame;
 
-#if OPAL_STATISTICS
     DWORD m_totalFrames;
     DWORD m_keyFrames;
-#endif
 };
 
 

Modified: opal/trunk/src/codec/opalpluginmgr.cxx
===================================================================
--- opal/trunk/src/codec/opalpluginmgr.cxx	2009-07-29 04:57:29 UTC (rev 23165)
+++ opal/trunk/src/codec/opalpluginmgr.cxx	2009-07-29 05:04:11 UTC (rev 23166)
@@ -864,11 +864,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)
@@ -945,11 +943,9 @@
             PTRACE(5, "OpalPlugin\tVideo decoder returned I-frame");
           }
 
-#if OPAL_STATISTICS
           m_totalFrames++;
           if (lastFrameWasIFrame)
             m_keyFrames++;
-#endif
         }
       }
     }

Modified: opal/trunk/src/codec/vidcodec.cxx
===================================================================
--- opal/trunk/src/codec/vidcodec.cxx	2009-07-29 04:57:29 UTC (rev 23165)
+++ opal/trunk/src/codec/vidcodec.cxx	2009-07-29 05:04:11 UTC (rev 23166)
@@ -99,10 +99,8 @@
   , videoEncoderMaxOutputSize(10*1024)
   , forceIFrame(true)
   , lastFrameWasIFrame(false)
-#if OPAL_STATISTICS
   , m_totalFrames(0)
   , m_keyFrames(0)
-#endif
 {
   acceptEmptyPayload = true;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.