Changeset 503 in SHVCSoftware for branches/SHM-4.1-dev/source

Timestamp:

22 Nov 2013, 00:12:21 (11 years ago)

Author:

interdigital

Message:

Integrated JCTVC-O0092/0094/0096

1. Implement O1008 SHVC text pseudo code for direct/indirect reference layers detection
2. constraint on the maximum number of reference layers
3. constraint on the layer id of SPS/PPS
4. identify SPS rep format with index into the list of rep format in VPS
5. specify default direct dependency type in VPS

File:

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

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

@@ -1181 +1181 @@
   // Direct reference layers
   UInt maxDirectRefLayers = 0;
+#if O0096_DEFAULT_DEPENDENCY_TYPE
+  Bool isDefaultDirectDependencyTypeSet = false;
+#endif
   for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
   {
@@ -1209 +1212 @@
         vps->setDirectDependencyType( layerCtr, refLayerCtr, ((m_acTEncTop[layerCtr].getSamplePredEnabledFlag(refLayerCtr) ? 1 : 0) |
                                                               (m_acTEncTop[layerCtr].getMotionPredEnabledFlag(refLayerCtr) ? 2 : 0)) - 1);
+#if O0096_DEFAULT_DEPENDENCY_TYPE
+        if (!isDefaultDirectDependencyTypeSet)
+        {
+          vps->setDefaultDirectDependecyTypeFlag(1);
+          vps->setDefaultDirectDependecyType(vps->getDirectDependencyType(layerCtr, refLayerCtr));
+          isDefaultDirectDependencyTypeSet = true;
+        }
+        else if (vps->getDirectDependencyType(layerCtr, refLayerCtr) != vps->getDefaultDirectDependencyType())
+        {
+          vps->setDefaultDirectDependecyTypeFlag(0);
+        }
+#endif
       }
       else
@@ -1217 +1232 @@
 #endif
   }
+
+#if O0092_0094_DEPENDENCY_CONSTRAINT
+  for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
+  {
+    vps->setNumRefLayers(vps->getLayerIdInNuh(layerCtr));   // identify the number of direct and indirect reference layers of current layer and set recursiveRefLayersFlags
+  }
+  if(vps->getMaxLayers() > MAX_REF_LAYERS)
+  {
+    for(UInt layerCtr = 1;layerCtr <= vps->getMaxLayers() - 1; layerCtr++)
+    {
+      assert( vps->getNumRefLayers(vps->getLayerIdInNuh(layerCtr)) <= MAX_REF_LAYERS);
+    }
+  }
+#endif
 #if IL_SL_SIGNALLING_N0371
   for(i = 1; i < vps->getMaxLayers(); i++)