Changeset 1103 in 3DVCSoftware for branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncGOP.cpp

Timestamp:

5 Nov 2014, 11:34:26 (9 years ago)

Author:

tech

Message:

HHI_DEPENDENCY_SIGNALLING_I1_J0107: Integrated IdRefListLayers.

File:

• branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncGOP.cpp (modified) (2 diffs)

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -880 +880 @@
 
     TComVPS*           vps = pcSlice->getVPS();     
+#if HHI_DEPENDENCY_SIGNALLING_I1_J0107
+#if H_3D
+    Int numDirectRefLayers = vps    ->getNumRefListLayers( getLayerId() ); 
+#else
     Int numDirectRefLayers = vps    ->getNumDirectRefLayers( getLayerId() ); 
+#endif
+#else
+    Int numDirectRefLayers = vps    ->getNumDirectRefLayers( getLayerId() ); 
+#endif
     GOPEntry gopEntry      = m_pcCfg->getGOPEntry( (pcSlice->getRapPicFlag() && getLayerId() > 0) ? MAX_GOP : iGOPid );     
     
@@ -893 +901 @@
           pcSlice->setNumInterLayerRefPicsMinus1( gopEntry.m_numActiveRefLayerPics - 1 ); 
         }
+#if HHI_DEPENDENCY_SIGNALLING_I1_J0107
+#if H_3D
+        if ( gopEntry.m_numActiveRefLayerPics != vps->getNumRefListLayers( getLayerId() ) )
+#else
         if ( gopEntry.m_numActiveRefLayerPics != vps->getNumDirectRefLayers( getLayerId() ) )
+#endif
+#else
+        if ( gopEntry.m_numActiveRefLayerPics != vps->getNumDirectRefLayers( getLayerId() ) )
+#endif
         {        
           interLayerPredLayerIdcPresentFlag = true;