Changeset 1154 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

8 Jul 2015, 00:31:44 (9 years ago)

Author:

seregin

Message:

macro cleanup: VPS_EXTN_UEV_CODING

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (2 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -1960 +1960 @@
 #endif
 , m_numProfileTierLevel       (0)
-#if !VPS_EXTN_UEV_CODING
-, m_moreOutputLayerSetsThanDefaultFlag (false)
-#endif
 , m_numAddOutputLayerSets     (0)
 #if P0295_DEFAULT_OUT_LAYER_IDC

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

@@ -665 +665 @@
 
   UInt       m_numProfileTierLevel;
-#if !VPS_EXTN_UEV_CODING
-  Bool       m_moreOutputLayerSetsThanDefaultFlag;
-#endif
   Int        m_numAddOutputLayerSets;
 #if P0295_DEFAULT_OUT_LAYER_IDC
@@ -1033 +1030 @@
   UInt   getNumProfileTierLevel()                                { return m_numProfileTierLevel; }
   Void   setNumProfileTierLevel(Int x)                           { m_numProfileTierLevel = x;    }
-
-#if !VPS_EXTN_UEV_CODING
-  Bool   getMoreOutputLayerSetsThanDefaultFlag()                 { return m_moreOutputLayerSetsThanDefaultFlag;}
-  Void   setMoreOutputLayerSetsThanDefaultFlag(Bool x)           { m_moreOutputLayerSetsThanDefaultFlag = x   ;}
-#endif
-
   Int    getNumAddOutputLayerSets()                              { return m_numAddOutputLayerSets; }
   Void   setNumAddOutputLayerSets(Int x)                         { m_numAddOutputLayerSets = x   ; }

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

@@ -77 +77 @@
 
 #define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
-#define VPS_EXTN_UEV_CODING              1      ///< JCTVC-P0306: Code some syntax elements as ue(v), and remove some syntax elements that duplicate behaviour
 #define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU
 #define FIX_ALIGN_BUMPING                1