Changeset 1355 in 3DVCSoftware for branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon

Timestamp:

26 Oct 2015, 14:16:11 (9 years ago)

Author:

tech

Message:

• Clean-up.
• Fix NH_3D_FIX_NBDV_COL.

Location:

branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon

Files:

• SEI.cpp (modified) (3 diffs)
• TComDataCU.cpp (modified) (1 diff)
• TComRom.cpp (modified) (2 diffs)
• TypeDef.h (modified) (2 diffs)

branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/SEI.cpp

@@ -1474 +1474 @@
   xAddGeneralOpts( opts , defAppLayerIds, defAppPocs, defAppTids, defAppVclNaluTypes, defSeiNaluId, defPositionInSeiNalu, defModifyByEncoder );
 
-  // 3 = m_numConstituentViewsGvdMinus1 + 2
   opts.addOptions()
     ("AlternativeDepthInfoCancelFlag" , m_alternativeDepthInfoCancelFlag  , false               , "AlternativeDepthInfoCancelFlag"  )
@@ -1618 +1617 @@
 };
 
-/*
-UInt SEIAlternativeDepthInfo::getManGvdRLen                  ( Int i, int j, int k ) const
-{
-  UInt rval;
-  rval = xGetSyntaxElementLen( m_expGvdR[i][j][k], m_precGvdRotationParam, m_manGvdR[i][j][k] );
-  if (rval == 0)
-    return m_precGvdRotationParam;
-  else
-    return rval;
-};
-*/
-
 UInt SEIAlternativeDepthInfo::getManGvdTXLen                 ( Int i, int j ) const
 {
@@ -1652 +1639 @@
   }
 
-#if DEBUG_NH_3D_SEI
-  printf("DEBUG: SEIAlternativeDepthInfo::xGetSyntaxElementLen(): val: %d, len %u\n", val, len);
-#endif
   assert( val >= 0 );
   assert( val <= ( ( 1 << len )- 1) );

branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/TComDataCU.cpp

@@ -5466 +5466 @@
     }
 
+#if NH_3D_FIX_NBDV_COL
+    // The picture pColCU->getSlice()->getRefPic(eColRefPicList, iColRefIdx) might not be in DPB anymore
+    // So don't access it directly.
+    iColRefViewIdx = pColCU->getSlice()->getVPS()->getViewOrderIdx( pColCU->getSlice()->getRefLayerId( eColRefPicList, iColRefIdx ) );       
+#else
     iColRefViewIdx = pColCU->getSlice()->getRefPic(eColRefPicList, iColRefIdx)->getViewIndex();
+#endif
+
 
     if ( iColViewIdx    == iColRefViewIdx ) // temporal vector

branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/TComRom.cpp

@@ -537 +537 @@
 const Bool g_bEncDecTraceEnable  = true;
 const Bool g_bEncDecTraceDisable = false;
-Bool   g_HLSTraceEnable = true;
+Bool   g_HLSTraceEnable = false;
 Bool   g_bJustDoIt = false;
 UInt64 g_nSymbolCounter = 0;
@@ -544 +544 @@
 Bool g_tracePU = false; 
 Bool g_traceTU = false; 
-Bool g_disableNumbering = true; 
+Bool g_disableNumbering = false; 
 Bool g_disableHLSTrace = false; 
 UInt64 g_stopAtCounter       = 4660; 

branches/HTM-15.1-dev0-NICT/source/Lib/TLibCommon/TypeDef.h

@@ -77 +77 @@
 #if NH_3D
 #define H_3D_FIX_ARP_CHECK_NOT_IN_DPB     1
+#define NH_3D_FIX_NBDV_COL                1
 #endif
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -359 +360 @@
 #define RExt__DECODER_DEBUG_BIT_STATISTICS                0 ///< 0 (default) = decoder reports as normal, 1 = decoder produces bit usage statistics (will impact decoder run time by up to ~10%)
 #endif
-#if NH_3D
-#define DEBUG_NH_3D_SEI                                   0 ///< When enabled, prints out SEI values
-#endif
 // This can be enabled by the makefile
 #if !NH_MV