Changeset 1131 in 3DVCSoftware for branches/HTM-13.0-dev0/source/Lib/TLibDecoder/TDecTop.cpp

Timestamp:

18 Feb 2015, 17:39:40 (10 years ago)

Author:

tech

Message:

Cleanup.

File:

• branches/HTM-13.0-dev0/source/Lib/TLibDecoder/TDecTop.cpp (modified) (3 diffs)

branches/HTM-13.0-dev0/source/Lib/TLibDecoder/TDecTop.cpp

@@ -726 +726 @@
 
 #endif
-#if HHI_TOOL_PARAMETERS_I2_J0107
 #if H_3D
   m_apcSlicePilot->init3dToolParameters();
-#endif
 #endif
   pps->setSPS(sps);
@@ -1087 +1085 @@
     pcSlice->getTempRefPicLists( m_cListPic, m_refPicSetInterLayer0, m_refPicSetInterLayer1, tempRefPicLists, usedAsLongTerm, numPocTotalCurr);
     pcSlice->setRefPicList     ( tempRefPicLists, usedAsLongTerm, numPocTotalCurr, true ); 
-
-#if SEC_ARP_VIEW_REF_CHECK_J0037 || SEC_DBBP_VIEW_REF_CHECK_J0037
+#if H_3D
     pcSlice->setDefaultRefView();
 #endif
-
 #if H_3D_ARP
     pcSlice->setARPStepNum(m_ivPicLists);
@@ -1244 +1240 @@
   TComVPS* vps = m_parameterSetManagerDecoder.getPrefetchedVPS( 0 ); 
   assert( vps != 0 );
-#if HHI_TOOL_PARAMETERS_I2_J0107
   m_cEntropyDecoder.decodeSPS( sps );
-#else
-  m_cEntropyDecoder.decodeSPS( sps, vps->getViewIndex( m_layerId ), ( vps->getDepthId( m_layerId ) == 1 ) );
-#endif
 #else
   m_cEntropyDecoder.decodeSPS( sps );