Changeset 21 in 3DVCSoftware for trunk/source/App

Timestamp:

15 Feb 2012, 19:05:04 (13 years ago)

Author:

hschwarz

Message:

updated with HHI branch (0.2-HHI)

Location:

trunk/source/App

Files:

• TAppCommon/TAppComCamPara.cpp (modified) (2 diffs)
• TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• TAppDecoder/TAppDecTop.h (modified) (1 diff)
• TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• TAppEncoder/TAppEncTop.cpp (modified) (1 diff)

trunk/source/App/TAppCommon/TAppComCamPara.cpp

@@ -984 +984 @@
   xGetCameraShifts( 0, iMinAbsVOIId, m_uiFirstFrameId, dCamPosShift, dPicPosShift );
   Double  dCamPosShiftVOI01     = dCamPosShift / Double( iMinVOI );
-  Double  dAbsCamPosShiftVOI01  = ( dCamPosShiftVOI01 < 0.0 ? -dCamPosShiftVOI01 : dCamPosShiftVOI01 );
 
   //--- determine maximum absolute camera position shift, precision, and base scale ---
@@ -997 +996 @@
     }
   }
+  Int     iPrecision  = 0;  
+#if 0 // enabling this lines might be reasonable, but produces different results for the 2 view and 3 view test cases
   Double  dEpsilon    = 1e-15;
+  Double  dAbsCamPosShiftVOI01  = ( dCamPosShiftVOI01 < 0.0 ? -dCamPosShiftVOI01 : dCamPosShiftVOI01 );
   Double  dShiftRatio = dMaxAbsCamPosShift / dAbsCamPosShiftVOI01 - dEpsilon;
-  Int     iPrecision  = 0;  for( ; (Double)( 1 << iPrecision ) < dShiftRatio; iPrecision++ );
+  for( ; (Double)( 1 << iPrecision ) < dShiftRatio; iPrecision++ );
+#endif
   Int     iPrecShift  = iPrecision + PDM_INTER_CALC_SHIFT + PDM_VIRT_DEPTH_PRECISION - 2;
   AOF(    iPrecShift  < PDM_INTERNAL_CALC_BIT_DEPTH );

trunk/source/App/TAppDecoder/TAppDecTop.cpp

@@ -352 +352 @@
   m_acTDecTopList[0]->setPictureDigestEnabled(m_pictureDigestEnabled);
   m_acTDecTopList[0]->setCamParsCollector( &m_cCamParsCollector );
+#if SONY_COLPIC_AVAILABILITY
+  m_acTDecTopList[0]->setViewOrderIdx(0);
+#endif
 }
 

trunk/source/App/TAppDecoder/TAppDecTop.h

@@ -105 +105 @@
   TComSPSAccess*    getSPSAccess  () { return &m_cSPSAccess;   }
   TComAUPicAccess*  getAUPicAccess() { return &m_cAUPicAccess; }
+  TDecTop*          getDecTop0    () { return m_acTDecTopList[0]; }
 #endif
 

trunk/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -268 +268 @@
     // GT: For development, will be removed later
   ("VSOMode",                         m_uiVSOMode               , (UInt)   4    , "VSO Mode")
+#if HHI_VSO_LS_TABLE
+  ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 1  , "Lambda Scaling for VSO")
+#else
   ("LambdaScaleVSO",                  m_dLambdaScaleVSO         , (Double) 0.5  , "Lambda Scaling for VSO")
+#endif
     ("ForceLambdaScaleVSO",             m_bForceLambdaScaleVSO    , false         , "Force using Lambda Scale VSO also in non-VSO-Mode")
 #if HHI_VSO_DIST_INT
@@ -479 +483 @@
     }
   }
+
+#if HHI_VSO_LS_TABLE
+  // Q&D
+  Double adLambdaScaleTable[] = 
+  {  0.031250, 0.031639, 0.032029, 0.032418, 0.032808, 0.033197, 0.033586, 0.033976, 0.034365, 0.034755, 
+     0.035144, 0.035533, 0.035923, 0.036312, 0.036702, 0.037091, 0.037480, 0.037870, 0.038259, 0.038648, 
+     0.039038, 0.039427, 0.039817, 0.040206, 0.040595, 0.040985, 0.041374, 0.041764, 0.042153, 0.042542, 
+     0.042932, 0.043321, 0.043711, 0.044100, 0.044194, 0.053033, 0.061872, 0.070711, 0.079550, 0.088388, 
+     0.117851, 0.147314, 0.176777, 0.235702, 0.294628, 0.353553, 0.471405, 0.589256, 0.707107, 0.707100, 
+     0.753550, 0.800000  
+  }; 
+  AOT( (m_aiQP[1] < 0) || (m_aiQP[1] > 51));
+  m_dLambdaScaleVSO *= adLambdaScaleTable[m_aiQP[1]]; 
+#endif
 #endif
 
@@ -629 +647 @@
   xConfirmPara    ( m_iCodedCamParPrecision < 0 || m_iCodedCamParPrecision > 5,       "CodedCamParsPrecision must be in range of 0..5" );
 #if DEPTH_MAP_GENERATION
-  xConfirmPara    ( m_uiPredDepthMapGeneration > 3,                                   "PredDepthMapGen must be less than or equal to 3" );
+  xConfirmPara    ( m_uiPredDepthMapGeneration > 2,                                   "PredDepthMapGen must be less than or equal to 2" );
   xConfirmPara    ( m_uiPredDepthMapGeneration >= 2 && !m_bUsingDepthMaps,            "PredDepthMapGen >= 2 requires CodeDepthMaps = 1" );
 #endif

trunk/source/App/TAppEncoder/TAppEncTop.cpp

@@ -583 +583 @@
   //GT: setup and init Bools for Eos and Continue Reading
   Bool  bAllEos = false;
-  Bool  bAllContinueReadingPics;
+  Bool  bAllContinueReadingPics = false;
   std::vector<Bool>  bEos ;
   std::vector<Bool>  bContinueReadingPics ;
 
   Bool  bAllDepthEos = false;
-  Bool  bAllContinueReadingDepthPics;
+  Bool  bAllContinueReadingDepthPics = false;
   std::vector<Bool>  bDepthEos ;
   std::vector<Bool>  bContinueReadingDepthPics ;