Changeset 294 in 3DVCSoftware for branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

Timestamp:

19 Feb 2013, 20:33:52 (12 years ago)

Author:

tech

Message:

Removed HM-6.1 related guard macros.

File:

• branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp (modified) (12 diffs)

branches/HTM-5.1-dev0/source/Lib/TLibDecoder/TDecGop.cpp

@@ -79 +79 @@
 Void TDecGop::destroy()
 {
-#if LCU_SYNTAX_ALF
   m_alfParamSetPilot.releaseALFParam();
-#endif
 }
 
@@ -120 +118 @@
 // Private member functions
 // ====================================================================================================================
-#if LCU_SYNTAX_ALF
 Void TDecGop::patchAlfLCUParams(ALFParam*** alfLCUParam, AlfParamSet* alfParamSet, Int firstLCUAddr)
 {
@@ -195 +192 @@
 }
 
-#endif
 // ====================================================================================================================
 // Public member functions
@@ -279 +275 @@
         if(pcSlice->getAlfEnabledFlag())
         {
-#if LCU_SYNTAX_ALF
           if(pcSlice->getSPS()->getUseALFCoefInSlice())
           {
@@ -289 +284 @@
           if( !pcSlice->getSPS()->getUseALFCoefInSlice())
           {
-#endif
           m_vAlfCUCtrlSlices.push_back(m_cAlfCUCtrlOneSlice);
-#if LCU_SYNTAX_ALF
           }
-#endif
         }
       }
@@ -323 +315 @@
     m_pcSliceDecoder->decompressSlice( pcBitstream, ppcSubstreams, rpcPic, m_pcSbacDecoder, m_pcSbacDecoders);
     m_pcEntropyDecoder->setBitstream(  ppcSubstreams[uiNumSubstreams-1] );
-#if WPP_SIMPLIFICATION
     if ( uiNumSubstreams > 1 )
-#else
-    if ( pcSlice->getPPS()->getEntropyCodingSynchro() )
-#endif
     {
       // deallocate all created substreams, including internal buffers.
@@ -356 +344 @@
     Bool bLFCrossTileBoundary = (pcSlice->getPPS()->getTileBehaviorControlPresentFlag() == 1)?
                                 (pcSlice->getPPS()->getLFCrossTileBoundaryFlag()):(pcSlice->getPPS()->getSPS()->getLFCrossTileBoundaryFlag());
-#if DBL_CONTROL
     if (pcSlice->getPPS()->getDeblockingFilterControlPresent())
     {
-#endif
       if(pcSlice->getSPS()->getUseDF())
       {
@@ -372 +358 @@
         }
       }
-#if DBL_CONTROL
     }
     m_pcLoopFilter->setCfg(pcSlice->getPPS()->getDeblockingFilterControlPresent(), pcSlice->getLoopFilterDisable(), pcSlice->getLoopFilterBetaOffset(), pcSlice->getLoopFilterTcOffset(), bLFCrossTileBoundary);
-#else
-    m_pcLoopFilter->setCfg(pcSlice->getLoopFilterDisable(), pcSlice->getLoopFilterBetaOffset(), pcSlice->getLoopFilterTcOffset(), bLFCrossTileBoundary);
-#endif
     m_pcLoopFilter->loopFilterPic( rpcPic );
 
@@ -392 +374 @@
       if(pcSlice->getSaoEnabledFlag())
       {
-#if SAO_UNIT_INTERLEAVING
         if (pcSlice->getSaoInterleavingFlag())
         {
@@ -402 +383 @@
         }
         m_pcSAO->setSaoInterleavingFlag(pcSlice->getAPS()->getSaoInterleavingFlag());
-#endif
         m_pcSAO->createPicSaoInfo(rpcPic, m_uiILSliceCount);
         m_pcSAO->SAOProcess(rpcPic, pcSlice->getAPS()->getSaoParam());  
@@ -413 +393 @@
     if( pcSlice->getSPS()->getUseALF() )
     {
-#if LCU_SYNTAX_ALF
       if( (pcSlice->getSPS()->getUseALFCoefInSlice())?(true):(pcSlice->getAlfEnabledFlag()))
-#else
-      if(pcSlice->getAlfEnabledFlag())
-#endif
-      {
-
-#if LCU_SYNTAX_ALF
+      {
+
         if(!pcSlice->getSPS()->getUseALFCoefInSlice())
         {
@@ -427 +402 @@
         m_pcAdaptiveLoopFilter->createPicAlfInfo(rpcPic, m_uiILSliceCount, pcSlice->getSliceQp());
         m_pcAdaptiveLoopFilter->ALFProcess(rpcPic, m_vAlfCUCtrlSlices, pcSlice->getSPS()->getUseALFCoefInSlice());
-#else
-        m_pcAdaptiveLoopFilter->createPicAlfInfo(rpcPic, m_uiILSliceCount);
-      m_pcAdaptiveLoopFilter->ALFProcess(rpcPic, pcSlice->getAPS()->getAlfParam(), m_vAlfCUCtrlSlices);
-#endif
       m_pcAdaptiveLoopFilter->PCMLFDisableProcess(rpcPic);
       m_pcAdaptiveLoopFilter->destroyPicAlfInfo();
       }
-#if LCU_SYNTAX_ALF
       m_pcAdaptiveLoopFilter->resetLCUAlfInfo(); //reset all LCU ALFParam->alf_flag = 0
-#endif    
     }