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

Timestamp:

2 Jul 2015, 21:00:14 (10 years ago)

Author:

seregin

Message:

cleanup macros: POC_RESET_RPS, PREVTID0_POC_RESET, POC_RESET_FLAG

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

• TDecCAVLC.cpp (modified) (2 diffs)
• TDecTop.cpp (modified) (2 diffs)
• TDecTop.h (modified) (1 diff)

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

@@ -1242 +1242 @@
   {
 #if SVC_EXTENSION
-#if POC_RESET_FLAG
-    Int iBits = 0;
-    if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
-    {
-      READ_FLAG(uiCode, "poc_reset_flag");      pcSlice->setPocResetFlag( uiCode ? true : false );
-      iBits++;
-    }
-    if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
-    {
-#if DISCARDABLE_PIC_RPS
-      READ_FLAG(uiCode, "discardable_flag"); pcSlice->setDiscardableFlag( uiCode ? true : false );
-#else
-      READ_FLAG(uiCode, "discardable_flag"); // ignored
-#endif
-      iBits++;
-    }
-#if O0149_CROSS_LAYER_BLA_FLAG
-    if(pcSlice->getPPS()->getNumExtraSliceHeaderBits() > iBits)
-    {
-      READ_FLAG(uiCode, "cross_layer_bla_flag");  pcSlice->setCrossLayerBLAFlag( uiCode ? true : false );
-      iBits++;
-    }
-#endif
-    for (; iBits < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); iBits++)
-    {
-      READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored
-    }
-#else
 #if CROSS_LAYER_BLA_FLAG_FIX
     Int iBits = 0;
@@ -1306 +1278 @@
       READ_FLAG(uiCode, "slice_reserved_undetermined_flag[]"); // ignored
     }
-#endif
 #else //SVC_EXTENSION
     for (Int i = 0; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++)

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

@@ -736 +736 @@
 
 #if SVC_EXTENSION
-#if POC_RESET_FLAG
-Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int &iPOCLastDisplay, UInt& curLayerId, Bool& bNewPOC )
-#else
 Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, UInt& curLayerId, Bool& bNewPOC )
-#endif
 #else
 Bool TDecTop::xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay )
@@ -1339 +1335 @@
   m_bFirstSliceInSequence = false;
   m_bFirstSliceInBitstream  = false;
-#if POC_RESET_FLAG
-  // This operation would do the following:
-  // 1. Update the other picture in the DPB. This should be done only for the first slice of the picture.
-  // 2. Update the value of m_pocCRA.
-  // 3. Reset the POC values at the decoder for the current picture to be zero.
-  // 4. update value of POCLastDisplay
-  if( m_apcSlicePilot->getPocResetFlag() )
-  {
-    if( m_apcSlicePilot->getSliceIdx() == 0 )
-    {
-      Int pocAdjustValue = m_apcSlicePilot->getPOC();
-
-#if PREVTID0_POC_RESET
-      m_apcSlicePilot->adjustPrevTid0POC(pocAdjustValue);
-#endif
-      // If poc reset flag is set to 1, reset all POC for DPB -> basically do it for each slice in the picutre
-      TComList<TComPic*>::iterator  iterPic = m_cListPic.begin();  
-
-      // Iterate through all picture in DPB
-      while( iterPic != m_cListPic.end() )
-      {
-        TComPic *dpbPic = *iterPic;
-        // Check if the picture pointed to by iterPic is either used for reference or
-        // needed for output, are in the same layer, and not the current picture.
-        if( /*  ( ( dpbPic->getSlice(0)->isReferenced() ) || ( dpbPic->getOutputMark() ) )
-            &&*/ ( dpbPic->getLayerId() == m_apcSlicePilot->getLayerId() )
-              && ( dpbPic->getReconMark() ) 
-          )
-        {
-          for(Int i = dpbPic->getNumAllocatedSlice()-1; i >= 0; i--)
-          {
-
-            TComSlice *slice = dpbPic->getSlice(i);
-            TComReferencePictureSet *rps = slice->getRPS();
-            slice->setPOC( slice->getPOC() - pocAdjustValue );
-
-            // Also adjust the POC value stored in the RPS of each such slice
-            for(Int j = rps->getNumberOfPictures(); j >= 0; j--)
-            {
-              rps->setPOC( j, rps->getPOC(j) - pocAdjustValue );
-            }
-            // Also adjust the value of refPOC
-            for(Int k = 0; k < 2; k++)  // For List 0 and List 1
-            {
-              RefPicList list = (k == 1) ? REF_PIC_LIST_1 : REF_PIC_LIST_0;
-              for(Int j = 0; j < slice->getNumRefIdx(list); j++)
-              {
-                slice->setRefPOC( slice->getRefPOC(list, j) - pocAdjustValue, list, j);
-              }
-            }
-          }
-        }
-        iterPic++;
-      }
-      // Update the value of pocCRA
-      m_pocCRA -= pocAdjustValue;
-      // Update value of POCLastDisplay
-      iPOCLastDisplay -= pocAdjustValue;
-    }
-    // Reset current poc for current slice and RPS
-    m_apcSlicePilot->setPOC( 0 );
-  }
-#endif
+
   // Alignment of TSA and STSA pictures across AU
 #if !Q0108_TSA_STSA

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

@@ -312 +312 @@
   Void      xActivateParameterSets();
 #if SVC_EXTENSION
-#if POC_RESET_FLAG
-  Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int &iPOCLastDisplay, UInt& curLayerId, Bool& bNewPOC);
-#else
   Bool      xDecodeSlice(InputNALUnit &nalu, Int &iSkipFrame, Int iPOCLastDisplay, UInt& curLayerId, Bool& bNewPOC);
-#endif
   Void      xSetSpatialEnhLayerFlag(TComSlice* slice, TComPic* pic);
 #else