Changeset 1191 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: R0226_SLICE_TMVP

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecTop.cpp (modified) (3 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -119 +119 @@
 #if SVC_EXTENSION
 , m_firstSliceInPic               ( false )
-#if R0226_SLICE_TMVP
 , m_availableForTMVPRefFlag       ( true )
-#endif
 , m_layerId                     ( 0 )
 #if REF_IDX_MFM

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

@@ -2001 +2001 @@
 #if SVC_EXTENSION
   Bool        m_firstSliceInPic;
-#if R0226_SLICE_TMVP
   Bool        m_availableForTMVPRefFlag;
-#endif
   UInt        m_layerId;
   TComPic*    m_pcBaseColPic[MAX_LAYERS];
@@ -2289 +2287 @@
 
 #if SVC_EXTENSION
-  Void      setFirstSliceInPic               ( Bool val )        { m_firstSliceInPic = val;                    }
-  Bool      getFirstSliceInPic               ()                  { return m_firstSliceInPic;                   }
-#if R0226_SLICE_TMVP
-  Void      setAvailableForTMVPRefFlag     ( Bool   b )    { m_availableForTMVPRefFlag = b; }
-  Bool      getAvailableForTMVPRefFlag     ()              { return m_availableForTMVPRefFlag;}
-#endif
+  Void      setFirstSliceInPic               ( Bool val )        { m_firstSliceInPic = val;         }
+  Bool      getFirstSliceInPic               ()                  { return m_firstSliceInPic;        }
+  Void      setAvailableForTMVPRefFlag     ( Bool   b )          { m_availableForTMVPRefFlag = b;   }
+  Bool      getAvailableForTMVPRefFlag     ()                    { return m_availableForTMVPRefFlag;}
   Bool      setBaseColPic       ( TComList<TComPic*>& rcListPic , UInt refLayerIdc );
-  Void      setBaseColPic       (UInt refLayerIdc, TComPic* p)     { m_pcBaseColPic[refLayerIdc] = p; }
+  Void      setBaseColPic       (UInt refLayerIdc, TComPic* p)    { m_pcBaseColPic[refLayerIdc] = p;    }
   TComPic*  getBaseColPic       (UInt refLayerIdc)                { return m_pcBaseColPic[refLayerIdc]; }
-  TComPic** getBaseColPic       ()                { return &m_pcBaseColPic[0]; }
+  TComPic** getBaseColPic       ()                                { return &m_pcBaseColPic[0];          }
 #if MFM_ENCCONSTRAINT
   TComPic*  getBaseColPic( TComList<TComPic*>& rcListPic );

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

@@ -52 +52 @@
 #define BSP_INIT_ARRIVAL_SEI             1      ///< JCTVC-R0231: Make signalling of vcl_initial_arrival_delay independent of NalHrdBpPresentFlag
 
-#define R0226_SLICE_TMVP                 1      ///< JCTVC-R0226, Regarding slice_temporal_mvp_enabled_flag
-
 #define Q0108_TSA_STSA                   1      ///< JCTVC-Q0108, Remove cross-layer alignment constraints of TSA and STSA pictures, enable to have different prediction structures in different layers
 #define Q0177_EOS_CHECKS                 1      ///< JCTVC-Q0177; Put checks on handling EOS

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, 

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1119 +1119 @@
       if (pcSlice->getSPS()->getTMVPFlagsPresent())
       {
-#if R0226_SLICE_TMVP
         WRITE_FLAG( pcSlice->getEnableTMVPFlag() ? 1 : 0, "slice_temporal_mvp_enabled_flag" );
-#else
-        WRITE_FLAG( pcSlice->getEnableTMVPFlag() ? 1 : 0, "slice_temporal_mvp_enable_flag" );
-#endif
       }
     }