Changeset 110 in SHVCSoftware for branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder

Timestamp:

3 Apr 2013, 21:34:49 (12 years ago)

Author:

qualcomm

Message:

Signal output layer sets in VPS extension (MACRO: VPS_EXTN_OP_LAYER_SETS)

Include signalling of output layer sets in the VPS extension. Does not include configuration support for specifying the output layer sets.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/HM-10.0-dev-SHM/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

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

@@ -591 +591 @@
   assert( pcVPS->getNumHrdParameters() <= MAX_VPS_LAYER_SETS_PLUS1 );
   assert( pcVPS->getMaxLayerId() < MAX_VPS_LAYER_ID_PLUS1 );
+#if !VPS_EXTN_OP_LAYER_SETS     // num layer sets set in TAppEncTop.cpp
   pcVPS->setNumLayerSets(1);
+#endif
   WRITE_CODE( pcVPS->getMaxLayerId(), 6,                       "vps_max_layer_id" );
   WRITE_UVLC( pcVPS->getNumLayerSets() - 1,                 "vps_num_layer_sets_minus1" );
@@ -610 +612 @@
 #endif
     {
+#if !VPS_EXTN_OP_LAYER_SETS     // layer Id include flag set in TAppEncTop.cpp
       // Only applicable for version 1
       pcVPS->setLayerIdIncludedFlag( true, opsIdx, i );
+#endif
       WRITE_FLAG( pcVPS->getLayerIdIncludedFlag( opsIdx, i ) ? 1 : 0, "layer_id_included_flag[opsIdx][i]" );
     }
@@ -667 +671 @@
 
   // ... More syntax elements to be written here
+  // Target output layer signalling
+  WRITE_UVLC( vps->getNumOutputLayerSets(),            "vps_num_output_layer_sets");
+  for(Int i = 0; i < vps->getNumOutputLayerSets(); i++)
+  {
+    WRITE_UVLC( vps->getOutputLayerSetIdx(i),           "vps_output_layer_set_idx[i]");
+    Int lsIdx = vps->getOutputLayerSetIdx(i);
+    for(Int j = 0; j <= vps->getMaxLayerId(); j++)
+    {
+      if(vps->getLayerIdIncludedFlag(lsIdx, j))
+      {
+        WRITE_FLAG( vps->getOutputLayerFlag(lsIdx, j), "vps_output_layer_flag[lsIdx][j]");
+      }
+    }
+  }
 }
 #endif