Changeset 664 in SHVCSoftware for branches/SHM-6-dev/source/Lib/TLibDecoder

Timestamp:

10 Apr 2014, 03:34:55 (11 years ago)

Author:

sharp

Message:

Following macros for Q0165 were introduced:

Q0165_OUTPUT_LAYER_SET: add a constraint to disallow an empty output layer set,
Q0165_NUM_ADD_OUTPUT_LAYER_SETS: signal num_add_output_layer_set and default_target_output_layer_idc when vps_num_layer_sets_minus1 is greater than 0

by Takeshi Tsukuba (tsukuba.takeshi@…)

File:

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

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

@@ -1254 +1254 @@
   }
 #else
+
+#if Q0165_NUM_ADD_OUTPUT_LAYER_SETS
+  if( vps->getNumLayerSets() > 1 )
+  {
+    READ_UVLC( uiCode, "num_add_output_layer_sets" );            vps->setNumAddOutputLayerSets( uiCode );
+    READ_CODE( 2, uiCode, "default_target_output_layer_idc" );   vps->setDefaultTargetOutputLayerIdc( uiCode );
+  }
+  else
+  {
+    vps->setNumAddOutputLayerSets( 0 );
+  }
+#else
   READ_UVLC( uiCode, "num_add_output_layer_sets" );          vps->setNumAddOutputLayerSets( uiCode );
+#endif
   Int numOutputLayerSets = vps->getNumLayerSets() + vps->getNumAddOutputLayerSets();
 #endif
 
 #if P0295_DEFAULT_OUT_LAYER_IDC
+#if !Q0165_NUM_ADD_OUTPUT_LAYER_SETS
   if( numOutputLayerSets > 1 )
   {
     READ_CODE( 2, uiCode, "default_target_output_layer_idc" );   vps->setDefaultTargetOutputLayerIdc( uiCode );
   }
+#endif
   vps->setNumOutputLayerSets( numOutputLayerSets );
 
@@ -1334 +1349 @@
       vps->setAltOuputLayerFlag(i, uiCode ? true : false);
     }
+#if Q0165_OUTPUT_LAYER_SET
+    assert( NumOutputLayersInOutputLayerSet[i]>0 );
+#endif
+
 #endif
   }