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

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@…

File:

• branches/SHM-5.0-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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

@@ -847 +847 @@
   READ_FLAG(     uiCode,  "vps_temporal_id_nesting_flag" );       pcVPS->setTemporalNestingFlag( uiCode ? true:false );
   assert (pcVPS->getMaxTLayers()>1||pcVPS->getTemporalNestingFlag());
+#if !P0125_REVERT_VPS_EXTN_OFFSET_TO_RESERVED
 #if VPS_EXTN_OFFSET
   READ_CODE( 16, uiCode,  "vps_extension_offset" );               pcVPS->setExtensionOffset( uiCode );
+#else
+  READ_CODE( 16, uiCode,  "vps_reserved_ffff_16bits" );           assert(uiCode == 0xffff);
+#endif
 #else
   READ_CODE( 16, uiCode,  "vps_reserved_ffff_16bits" );           assert(uiCode == 0xffff);