Changeset 1103 in SHVCSoftware

Timestamp:

6 Jul 2015, 20:28:53 (9 years ago)

Author:

seregin

Message:

macro cleanup: EARLY_REF_PIC_MARKING

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.h (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecTop.cpp

@@ -299 +299 @@
       }
       loopFiltered[curLayerId] = (nalu.m_nalUnitType == NAL_UNIT_EOS);
-#if EARLY_REF_PIC_MARKING
-      m_acTDecTop[curLayerId].earlyPicMarking(m_iMaxTemporalLayer, m_targetDecLayerIdSet);
-#endif
+
       if (nalu.m_nalUnitType == NAL_UNIT_EOS)
       {

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

@@ -183 +183 @@
 #define MAX_ONE_RESAMPLING_DIRECT_LAYERS 1      ///< Allow maximum of one resampling process for direct reference layers
 #define MOTION_RESAMPLING_CONSTRAINT     1      ///< JCTVC-N0108: Allow maximum of one motion resampling process for direct reference layers, and use motion inter-layer prediction from the same layer as texture inter-layer prediction.
-#define EARLY_REF_PIC_MARKING            0      ///< Valencia meeting - remove early marking of inter-layer reference pictures
-                                                ///< Decoded picture marking of sub-layer non-reference pictures
 #define O0225_TID_BASED_IL_RPS_DERIV     1
 #define VPS_TSLAYERS                     1      ///< JCTVC-O0120 signal max temporal sub-layers for each layer

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

@@ -2628 +2628 @@
 #endif
 
-#if EARLY_REF_PIC_MARKING
-Void TDecTop::earlyPicMarking(Int maxTemporalLayer, std::vector<Int>& targetDecLayerIdSet)
-{
-  UInt currTid = m_pcPic->getTLayer();
-  UInt highestTid = (maxTemporalLayer >= 0) ? maxTemporalLayer : (m_pcPic->getSlice(0)->getSPS()->getMaxTLayers() - 1);
-  UInt latestDecLayerId = m_layerId;
-  UInt numTargetDecLayers = 0;
-  Int targetDecLayerIdList[MAX_LAYERS];
-  UInt latestDecIdx = 0;
-  TComSlice* pcSlice = m_pcPic->getSlice(0);
-
-  if ( currTid != highestTid )  // Marking  process is only applicaple for highest decoded TLayer
-  {
-    return;
-  }
-
-  // currPic must be marked as "used for reference" and must be a sub-layer non-reference picture
-  if ( !((pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_TRAIL_N  ||
-          pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_TSA_N    ||
-          pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_STSA_N   ||
-          pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_RADL_N   ||
-          pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_RASL_N   ||
-          pcSlice->getNalUnitType() == NAL_UNIT_RESERVED_VCL_N10     ||
-          pcSlice->getNalUnitType() == NAL_UNIT_RESERVED_VCL_N12     ||
-          pcSlice->getNalUnitType() == NAL_UNIT_RESERVED_VCL_N14) && pcSlice->isReferenced()))
-  {
-    return;
-  }
-
-  if ( targetDecLayerIdSet.size() == 0 ) // Cannot mark if we don't know the number of scalable layers
-  {
-    return;
-  }
-
-  for (std::vector<Int>::iterator it = targetDecLayerIdSet.begin(); it != targetDecLayerIdSet.end(); it++)
-  {
-    if ( latestDecLayerId == (*it) )
-    {
-      latestDecIdx = numTargetDecLayers;
-    }
-    targetDecLayerIdList[numTargetDecLayers++] = (*it);
-  }
-
-  Int remainingInterLayerReferencesFlag = 0;
-  for ( Int j = latestDecIdx + 1; j < numTargetDecLayers; j++ )
-  {
-    Int jLidx = pcSlice->getVPS()->getLayerIdxInVps(targetDecLayerIdList[j]);
-    if ( currTid <= pcSlice->getVPS()->getMaxTidIlRefPicsPlus1(pcSlice->getVPS()->getLayerIdxInVps(latestDecLayerId),jLidx) - 1 )
-    {
-      for ( Int k = 0; k < m_ppcTDecTop[targetDecLayerIdList[j]]->getNumDirectRefLayers(); k++ )
-      {
-        if ( latestDecIdx == m_ppcTDecTop[targetDecLayerIdList[j]]->getRefLayerId(k) )
-        {
-          remainingInterLayerReferencesFlag = 1;
-        }
-      }
-    }
-  }
-
-  if ( remainingInterLayerReferencesFlag == 0 )
-  {
-    pcSlice->setReferenced(false);
-  }
-}
-#endif
-
 #if OUTPUT_LAYER_SET_INDEX
 Void TDecTop::checkValueOfTargetOutputLayerSetIdx(TComVPS *vps)

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

@@ -227 +227 @@
 
 #if SVC_EXTENSION
-#if EARLY_REF_PIC_MARKING
-  Void earlyPicMarking(Int maxTemporalLayer, std::vector<Int>& targetDecLayerIdList);
-#endif
 #if POC_RESET_IDC_DECODER
   Int       getParseIdc                     ()                              { return m_parseIdc;               }