Changeset 1180 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

8 Jul 2015, 02:52:29 (10 years ago)

Author:

seregin

Message:

macro cleanup: VPS_RESERVED_FLAGS

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -782 +782 @@
 {
   WRITE_CODE( pcVPS->getVPSId(),                    4,        "vps_video_parameter_set_id" );
-#if VPS_RESERVED_FLAGS
+#if SVC_EXTENSION
   WRITE_FLAG( pcVPS->getBaseLayerInternalFlag(),              "vps_base_layer_internal_flag");
   WRITE_FLAG( pcVPS->getBaseLayerAvailableFlag(),             "vps_base_layer_available_flag");
-#else
-  WRITE_CODE( 3,                                    2,        "vps_reserved_three_2bits" );
-#endif
-#if SVC_EXTENSION
   WRITE_CODE( pcVPS->getMaxLayers() - 1,            6,        "vps_max_layers_minus1" );
   assert( pcVPS->getBaseLayerInternalFlag() || pcVPS->getMaxLayers() > 1 );
 #else
+  WRITE_CODE( 3,                                    2,        "vps_reserved_three_2bits" );
   WRITE_CODE( 0,                                    6,        "vps_reserved_zero_6bits" );
 #endif