Changeset 378 in SHVCSoftware for branches/SHM-3.1-dev/source/Lib

Timestamp:

30 Aug 2013, 03:42:16 (11 years ago)

Author:

seregin

Message:

remove SVC_COL_BLK

Location:

branches/SHM-3.1-dev/source/Lib/TLibCommon

Files:

• TComDataCU.cpp (modified) (1 diff)
• TComDataCU.h (modified) (1 diff)
• TypeDef.h (modified) (1 diff)

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComDataCU.cpp

@@ -3946 +3946 @@
 }
 
-#if SVC_COL_BLK
+#if SVC_EXTENSION
 TComDataCU*  TComDataCU::getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int iMotionMapping )
 {

branches/SHM-3.1-dev/source/Lib/TLibCommon/TComDataCU.h

@@ -539 +539 @@
 
 #if SVC_EXTENSION
-#if SVC_COL_BLK 
   TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt uiCuAbsPartIdx, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int iMotionMapping = 0 );
   TComDataCU*   getBaseColCU( UInt refLayerIdc, UInt uiPelX, UInt uiPelY, UInt &uiCUAddrBase, UInt &uiAbsPartIdxBase, Int iMotionMapping = 0 );
   Void          scaleBaseMV( UInt refLayerIdc, TComMvField& rcMvFieldEnhance, TComMvField& rcMvFieldBase );
-#endif
 #endif
 };

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

@@ -82 +82 @@
 #define DERIVE_LAYER_ID_LIST_VARIABLES   1      ///< Derived variables based on the variables in VPS - for use in syntax table parsing
 
-#define SVC_COL_BLK                      1      ///< get co-located block
 #define SVC_UPSAMPLING                   1      ///< upsampling filters
 #define ROUNDING_OFFSET                  1      ///< JCTVC-N0111: upsampling rounding offset using scalling factors