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

Timestamp:

9 Jul 2015, 00:08:52 (10 years ago)

Author:

seregin

Message:

macro cleanup: SCALINGLIST_INFERRING

Location:

branches/SHM-dev/source/Lib/TLibDecoder

Files:

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

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

@@ -397 +397 @@
             pcPPS->setPocResetInfoPresentFlag(uiCode ? true : false);
 
-#if SCALINGLIST_INFERRING
             READ_FLAG( uiCode, "pps_infer_scaling_list_flag" );
             pcPPS->setInferScalingListFlag( uiCode );
@@ -409 +408 @@
               pcPPS->setScalingListPresentFlag( false );
             }
-#endif
 
             READ_UVLC( uiCode,      "num_ref_loc_offsets" ); pcPPS->setNumRefLayerLocationOffsets(uiCode);

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

@@ -460 +460 @@
 
 #if SVC_EXTENSION
-#if SCALINGLIST_INFERRING
   // scaling list settings and checks
   TComVPS *activeVPS = m_parameterSetManagerDecoder.getActiveVPS();
@@ -524 +523 @@
 
   }
-#endif
 
 #if AVC_BASE
@@ -1796 +1794 @@
     pcSlice->setScalingList ( pcSlice->getSPS()->getScalingList()  );
 
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
     if( pcSlice->getPPS()->getScalingListPresentFlag() || pcSlice->getPPS()->getInferScalingListFlag() )
 #else
@@ -1804 +1802 @@
       pcSlice->setScalingList ( pcSlice->getPPS()->getScalingList()  );
     }
-#if SCALINGLIST_INFERRING
+
+#if SVC_EXTENSION
     if( m_layerId == 0 || ( m_layerId > 0 && !pcSlice->getPPS()->getInferScalingListFlag() && !pcSlice->getSPS()->getInferScalingListFlag() ) )
 #endif
@@ -1866 +1865 @@
   TComPPS* pps = new TComPPS();
 
-#if SCALINGLIST_INFERRING
+#if SVC_EXTENSION
   pps->setLayerId( m_layerId );
 #endif

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

@@ -250 +250 @@
   Void                    setCommonDecoderParams(CommonDecoderParams* x)    { m_commonDecoderParams = x;    }
   Void      checkValueOfTargetOutputLayerSetIdx(TComVPS *vps);
-#if SCALINGLIST_INFERRING
+
   ParameterSetManagerDecoder* getParameterSetManager()                      { return &m_parameterSetManagerDecoder; }
-#endif
+
 #if CONFORMANCE_BITSTREAM_MODE
   std::vector<TComPic>* getConfListPic() {return &m_confListPic; }