Changeset 114 in SHVCSoftware for branches

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

Location:

branches/HM-10.0-dev-SHM/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

branches/HM-10.0-dev-SHM/source/App/TAppEncoder/TAppEncTop.cpp

@@ -82 +82 @@
     vps.setTemporalNestingFlag(true);
   }
+#if !VPS_RENAME
   vps.setMaxLayers                        ( 1 );
+#endif
   for(Int i = 0; i < MAX_TLAYER; i++)
   {
@@ -692 +694 @@
     m_acTEncTop[layer].init();
   }
+#if VPS_RENAME
+  m_acTEncTop[0].getVPS()->setMaxLayers( m_numLayers );
+#endif
 #if VPS_EXTN_OP_LAYER_SETS
   TComVPS* vps = m_acTEncTop[0].getVPS();

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 );

branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -566 +566 @@
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "vps_video_parameter_set_id" );
   WRITE_CODE( 3,                                    2,        "vps_reserved_three_2bits" );
+#if VPS_RENAME
+  WRITE_CODE( pcVPS->getMaxLayers() - 1,            6,        "vps_max_layers_minus1" );            
+#else
   WRITE_CODE( 0,                                    6,        "vps_reserved_zero_6bits" );
+#endif
   WRITE_CODE( pcVPS->getMaxTLayers() - 1,           3,        "vps_max_sub_layers_minus1" );
   WRITE_FLAG( pcVPS->getTemporalNestingFlag(),                "vps_temporal_id_nesting_flag" );