Changeset 1043 in SHVCSoftware for branches/SHM-dev/source/App

Timestamp:

2 Mar 2015, 21:08:06 (10 years ago)

Author:

seregin

Message:

fix layerId/layerIdx mismatch at decoder, including fixes for the tickets 66 and 68

File:

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

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

@@ -1263 +1263 @@
   vps->setNuhLayerIdPresentFlag(false);
   vps->setLayerIdInNuh(0, 0);
-  vps->setLayerIdInVps(0, 0);
+  vps->setLayerIdxInVps(0, 0);
   for(i = 1; i < vps->getMaxLayers(); i++)
   {
     vps->setLayerIdInNuh(i, i);
-    vps->setLayerIdInVps(vps->getLayerIdInNuh(i), i);
+    vps->setLayerIdxInVps(vps->getLayerIdInNuh(i), i);
     vps->setDimensionId(i, 0, i);
   }
@@ -1529 +1529 @@
   for (UInt layerCtr = 1; layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
   {
-    vps->setNumDirectRefLayers(layerCtr, m_acTEncTop[layerCtr].getNumDirectRefLayers());
+    UInt layerId = vps->getLayerIdInNuh(layerCtr);
+    vps->setNumDirectRefLayers(layerId, m_acTEncTop[layerCtr].getNumDirectRefLayers());
     maxDirectRefLayers = max<UInt>(maxDirectRefLayers, vps->getNumDirectRefLayers(layerCtr));
 
     for (i = 0; i < vps->getNumDirectRefLayers(layerCtr); i++)
     {
-      vps->setRefLayerId(layerCtr, i, m_acTEncTop[layerCtr].getRefLayerId(i));
+      vps->setRefLayerId(layerId, i, m_acTEncTop[layerCtr].getRefLayerId(i));
     }
     // Set direct dependency flag
@@ -1544 +1545 @@
     for (i = 0; i < vps->getNumDirectRefLayers(layerCtr); i++)
     {
-      vps->setDirectDependencyFlag(layerCtr, vps->getLayerIdInVps(m_acTEncTop[layerCtr].getRefLayerId(i)), true);
+      vps->setDirectDependencyFlag(layerCtr, vps->getLayerIdxInVps(m_acTEncTop[layerCtr].getRefLayerId(i)), true);
     }
     // prediction indications
@@ -1739 +1740 @@
     for(Int j = 0; j < numLayerInLayerSet; j++)
     {
-      Int layerIdxInVps = vps->getLayerIdInVps( vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) );
+      Int layerIdxInVps = vps->getLayerIdxInVps( vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) );
       if( vps->getNecessaryLayerFlag(i, j) )
       {
@@ -1947 +1948 @@
                 // Only for the default partition
                 Int nuhlayerId = vps->getLayerSetLayerIdList( lsIdx, k);
-                Int layerIdxInVps = vps->getLayerIdInVps( nuhlayerId );
+                Int layerIdxInVps = vps->getLayerIdxInVps( nuhlayerId );
                 vps->setBspHrdIdx(h, i, t, j, k, layerIdxInVps + vps->getNumHrdParameters());