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

Timestamp:

23 Jul 2014, 04:38:40 (11 years ago)

Author:

qualcomm

Message:

Change vps_reserved_three_2bits syntax element to two flags. (Macro: VPS_RESERVED_FLAGS)

Change vps_reserved_three_2bits to vps_base_layer_internal_flag and vps_base_layer_available_flag. The signalling changes related to these syntax elements are to be made along with the integration fo the related proposal.

From: Adarsh K. Ramasubramonian <aramasub@…>

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

@@ -2309 +2309 @@
 TComVPS::TComVPS()
 : m_VPSId                     (  0)
+#if VPS_RESERVED_FLAGS
+, m_baseLayerInternalFlag     (true)
+, m_baseLayerAvailableFlag    (true)
+#endif
 , m_uiMaxTLayers              (  1)
 , m_uiMaxLayers               (  1)

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

@@ -460 +460 @@
 private:
   Int         m_VPSId;
+#if VPS_RESERVED_FLAGS
+  Bool        m_baseLayerInternalFlag;
+  Bool        m_baseLayerAvailableFlag;
+#endif
   UInt        m_uiMaxTLayers;
   UInt        m_uiMaxLayers;
@@ -748 +752 @@
   TComVPS();
   virtual ~TComVPS();
+
+#if VPS_RESERVED_FLAGS
+  Void        setBaseLayerInternalFlag(Bool x) { m_baseLayerInternalFlag = x; }
+  Bool        getBaseLayerInternalFlag()         { return m_baseLayerInternalFlag; }
+  Void        setBaseLayerAvailableFlag(Bool x) { m_baseLayerAvailableFlag = x; }
+  Bool        getBaseLayerAvailableFlag()         { return m_baseLayerAvailableFlag; }
+#endif
 
   Void    createHrdParamBuffer()

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

@@ -44 +44 @@
 #define MAX_LAYERS                       8      ///< max number of layers the codec is supposed to handle
 
+#define VPS_RESERVED_FLAGS               1      ///< vps_base_layer_internal_flag and vps_base_layer_available_flag
 #define VPS_VUI_OFFSET                   1      ///< N0085: Signal VPS VUI offset in the VPS extension 
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1