Changeset 941 in SHVCSoftware for branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

Timestamp:

30 Dec 2014, 18:47:09 (10 years ago)

Author:

seregin

Message:

support profile, tier and level for each layer, patch was provided by Hendry <fhendry@…>

File:

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

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

@@ -200 +200 @@
 #endif
 
+#if MULTIPLE_PTL_SUPPORT
+  //Populate PTL in VPS
+  TComVPS *pVPS = m_acTEncTop[0].getVPS();
+  ProfileTierLevel& profileTierLevel = *(pVPS->getPTL(0)->getGeneralPTL());
+  for (int ii = 0; ii < m_numPTLInfo; ii++)
+  {
+    profileTierLevel = *(pVPS->getPTL(ii)->getGeneralPTL());
+
+    profileTierLevel.setLevelIdc(m_levelList[ii]);
+    profileTierLevel.setTierFlag(m_levelTierList[ii]);
+    profileTierLevel.setProfileIdc(m_profileList[ii]);
+    profileTierLevel.setProfileCompatibilityFlag(m_profileList[ii], 1);
+    profileTierLevel.setProgressiveSourceFlag(m_progressiveSourceFlagList[ii]);
+    profileTierLevel.setInterlacedSourceFlag(m_interlacedSourceFlagList[ii]);
+    profileTierLevel.setNonPackedConstraintFlag(m_nonPackedConstraintFlagList[ii]);
+    profileTierLevel.setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlagList[ii]);
+  }
+  pVPS->setNumProfileTierLevel(m_numPTLInfo);
+
+  std::vector<int> myvector;
+  vps->getProfileLevelTierIdx()->resize(m_numOutputLayerSets);
+  for (int ii = 0; ii < m_numOutputLayerSets; ii++)
+  {
+    myvector =  m_listOfLayerPTLofOlss[ii];
+    vps->getProfileLevelTierIdx()->resize(myvector.size());
+    for (std::vector<int>::iterator it = myvector.begin() ; it != myvector.end(); ++it)
+    {
+      pVPS->addProfileLevelTierIdx(ii, it[0]);
+    }
+  }
+
+  //pVPS->setProfileLevelTierIdx(
+#endif
+
   assert( m_numLayers <= MAX_LAYERS );
 
@@ -228 +262 @@
     m_acTEncTop[layer].setFramesToBeEncoded            ( m_framesToBeEncoded );
 
+#if !MULTIPLE_PTL_SUPPORT
     m_acTEncTop[layer].setProfile(m_profile);
     m_acTEncTop[layer].setLevel(m_levelTier, m_level);
@@ -234 +269 @@
     m_acTEncTop[layer].setNonPackedConstraintFlag(m_nonPackedConstraintFlag);
     m_acTEncTop[layer].setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlag);
+#else
+    m_acTEncTop[layer].setProfile(m_profileList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setLevel(m_levelTierList[m_layerPTLIdx[layer]], m_levelList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setProgressiveSourceFlag(m_progressiveSourceFlagList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setInterlacedSourceFlag(m_interlacedSourceFlagList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setNonPackedConstraintFlag(m_nonPackedConstraintFlagList[m_layerPTLIdx[layer]]);
+    m_acTEncTop[layer].setFrameOnlyConstraintFlag(m_frameOnlyConstraintFlagList[m_layerPTLIdx[layer]]);
+#endif
 
 #if REF_IDX_MFM
@@ -1385 +1428 @@
     vps->setIlpSshSignalingEnabledFlag(false);
 #if VPS_EXTN_PROFILE_INFO
-
+#if !MULTIPLE_PTL_SUPPORT
 #if LIST_OF_PTL
   vps->getPTLForExtnPtr()->resize(1);   // Dummy object - unused.
@@ -1414 +1457 @@
     *(vps->getPTLForExtn(setId)) = *(m_acTEncTop[setId].getSPS()->getPTL());
   }
+#endif
 #endif
 #endif
@@ -1524 +1568 @@
 #endif
   // Target output layer
+#if !MULTIPLE_PTL_SUPPORT
 #if LIST_OF_PTL
   vps->setNumProfileTierLevel( vps->getPTLForExtnPtr()->size() ); // +1 for the base VPS PTL()
@@ -1529 +1574 @@
   vps->setNumOutputLayerSets(vps->getNumLayerSets());
   vps->setNumProfileTierLevel(vps->getNumLayerSets());
+#endif
 #endif
 #if !OUTPUT_LAYER_SETS_CONFIG // Taken care by configuration file parameter
@@ -1619 +1665 @@
   vps->checkNecessaryLayerFlagCondition();
 #endif
+#if !MULTIPLE_PTL_SUPPORT
 #if PER_LAYER_PTL
   vps->getProfileLevelTierIdx()->resize(vps->getNumOutputLayerSets());
@@ -1639 +1686 @@
     }
   }
+#endif
 #endif
 #if SUB_LAYERS_IN_LAYER_SET