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

Timestamp:

8 Jul 2015, 03:51:13 (10 years ago)

Author:

seregin

Message:

macro cleanup: R0226_SLICE_TMVP

File:

• branches/SHM-dev/source/Lib/TLibDecoder/TDecTop.cpp (modified) (3 diffs)

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

@@ -1221 +1221 @@
   }
 
+#if SVC_EXTENSION
 #if POC_RESET_IDC_DECODER
   m_parseIdc = -1;
 #endif
 
-
-#if R0226_SLICE_TMVP
-  if ( m_apcSlicePilot->getTLayer() == 0 && m_apcSlicePilot->getEnableTMVPFlag() == 0 )
+  if( m_apcSlicePilot->getTLayer() == 0 && m_apcSlicePilot->getEnableTMVPFlag() == 0 )
   {
     //update all pics in the DPB such that they cannot be used for TMPV ref
-    TComList<TComPic*>::iterator  iterRefPic = m_cListPic.begin();  
+    TComList<TComPic*>::iterator  iterRefPic = m_cListPic.begin();
+
     while( iterRefPic != m_cListPic.end() )
     {
@@ -1236 +1236 @@
       if( ( refPic->getLayerId() == m_apcSlicePilot->getLayerId() ) && refPic->getReconMark() )
       {
-        for(Int i = refPic->getNumAllocatedSlice()-1; i >= 0; i--)
+        for( Int i = refPic->getNumAllocatedSlice()-1; i >= 0; i-- )
         {
 
@@ -1861 +1861 @@
 
       assert( refPic );
-#if R0226_SLICE_TMVP
       assert ( refPic->getPicSym()->getSlice(0)->getAvailableForTMVPRefFlag() == true );
-#endif
 
       // It is a requirement of bitstream conformance when the collocated picture, used for temporal motion vector prediction, is an inter-layer reference picture,