Changeset 857 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.h

Timestamp:

22 Feb 2014, 00:50:21 (10 years ago)

Author:

qualcomm

Message:

H_MV_HLS_7_VPS_P0307_23

Implementation for adoption of (VPS/P0307/VPS VUI extension)

• Move vps_vui_present_flag to the end of syntax table
• Remove vps_vui_offset
• Add vps_non_vui_extension_length and vps_non_vui_extension_data_byte

submitted by Hendry (fhendry@…

File:

• branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.h (modified) (4 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComSlice.h

@@ -768 +768 @@
   /// VPS EXTENSION SYNTAX ELEMENTS
   Bool        m_avcBaseLayerFlag;
-#if !H_MV_HLS7_GEN
+#if H_MV_HLS_7_VPS_P0307_23
+  Int         m_vpsNonVuiExtensionLength;
+#else
   Int         m_vpsVuiOffset;
 #endif
@@ -829 +831 @@
 #if H_MV_HLS7_GEN
   Int         m_directDependencyType     [MAX_NUM_LAYERS] [MAX_NUM_LAYERS];
-  Int         m_vpsNonVuiExtensionLength;
 #endif
   Bool        m_vpsVuiPresentFlag;
@@ -973 +974 @@
   Bool    getAvcBaseLayerFlag()                                            { return m_avcBaseLayerFlag; } 
 
-#if !H_MV_HLS7_GEN
+#if H_MV_HLS_7_VPS_P0307_23
+  Void    setVpsNonVuiExtensionLength( Int  val )                          { m_vpsNonVuiExtensionLength = val; } 
+  Int     getVpsNonVuiExtensionLength(  )                                  { return m_vpsNonVuiExtensionLength; } 
+#else
   Void    setVpsVuiOffset( Int  val )                                      { m_vpsVuiOffset = val; } 
   Int     getVpsVuiOffset(  )                                              { return m_vpsVuiOffset; } 
@@ -1140 +1144 @@
   Void    setDirectDependencyType( Int depLayeridInVps, Int refLayeridInVps, Int val) { m_directDependencyType[ depLayeridInVps ][ refLayeridInVps ] = val; } 
   Int     getDirectDependencyType( Int depLayeridInVps, Int refLayeridInVps)   { return m_directDependencyType[ depLayeridInVps ][ refLayeridInVps ]; } 
-
-#if H_MV_HLS7_GEN
-  Void    setVpsNonVuiExtensionLength( Int  val )                          { m_vpsNonVuiExtensionLength = val; } 
-  Int     getVpsNonVuiExtensionLength(  )                                  { return m_vpsNonVuiExtensionLength; } 
-#endif
 
   Void    setVpsVuiPresentFlag( Bool flag )                                { m_vpsVuiPresentFlag = flag; }