Changeset 56 in 3DVCSoftware for trunk/source/App/TAppRenderer

Timestamp:

11 May 2012, 21:20:17 (13 years ago)

Author:

hschwarz

Message:

updated trunk (move to HM6.1)

Location:

trunk/source/App/TAppRenderer

Files:

• RendererMain.cpp (modified) (1 diff)
• TAppRendererCfg.cpp (modified) (2 diffs)
• TAppRendererCfg.h (modified) (1 diff)
• TAppRendererTop.cpp (modified) (6 diffs)
• TAppRendererTop.h (modified) (1 diff)

trunk/source/App/TAppRenderer/RendererMain.cpp

@@ -47 +47 @@
   // print information
   fprintf( stdout, "\n" );
-  fprintf( stdout, "Multiview Video plus Depth Renderer: Renderer Version [%s]", NV_VERSION );
+  fprintf( stdout, "3D-HTM software: Renderer Version [%s]", NV_VERSION);  
   fprintf( stdout, NVM_ONOS );
   fprintf( stdout, NVM_COMPILEDBY );

trunk/source/App/TAppRenderer/TAppRendererCfg.cpp

@@ -43 +43 @@
 
 #include "TAppRendererCfg.h"
-#include "../../App/TAppCommon/program_options_lite.h"
+#include "../../Lib/TAppCommon/program_options_lite.h"
 
 
@@ -496 +496 @@
     iCurPrec = 0;
     for ( Int iCur = aiIn[uiK]; iCur != 0; iCur /= 10, iCurPrec++ );
-    iPrecBefore = Max(iPrecBefore, iCurPrec - LOG10_VIEW_NUM_PREC );
+    iPrecBefore = max(iPrecBefore, iCurPrec - LOG10_VIEW_NUM_PREC );
 
     iCurPrec = 0;
     for ( Int iCur = 1;  aiIn[uiK] % iCur == 0; iCur *= 10, iCurPrec++);
     iCurPrec = LOG10_VIEW_NUM_PREC - Min(LOG10_VIEW_NUM_PREC, iCurPrec-1 );
-    iPrecAfter = Max(iPrecAfter, iCurPrec );
+    iPrecAfter = max(iPrecAfter, iCurPrec );
   }
 }

trunk/source/App/TAppRenderer/TAppRendererCfg.h

@@ -44 +44 @@
 #define __TAppRENDERERCFG__
 
-#include "../TAppCommon/TAppComCamPara.h"
+#include "../../Lib/TAppCommon/TAppComCamPara.h"
 #include "../../Lib/TLibCommon/CommonDef.h"
-#include "../../Lib/TLibCommon/TComMVDRefData.h"
 #include "../../Lib/TLibRenderer/TRenModel.h"
 #include "../../Lib/TLibRenderer/TRenModSetupStrParser.h"

trunk/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -188 +188 @@
     {
       m_apcTVideoIOYuvVideoInput[iBaseViewIdx]->read( apcPicYuvBaseVideo[iBaseViewIdx], aiPad  ) ;
+
       apcPicYuvBaseVideo[iBaseViewIdx]->extendPicBorder();
+
       bAnyEOS |= m_apcTVideoIOYuvVideoInput[iBaseViewIdx]->isEof();
 
@@ -209 +211 @@
     }
 
-    m_cCameraData.update( (UInt)iFrame );
+    m_cCameraData.update( (UInt)iFrame - m_iFrameSkip );
 
     for(Int iSynthViewIdx=0; iSynthViewIdx < m_iNumberOfOutputViews; iSynthViewIdx++ )
@@ -423 +425 @@
 
       // Write Output
+
+#if PIC_CROPPING
+      m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, 0, 0, 0, 0 );
+#else
       m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, aiPad );
+#endif
     }
     iFrame++;
@@ -645 +652 @@
 
           // Write Output
+#if PIC_CROPPING
+          m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iModelNum]->write( pcPicYuvSynthOut, 0 ,0 ,0, 0 );
+#else
           m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iModelNum]->write( pcPicYuvSynthOut, aiPad );
+#endif
         }
       }
@@ -837 +848 @@
 
       // Write Output
+#if PIC_CROPPING
+      m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, 0, 0, 0, 0 );
+#else
       m_apcTVideoIOYuvSynthOutput[m_bSweep ? 0 : iSynthViewIdx]->write( pcPicYuvSynthOut, aiPad );
+#endif
     }
     iFrame++;
@@ -963 +978 @@
 
       // Write Output
+#if PIC_CROPPING
+      m_apcTVideoIOYuvSynthOutput[iViewIdx-1]->write( pcPicYuvSynthOut, 0, 0, 0 );
+#else
       m_apcTVideoIOYuvSynthOutput[iViewIdx-1]->write( pcPicYuvSynthOut, aiPad );
+#endif
 
     }

trunk/source/App/TAppRenderer/TAppRendererTop.h

@@ -46 +46 @@
 #include "../../Lib/TLibRenderer/TRenTop.h"
 #include "../../Lib/TLibVideoIO/TVideoIOYuv.h"
-#include "../../Lib/TLibVideoIO/TVideoIOBits.h"
-#include "../../Lib/TLibCommon/TComBitStream.h"
 #include "TAppRendererCfg.h"
 #include "TAppRendererTop.h"