Changeset 484 in SHVCSoftware for branches/SHM-4.0-dev/source/App/TAppEncoder

Timestamp:

16 Nov 2013, 00:32:03 (11 years ago)

Author:

qualcomm

Message:

Integration of O0225 proposal 2 for all reference layers.

File:

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

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

@@ -1098 +1098 @@
     {
 #if N0120_MAX_TID_REF_CFG
+#if O0225_MAX_TID_FOR_REF_LAYERS
+      for( Int j = i+1; j <= MAX_VPS_LAYER_ID_PLUS1 - 1; j++)
+      {
+        vps->setMaxTidIlRefPicsPlus1(i, j, m_acTEncTop[i].getMaxTidIlRefPicsPlus1());
+      }
+#else
       vps->setMaxTidIlRefPicsPlus1(i, m_acTEncTop[i].getMaxTidIlRefPicsPlus1());
+#endif 
+#else
+#if O0225_MAX_TID_FOR_REF_LAYERS
+      for( Int j = i+1; j <= MAX_VPS_LAYER_ID_PLUS1 - 1; j++)
+      {
+        vps->setMaxTidIlRefPicsPlus1(i, j, vps->getMaxTLayers()+1);
+      }
 #else
       vps->setMaxTidIlRefPicsPlus1(i, vps->getMaxTLayers()+1);
 #endif
+#endif
     }
   }
@@ -1108 +1122 @@
     for( i = 0; i < MAX_VPS_LAYER_ID_PLUS1 - 1; i++ )
     {
+#if O0225_MAX_TID_FOR_REF_LAYERS
+      for( Int j = i+1; j <= MAX_VPS_LAYER_ID_PLUS1 - 1; j++)
+      {
+        vps->setMaxTidIlRefPicsPlus1(i, j, 7);
+      }
+#else
       vps->setMaxTidIlRefPicsPlus1(i, 7);
+#endif 
     }
   }