Changeset 108 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibDecoder/TDecCAVLC.cpp

Timestamp:

2 Apr 2013, 22:50:17 (12 years ago)

Author:

qualcomm

Message:

Rename VPS syntax elements (MACRO: VPS_RENAME)

Rename variables vps_max_nuh_reserved_zero_layer_id and vps_max_op_sets_minus1 to vps_max_layer_id and vps_num_layer_sets_minus1.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

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

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

@@ -758 +758 @@
   }
 
+#if VPS_RENAME
+  assert( pcVPS->getNumHrdParameters() < MAX_VPS_LAYER_SETS_PLUS1 );
+  assert( pcVPS->getMaxLayerId()       < MAX_VPS_LAYER_ID_PLUS1 );
+  READ_CODE( 6, uiCode, "vps_max_layer_id" );           pcVPS->setMaxLayerId( uiCode );
+  READ_UVLC(    uiCode, "vps_num_layer_sets_minus1" );  pcVPS->setNumLayerSets( uiCode + 1 );
+  for( UInt opsIdx = 1; opsIdx <= ( pcVPS->getNumLayerSets() - 1 ); opsIdx ++ )
+  {
+    // Operation point set
+    for( UInt i = 0; i <= pcVPS->getMaxLayerId(); i ++ )
+#else
   assert( pcVPS->getNumHrdParameters() < MAX_VPS_OP_SETS_PLUS1 );
   assert( pcVPS->getMaxNuhReservedZeroLayerId() < MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1 );
@@ -766 +776 @@
     // Operation point set
     for( UInt i = 0; i <= pcVPS->getMaxNuhReservedZeroLayerId(); i ++ )
+#endif
     {
       READ_FLAG( uiCode, "layer_id_included_flag[opsIdx][i]" );   pcVPS->setLayerIdIncludedFlag( uiCode == 1 ? true : false, opsIdx, i );