Changeset 243 in SHVCSoftware

Timestamp:

29 May 2013, 08:13:57 (12 years ago)

Author:

qualcomm

Message:

Encoder fix for output layer set and profile-tier-level index to not use hard-coded values.

From: Adarsh K. Ramasubramonian <aramasub@…>

File:

• branches/SHM-2.1-dev/source/App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)

branches/SHM-2.1-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -877 +877 @@
   // Target output layer
 #if VPS_PROFILE_OUTPUT_LAYERS
-  vps->setNumOutputLayerSets(2);    // 2 including the default base-layer set.
-  vps->setNumProfileTierLevel(2);   // 1 for the enhancement layer
-  vps->setProfileLevelTierIdx(1, 1);
+  vps->setNumOutputLayerSets(vps->getNumLayerSets());    
+  vps->setNumProfileTierLevel(vps->getNumLayerSets());   
   vps->setDefaultOneTargetOutputLayerFlag(true);
-  Int lsIdx = 1;
-  vps->setOutputLayerSetIdx(1, lsIdx); // Because only one layer set
+  for(Int i = 1; i < vps->getNumLayerSets(); i++)
+  {
+    vps->setProfileLevelTierIdx(i, i);
+    vps->setOutputLayerSetIdx(i, i); 
+  }
 #else
   vps->setNumOutputLayerSets(1);
@@ -888 +890 @@
   vps->setOutputLayerSetIdx(0, lsIdx); // Because only one layer set
 #endif
-  // Include the highest layer as output layer 
-  for(UInt layer=0; layer <= vps->getMaxLayerId() ; layer++)
-  {
-    if(vps->getLayerIdIncludedFlag(lsIdx, layer))
-    {
-      vps->setOutputLayerFlag(lsIdx, layer, layer == (vps->getMaxLayerId()));
+  for(Int lsIdx = 1; lsIdx < vps->getNumLayerSets(); lsIdx++)
+  {
+    // Include the highest layer as output layer 
+    for(UInt layer=0; layer <= vps->getMaxLayerId() ; layer++)
+    {
+      if(vps->getLayerIdIncludedFlag(lsIdx, layer))
+      {
+        vps->setOutputLayerFlag(lsIdx, layer, layer == (vps->getMaxLayerId()));
+      }
     }
   }