Changeset 323 in SHVCSoftware for branches/SHM-3.0-dev

Timestamp:

2 Aug 2013, 22:59:06 (11 years ago)

Author:

seregin

Message:

cleanup ZERO_NUM_DIRECT_LAYERS

Location:

branches/SHM-3.0-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncGOP.cpp (modified) (4 diffs)
• TLibEncoder/TEncTop.cpp (modified) (1 diff)

branches/SHM-3.0-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -385 +385 @@
 
 #if REF_IDX_FRAMEWORK
-#if ZERO_NUM_DIRECT_LAYERS
   if( m_layerId == 0 || ( m_layerId > 0 && ( m_activeNumILRRefIdx == 0 || !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) && (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) ) ) )
-#else
-  if ((getLayerId() == 0) || 
-      ((getSPS()->getLayerId()) &&  !((getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
-       (getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA)) )
-     )
-#endif
   {
 #endif
@@ -458 +451 @@
 #if ILR_RESTR
     Int maxSubLayerForILPPlus1 = ( m_layerId > 0 && m_activeNumILRRefIdx > 0)? m_pcVPS->getMaxSublayerForIlpPlus1(ilpPic[refLayerIdc]->getSlice(0)->getLayerId()) : 0;
-#if ZERO_NUM_DIRECT_LAYERS
     if( m_layerId > 0 && m_activeNumILRRefIdx > 0 && ( ( (Int)(ilpPic[refLayerIdc]->getSlice(0)->getTLayer())<=  maxSubLayerForILPPlus1-1) || (maxSubLayerForILPPlus1==0 && ilpPic[refLayerIdc]->getSlice(0)->getRapPicFlag()) )  ) 
-#else
-    if( m_layerId > 0 && ( ( (Int)(ilpPic[refLayerIdc]->getSlice(0)->getTLayer())<=maxSubLayerForILPPlus1-1) || (maxSubLayerForILPPlus1==0 && ilpPic[refLayerIdc]->getSlice(0)->getRapPicFlag()) )  )
-#endif
 #else //#if ILR_RESTR
-#if ZERO_NUM_DIRECT_LAYERS
     if( m_layerId > 0 && m_activeNumILRRefIdx > 0 )
-#else
-    if( m_layerId > 0 )
-#endif
 #endif //#if ILR_RESTR
     {

branches/SHM-3.0-dev/source/Lib/TLibCommon/TypeDef.h

@@ -96 +96 @@
 #define JCTVC_M0458_INTERLAYER_RPS_SIG   1      ///< implementation of JCTVC-L0178
 #if JCTVC_M0458_INTERLAYER_RPS_SIG
-#define ZERO_NUM_DIRECT_LAYERS           1      ///< support of zero direct reference layers
 #define MAX_ONE_RESAMPLING_DIRECT_LAYERS 1      ///< Allow maximum of one resampling process for direct reference layers
 #endif

branches/SHM-3.0-dev/source/Lib/TLibDecoder/TDecTop.cpp

@@ -907 +907 @@
 
 #if REF_IDX_FRAMEWORK
-#if ZERO_NUM_DIRECT_LAYERS
     if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
-#else
-    if(m_layerId > 0)
-#endif
     {
       setILRPic(pcPic);
@@ -1315 +1311 @@
   if( vps->getNumDirectRefLayers( m_layerId ) <= 0 )
   {
-#if ZERO_NUM_DIRECT_LAYERS
     return (TDecTop *)getLayerDec( 0 );
-#else
-    return NULL;
-#endif
   }
   

branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncGOP.cpp

@@ -645 +645 @@
       pcSlice->setNalUnitType(NAL_UNIT_CODED_SLICE_CRA);
     }
-#if ZERO_NUM_DIRECT_LAYERS
+
     if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 && pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP && pcSlice->getNalUnitType() <= NAL_UNIT_CODED_SLICE_CRA )
     {
       pcSlice->setSliceType(I_SLICE);
     }
-    else
-#endif
-    if( m_layerId > 0 && !m_pcEncTop->getElRapSliceTypeB() )
+    else if( m_layerId > 0 && !m_pcEncTop->getElRapSliceTypeB() )
     {
       if( (pcSlice->getNalUnitType() >= NAL_UNIT_CODED_SLICE_BLA_W_LP) &&
@@ -760 +758 @@
 
 #if REF_IDX_FRAMEWORK
-#if ZERO_NUM_DIRECT_LAYERS
     if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
-#else
-    if(m_layerId > 0)
-#endif
     {
 #if RESTR_CHK
@@ -820 +814 @@
     //  Set reference list
 #if REF_IDX_FRAMEWORK
-#if ZERO_NUM_DIRECT_LAYERS
     if(m_layerId ==  0 || ( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() == 0 ) )
-#else
-    if(m_layerId ==  0)
-#endif
     {
       pcSlice->setRefPicList( rcListPic);
@@ -832 +822 @@
 #endif
 #if REF_IDX_FRAMEWORK
-#if ZERO_NUM_DIRECT_LAYERS
     if( m_layerId > 0 && pcSlice->getActiveNumILRRefIdx() )
-#else
-    if(m_layerId > 0)
-#endif
     {
       m_pcEncTop->setILRPic(pcPic);

branches/SHM-3.0-dev/source/Lib/TLibEncoder/TEncTop.cpp

@@ -1204 +1204 @@
   if( m_ppcTEncTop[m_layerId]->getNumDirectRefLayers() <= 0 )
   {
-#if ZERO_NUM_DIRECT_LAYERS
     return (TEncTop *)getLayerEnc( 0 );
-#else
-    return NULL;
-#endif
   }