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

Timestamp:

27 Jan 2014, 20:37:31 (11 years ago)

Author:

qualcomm

Message:

JCTVC-P0125 -- Revert vps_extension_offset back to vps_reserved_0xffff_16bits

One macro (P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED) is defined and it negate the following two macros (VPS_EXTN_OFFSET & VPS_EXTN_OFFSET_CALC).

Contact fhendry@…

Location:

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

Files:

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

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

@@ -483 +483 @@
   Int         m_numLayerInIdList[MAX_VPS_LAYER_SETS_PLUS1];
 #endif
+#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
 #if VPS_EXTN_OFFSET
   UInt        m_extensionOffset;
+#endif
 #endif
 #if VPS_RENAME
@@ -980 +982 @@
   Int     scalTypeToScalIdx( ScalabilityType scalType );
 #endif
+#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
 #if VPS_EXTN_OFFSET
   Int     getExtensionOffset()                 { return m_extensionOffset;   }
   Void    setExtensionOffset( UInt offset )    { m_extensionOffset = offset; }
+#endif
 #endif
 #if O0215_PHASE_ALIGNMENT

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

@@ -126 +126 @@
 #endif
 
+#define P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED        1   ///< JCTVC-P0125 -- Keep it as a reserved FFFF value --- The following two macros (VPS_EXTN_OFFSET & VPS_EXTN_OFFSET_CALC) will have no effect when this macro is set to 1.
 #define VPS_EXTN_OFFSET                  1      ///< implementation of vps_extension_offset syntax element
 #define VPS_EXTN_OFFSET_CALC             1      ///< Calculation of VPS extension offset