Changeset 114 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibDecoder

Timestamp:

5 Apr 2013, 10:18:38 (12 years ago)

Author:

qualcomm

Message:

Rename vps_max_layers_minus1 in VPS (MACRO: VPS_RENAME)

Rename variables vps_reserved_zero_6bits to vps_max_layers_minus1.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

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

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

@@ -729 +729 @@
   READ_CODE( 4,  uiCode,  "vps_video_parameter_set_id" );         pcVPS->setVPSId( uiCode );
   READ_CODE( 2,  uiCode,  "vps_reserved_three_2bits" );           assert(uiCode == 3);
+#if VPS_RENAME
+  READ_CODE( 6,  uiCode,  "vps_max_layers_minus1" );              pcVPS->setMaxLayers( uiCode + 1);
+#else
   READ_CODE( 6,  uiCode,  "vps_reserved_zero_6bits" );            assert(uiCode == 0);
+#endif
   READ_CODE( 3,  uiCode,  "vps_max_sub_layers_minus1" );          pcVPS->setMaxTLayers( uiCode + 1 );
   READ_FLAG(     uiCode,  "vps_temporal_id_nesting_flag" );       pcVPS->setTemporalNestingFlag( uiCode ? true:false );