Changeset 836 in SHVCSoftware for branches

Timestamp:

23 Jul 2014, 04:38:40 (10 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

Files:

• TLibCommon/TComSlice.cpp (modified) (1 diff)
• TLibCommon/TComSlice.h (modified) (2 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (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

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

@@ -924 +924 @@
 
   READ_CODE( 4,  uiCode,  "vps_video_parameter_set_id" );         pcVPS->setVPSId( uiCode );
+#if VPS_RESERVED_FLAGS
+  READ_FLAG( uiCode, "vps_base_layer_internal_flag");             pcVPS->setBaseLayerInternalFlag( uiCode ? true : false );
+  READ_FLAG( uiCode, "vps_base_layer_available_flag");            pcVPS->setBaseLayerAvailableFlag( uiCode ? true : false );
+#else
   READ_CODE( 2,  uiCode,  "vps_reserved_three_2bits" );           assert(uiCode == 3);
+#endif
 #if SVC_EXTENSION
 #if O0137_MAX_LAYERID

branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -706 +706 @@
 #endif
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "vps_video_parameter_set_id" );
+#if VPS_RESERVED_FLAGS
+  WRITE_FLAG( pcVPS->getBaseLayerInternalFlag(),              "vps_base_layer_internal_flag");
+  WRITE_FLAG( pcVPS->getBaseLayerAvailableFlag(),             "vps_base_layer_available_flag");
+#else
   WRITE_CODE( 3,                                    2,        "vps_reserved_three_2bits" );
+#endif
 #if SVC_EXTENSION
   WRITE_CODE( pcVPS->getMaxLayers() - 1,            6,        "vps_max_layers_minus1" );