Changeset 1210 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder

Timestamp:

8 Jul 2015, 22:47:39 (10 years ago)

Author:

seregin

Message:

macro cleanup: POC_RESET_IDC_DECODER, POC_RESET_IDC

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (3 diffs)
• TDecTop.cpp (modified) (9 diffs)
• TDecTop.h (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp ¶

@@ -1285 +1285 @@
       READ_CODE(sps->getBitsForPOC(), uiCode, "pic_order_cnt_lsb");
 #if SVC_EXTENSION
-#if POC_RESET_IDC_DECODER
       pcSlice->setPicOrderCntLsb( uiCode );
-#endif
+
       iPOClsb = uiCode;
 #else
@@ -1320 +1319 @@
 #if SVC_EXTENSION
     }
-#if POC_RESET_IDC_DECODER
     else
     {
       pcSlice->setPicOrderCntLsb( 0 );
     }
-#endif
+
     if( !pcSlice->getIdrPicFlag() )
     {
@@ -1988 +1986 @@
     }
 
-#if !POC_RESET_IDC_DECODER
-    Int maxPocLsb  = 1 << pcSlice->getSPS()->getBitsForPOC();
-#endif
     if( pcSlice->getPocMsbValPresentFlag() )
     {
       READ_UVLC( uiCode,    "poc_msb_cycle_val");             pcSlice->setPocMsbVal( uiCode );
-
-#if !POC_RESET_IDC_DECODER
-      // Update POC of the slice based on this MSB val
-      Int pocLsb     = pcSlice->getPOC() % maxPocLsb;
-      pcSlice->setPOC((pcSlice->getPocMsbVal() * maxPocLsb) + pocLsb);
-    }
-    else
-    {
-      pcSlice->setPocMsbVal( pcSlice->getPOC() / maxPocLsb );
-#endif
     }
 

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

@@ -108 +108 @@
   m_firstPicInLayerDecodedFlag = false;  
 #endif
-#if POC_RESET_IDC_DECODER
   m_parseIdc = -1;
   m_lastPocPeriodId = -1;
   m_prevPicOrderCnt = 0;
-#endif
 #if Q0048_CGS_3D_ASYMLUT
   m_pColorMappedPic = NULL;
@@ -863 +861 @@
   }
 
-#if POC_RESET_IDC_DECODER
+#if SVC_POC
   if( m_parseIdc != -1 ) // Second pass for a POC resetting picture
   {
@@ -956 +954 @@
 
 #if ALIGNED_BUMPING
-#if POC_RESET_IDC_DECODER
   UInt affectedLayerList[MAX_LAYERS];
   Int  numAffectedLayers;
@@ -1136 +1133 @@
       }
     }
-#else
-  if (bNewPOC || m_layerId!=m_uiPrevLayerId)
-  {
-#endif
     m_apcSlicePilot->applyReferencePictureSet(m_cListPic, m_apcSlicePilot->getRPS());
   }
-#endif
-#if POC_RESET_IDC_DECODER
-  if (!m_apcSlicePilot->getDependentSliceSegmentFlag() && (bNewPOC || m_layerId!=m_uiPrevLayerId || m_parseIdc == 1) && !m_bFirstSliceInSequence )
+
+  if( !m_apcSlicePilot->getDependentSliceSegmentFlag() && (bNewPOC || m_layerId!=m_uiPrevLayerId || m_parseIdc == 1) && !m_bFirstSliceInSequence )
 #else
   if (!m_apcSlicePilot->getDependentSliceSegmentFlag() && (bNewPOC || m_layerId!=m_uiPrevLayerId) && !m_bFirstSliceInSequence )
@@ -1155 +1147 @@
   }
 
-#if SVC_EXTENSION
-#if POC_RESET_IDC_DECODER
   m_parseIdc = -1;
-#endif
 
   if( m_apcSlicePilot->getTLayer() == 0 && m_apcSlicePilot->getEnableTMVPFlag() == 0 )
@@ -1181 +1170 @@
   }
   m_apcSlicePilot->setAvailableForTMVPRefFlag( true );
-#endif
 
   // actual decoding starts here
   xActivateParameterSets();
 
-#if SVC_EXTENSION
   // Initialize ILRP if needed, only for the current layer  
   // ILRP intialization should go along with activation of parameters sets, 
   // although activation of parameter sets itself need not be done for each and every slice!!!
   xInitILRP(m_apcSlicePilot);
-#endif
 
   if (!m_apcSlicePilot->getDependentSliceSegmentFlag()) 
@@ -1414 +1400 @@
     xGetNewPicBuffer (m_apcSlicePilot, m_pcPic);
 
-#if POC_RESET_IDC_DECODER
+#if SVC_POC
     m_pcPic->setCurrAuFlag( true );
 
@@ -2466 +2452 @@
 }
 
-#if POC_RESET_IDC_DECODER
 Void TDecTop::markAllPicsAsNoCurrAu(TComVPS *vps)
 {
@@ -2481 +2466 @@
   }
 }
-#endif
+
 #if Q0048_CGS_3D_ASYMLUT
 Void TDecTop::initAsymLut(TComSlice *pcSlice)

branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.h ¶

@@ -150 +150 @@
   Bool                    m_firstPicInLayerDecodedFlag;
 #endif
-#if POC_RESET_IDC_DECODER
   Int                     m_parseIdc;
   Int                     m_lastPocPeriodId;
   Int                     m_prevPicOrderCnt;
-#endif
 #if CONFORMANCE_BITSTREAM_MODE
   Bool m_confModeFlag;
@@ -212 +210 @@
 
 #if SVC_EXTENSION
-#if POC_RESET_IDC_DECODER
   Int       getParseIdc                     ()                              { return m_parseIdc;               }
   Void      setParseIdc                     (Int x)                         { m_parseIdc = x;                  }
@@ -222 +219 @@
   Int       getPrevPicOrderCnt              ()                              { return m_prevPicOrderCnt;        }
   Void      setPrevPicOrderCnt              (Int const x)                   { m_prevPicOrderCnt = x;           }
-#endif
+
   UInt      getLayerId                      ()                              { return m_layerId;                }
   Void      setLayerId                      (UInt layer)                    { m_layerId = layer;               }