Changeset 608 in 3DVCSoftware for trunk/source/App/TAppRenderer/TAppRendererTop.cpp

Timestamp:

1 Sep 2013, 22:47:26 (11 years ago)

Author:

tech

Message:

Merged DEV-2.0-dev0@604.

File:

• trunk/source/App/TAppRenderer/TAppRendererTop.cpp (modified) (12 diffs)

trunk/source/App/TAppRenderer/TAppRendererTop.cpp

@@ -33 +33 @@
 
 
-
 #include <list>
 #include <stdio.h>
@@ -42 +41 @@
 #include "TAppRendererTop.h"
 
+#if H_3D
+
 // ====================================================================================================================
 // Constructor / destructor / initialization / destroy
 // ====================================================================================================================
-#if !QC_MVHEVC_B0046
+
 TAppRendererTop::TAppRendererTop()
 {
@@ -59 +60 @@
 Void TAppRendererTop::xCreateLib()
 {
-  Int iInteralBitDepth = g_uiBitDepth + g_uiBitIncrement;
-  Int iFileBitDepth    = 8;
   m_pcRenTop = new TRenTop();
 
@@ -68 +67 @@
     TVideoIOYuv* pcDepthInput = new TVideoIOYuv;
 
-    pcVideoInput->open( m_pchVideoInputFileList[iViewIdx], false, iFileBitDepth, iInteralBitDepth );  // read mode
-    pcDepthInput->open( m_pchDepthInputFileList[iViewIdx], false, iFileBitDepth, iInteralBitDepth );  // read mode
+    pcVideoInput->open( m_pchVideoInputFileList[iViewIdx], false, m_inputBitDepthY, m_inputBitDepthC, m_internalBitDepthY, m_internalBitDepthC);  // read mode
+    pcDepthInput->open( m_pchDepthInputFileList[iViewIdx], false, m_inputBitDepthY, m_inputBitDepthC, m_internalBitDepthY, m_internalBitDepthC  );  // read mode
     pcVideoInput->skipFrames(m_iFrameSkip, m_iSourceWidth, m_iSourceHeight  );
     pcDepthInput->skipFrames(m_iFrameSkip, m_iSourceWidth, m_iSourceHeight  );
@@ -80 +79 @@
   {
     TVideoIOYuv* pcSynthOutput = new TVideoIOYuv;
-    pcSynthOutput->open( m_pchSynthOutputFileList[iViewIdx], true, iFileBitDepth, iInteralBitDepth );  // write mode
+    pcSynthOutput->open( m_pchSynthOutputFileList[iViewIdx], true, m_outputBitDepthY, m_outputBitDepthC, m_internalBitDepthY, m_internalBitDepthC );  // write mode
     m_apcTVideoIOYuvSynthOutput.push_back( pcSynthOutput );
   }
@@ -469 +468 @@
     render();
     break;
+#if H_3D_VSO
   case 1:
     renderModel();
     break;
+#endif
   case 10:
     renderUsedPelsMap( );
       break;
-
   default:
     AOT(true);
   }
-}
-
+
+#if H_3D_REN_MAX_DEV_OUT
+  Double dMaxDispDiff = m_cCameraData.getMaxShiftDeviation(); 
+
+  if ( !(dMaxDispDiff < 0) )
+  {  
+    printf("\n Max. possible shift error: %12.3f samples.\n", dMaxDispDiff );
+  }
+#endif
+}
+
+#if H_3D_VSO
 Void TAppRendererTop::renderModel()
 {
@@ -493 +503 @@
 }
 
+
+
 Void TAppRendererTop::xRenderModelFromString()
 {
-
     xCreateLib();
     xInitLib();
@@ -522 +533 @@
 
     AOT( m_iLog2SamplingFactor != 0 );
-#if LGE_VSO_EARLY_SKIP_A0093
+#if H_3D_VSO_EARLY_SKIP
     cCurModel.create( m_cRenModStrParser.getNumOfBaseViews(), m_cRenModStrParser.getNumOfModels(), m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false );
 #else
@@ -683 +694 @@
 }
 
+
 Void TAppRendererTop::xRenderModelFromNums()
 {
@@ -700 +712 @@
   AOT( m_iLog2SamplingFactor != 0 );
   cCurModel.setupPart( 0, m_iSourceHeight  ); 
-#if LGE_VSO_EARLY_SKIP_A0093
+#if H_3D_VSO_EARLY_SKIP
   cCurModel.create( m_iNumberOfInputViews, m_iNumberOfOutputViews, m_iSourceWidth, m_iSourceHeight, m_iShiftPrecision, m_iBlendHoleMargin, false );
 #else
@@ -880 +892 @@
 
 }
+#endif
 
 Void TAppRendererTop::renderUsedPelsMap( )
@@ -932 +945 @@
   while ( ( ( iNumOfRenderedFrames < m_iFramesToBeRendered ) || ( m_iFramesToBeRendered == 0 ) ) && !bAnyEOS )
   {
-
-
     if ( iFrame >= m_iFrameSkip )
     {