Changeset 1081 in SHVCSoftware for branches/SHM-dev/source

Timestamp:

25 Mar 2015, 06:14:32 (10 years ago)

Author:

interdigital

Message:

fix SHM ticket #78, the samplePredEnabledFalg/motionPredEnabledFlag layerIdx is in the order of number of direct ref pics. The same index concept also applies to InterLayerPredLayerIdc.

File:

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

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

@@ -1565 +1565 @@
   {
     UInt layerId = vps->getLayerIdInNuh(layerCtr);
+    Int numDirectRefLayers = 0;
+
     vps->setNumDirectRefLayers(layerId, m_acTEncTop[layerCtr].getNumDirectRefLayers());
     maxDirectRefLayers = max<UInt>(maxDirectRefLayers, vps->getNumDirectRefLayers(layerId));
@@ -1588 +1590 @@
       if (vps->getDirectDependencyFlag(layerCtr, refLayerCtr))
       {
-        assert(m_acTEncTop[layerCtr].getSamplePredEnabledFlag(refLayerCtr) || m_acTEncTop[layerCtr].getMotionPredEnabledFlag(refLayerCtr));
-        vps->setDirectDependencyType(layerCtr, refLayerCtr, ((m_acTEncTop[layerCtr].getSamplePredEnabledFlag(refLayerCtr) ? 1 : 0) |
-          (m_acTEncTop[layerCtr].getMotionPredEnabledFlag(refLayerCtr) ? 2 : 0)) - 1);
+        assert(m_acTEncTop[layerCtr].getSamplePredEnabledFlag(numDirectRefLayers) || m_acTEncTop[layerCtr].getMotionPredEnabledFlag(numDirectRefLayers));
+        vps->setDirectDependencyType(layerCtr, refLayerCtr, ((m_acTEncTop[layerCtr].getSamplePredEnabledFlag(numDirectRefLayers) ? 1 : 0) |
+          (m_acTEncTop[layerCtr].getMotionPredEnabledFlag(numDirectRefLayers) ? 2 : 0)) - 1);
 #if O0096_DEFAULT_DEPENDENCY_TYPE
         if (!isDefaultDirectDependencyTypeSet)
@@ -1603 +1605 @@
         }
 #endif
+        numDirectRefLayers ++;
       }
       else