Changeset 479 in 3DVCSoftware for branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

Timestamp:

18 Jun 2013, 23:24:53 (11 years ago)

Author:

tech

Message:

• changed IV-MERGE HLS to match Test Model 4 spec
• incorporated iv-refpic list to TComSlice
• removed TComDepthMapGenerator

File:

• branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)

branches/HTM-DEV-0.3-dev2/source/App/TAppEncoder/TAppEncCfg.cpp

@@ -718 +718 @@
 #endif //HHI_VSO
 #if H_3D_IV_MERGE
-  ("PredDepthMapGen",  m_uiPredDepthMapGeneration, (UInt)0, "generation of prediction depth maps for motion data prediction" )
-  ("MultiviewMvPred",  m_uiMultiviewMvPredMode,    (UInt)0, "usage of predicted depth maps" )
+  ("IvMvPred",                       m_ivMvPredFlag,           false           , "inter view motion prediction " )  
 #endif
 #endif //H_3D
@@ -1443 +1442 @@
   xConfirmPara( ((UInt) m_numberOfLayers >> 1 ) != m_cCameraData.getBaseViewNumbers().size(),   "Number of Views in BaseViewCameraNumbers must be equal to NumberOfViews" );
   xConfirmPara    ( m_iCodedCamParPrecision < 0 || m_iCodedCamParPrecision > 5,       "CodedCamParsPrecision must be in range of 0..5" );
-#if H_3D_IV_MERGE
-  xConfirmPara    ( m_uiPredDepthMapGeneration > 2,                                   "PredDepthMapGen must be less than or equal to 2" );
-  xConfirmPara    ( m_uiMultiviewMvPredMode > 7,                                      "MultiviewMvPred must be less than or equal to 7" );  
-  xConfirmPara    ( m_uiMultiviewMvPredMode > 0 && m_uiPredDepthMapGeneration == 0 ,  "MultiviewMvPred > 0 requires PredDepthMapGen > 0" );
-#endif
 #if H_3D_VSO
     if( m_bUseVSO )
@@ -2288 +2282 @@
 #endif
 #if H_3D_IV_MERGE
-  printf("MultiviewMvPred:%d", m_uiMultiviewMvPredMode);
+  printf("IvMvPred:%d", m_ivMvPredFlag );
 #endif
   printf("\n\n");