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

Timestamp:

10 Apr 2014, 03:34:55 (12 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/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -998 +998 @@
   Int numOutputLayerSets = vps->getNumOutputLayerSets() ;
   assert( numOutputLayerSets - (Int)vps->getNumLayerSets() >= 0 );
+
+#if Q0165_NUM_ADD_OUTPUT_LAYER_SETS
+  if( vps->getNumLayerSets() > 1 )
+  {
+    WRITE_UVLC( numOutputLayerSets - vps->getNumLayerSets(), "num_add_output_layer_sets" );
+    WRITE_CODE( vps->getDefaultTargetOutputLayerIdc(), 2, "default_target_output_layer_idc" );
+  }
+#else
   WRITE_UVLC( numOutputLayerSets - vps->getNumLayerSets(), "num_add_output_layer_sets" );
 #endif
+
+#endif
+
+#if !Q0165_NUM_ADD_OUTPUT_LAYER_SETS
   if( numOutputLayerSets > 1 )
   {
@@ -1012 +1024 @@
 #endif
   }
+#endif
 
   for(i = 1; i < numOutputLayerSets; i++)
@@ -1059 +1072 @@
       WRITE_FLAG(vps->getAltOuputLayerFlag(i), "alt_output_layer_flag[i]");
     }
+
+#if Q0165_OUTPUT_LAYER_SET
+    assert( NumOutputLayersInOutputLayerSet[i]>0 );
+#endif
+
 #endif
   }