Changeset 951 in SHVCSoftware for branches

Timestamp:

3 Jan 2015, 01:49:56 (10 years ago)

Author:

qualcomm

Message:

Some fixes for implementation of support for profile tier and level for each layer in an output layer set.
Additionally, add conformance checking such that enhancement layers of an output layer set support the same profile.

submitted by Hendry (fhendry@…)

Location:

branches/SHM-dev

Files:

• cfg/encoder_intra_main.cfg (modified) (1 diff)
• cfg/encoder_intra_main10.cfg (modified) (1 diff)
• cfg/encoder_lowdelay_main.cfg (modified) (1 diff)
• cfg/encoder_lowdelay_main10.cfg (modified) (1 diff)
• cfg/encoder_randomaccess_main.cfg (modified) (1 diff)
• cfg/encoder_randomaccess_main10.cfg (modified) (1 diff)
• source/App/TAppEncoder/TAppEncCfg.cpp (modified) (3 diffs)
• source/App/TAppEncoder/TAppEncCfg.h (modified) (1 diff)
• source/App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• source/Lib/TLibCommon/TComSlice.h (modified) (1 diff)
• source/Lib/TLibCommon/TypeDef.h (modified) (2 diffs)
• source/Lib/TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

branches/SHM-dev/cfg/encoder_intra_main.cfg

@@ -7 +7 @@
 NumProfileTierLevel           : 3
 #Profile for the whole bitstream
-Profile0                      : main        
+Profile0                      : scalable-main        
 #Profile for the base layer --- this will be ignored when BL is not HEVC
 Profile1                      : main
 #Profile for the enhancement layer
-Profile2                      : main
+Profile2                      : scalable-main
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_intra_main10.cfg

@@ -7 +7 @@
 NumProfileTierLevel           : 3
 #Profile for the whole bitstream
-Profile0                      : main10       
+Profile0                      : scalable-main10       
 #Profile for the base layer --- this will be ignored when BL is not HEVC
 Profile1                      : main10
 #Profile for the enhancement layer
-Profile2                      : main10
+Profile2                      : scalable-main10
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_lowdelay_main.cfg

@@ -7 +7 @@
 NumProfileTierLevel           : 3
 #Profile for the whole bitstream
-Profile0                      : main        
+Profile0                      : scalable-main        
 #Profile for the base layer --- this will be ignored when BL is not HEVC
 Profile1                      : main
 #Profile for the enhancement layer
-Profile2                      : main
+Profile2                      : scalable-main
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_lowdelay_main10.cfg

@@ -7 +7 @@
 NumProfileTierLevel           : 3
 #Profile for the whole bitstream
-Profile0                      : main10
+Profile0                      : scalable-main10
 #Profile for the base layer --- this will be ignored when BL is not HEVC
 Profile1                      : main10
 #Profile for the enhancement layer
-Profile2                      : main10
+Profile2                      : scalable-main10
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_randomaccess_main.cfg

@@ -7 +7 @@
 NumProfileTierLevel           : 3
 #Profile for the whole bitstream
-Profile0                      : main       
+Profile0                      : scalable-main       
 #Profile for the base layer --- this will be ignored when BL is not HEVC
 Profile1                      : main
 #Profile for the enhancement layer
-Profile2                      : main
+Profile2                      : scalable-main
 
 #======== Unit definition ================

branches/SHM-dev/cfg/encoder_randomaccess_main10.cfg

@@ -7 +7 @@
 NumProfileTierLevel           : 3
 #Profile for the whole bitstream
-Profile0                      : main10       
+Profile0                      : scalable-main10       
 #Profile for the base layer --- this will be ignored when BL is not HEVC
 Profile1                      : main10
 #Profile for the enhancement layer
-Profile2                      : main10
+Profile2                      : scalable-main10
 
 #======== Unit definition ================

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

@@ -290 +290 @@
   {"main10", Profile::MAIN10},
   {"main-still-picture", Profile::MAINSTILLPICTURE},
+#if MULTIPLE_PTL_SUPPORT
+  {"range-extension", Profile::RANGEEXTENSION},       //This is not used in this software
+  {"range-extension-high", Profile::RANGEEXTENSIONHIGH},       //This is not used in this software
+  {"multiview-main", Profile::MULTIVIEWMAIN},       //This is not used in this software
+  {"scalable-main", Profile::SCALABLEMAIN},
+  {"scalable-main10", Profile::SCALABLEMAIN10},
+#endif
 };
 
@@ -841 +848 @@
   // Profile and level
 #if SVC_EXTENSION && MULTIPLE_PTL_SUPPORT
-  ("NumProfileTierLevel", m_numPTLInfo, 2, "Number of Profile, Tier and Level information")
-  ("Profile%d", m_profileList,   Profile::NONE, NUM_POSSIBLE_LEVEL, "Profile to be used when encoding (Incomplete)")
-  ("Level%d",   m_levelList,     Level::NONE, NUM_POSSIBLE_LEVEL, "Level limit to be used, eg 5.1 (Incomplete)")
-  ("Tier%d",    m_levelTierList, Level::MAIN, NUM_POSSIBLE_LEVEL, "Tier to use for interpretation of --Level")
-
-  ("ProgressiveSource%d", m_progressiveSourceFlagList, false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that source is progressive")
-  ("InterlacedSource%d",  m_interlacedSourceFlagList,  false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that source is interlaced")
-  ("NonPackedSource%d",   m_nonPackedConstraintFlagList, false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that source does not contain frame packing")
-  ("FrameOnly%d",         m_frameOnlyConstraintFlagList, false, MAX_VPS_LAYER_ID_PLUS1, "Indicate that the bitstream contains only frames")
+  ("NumProfileTierLevel", m_numPTLInfo, 1, "Number of Profile, Tier and Level information")
+  ("Profile%d", m_profileList,   Profile::NONE, MAX_NUM_LAYER_IDS + 1, "Profile to be used when encoding (Incomplete)")
+  ("Level%d",   m_levelList,     Level::NONE, MAX_NUM_LAYER_IDS + 1, "Level limit to be used, eg 5.1 (Incomplete)")
+  ("Tier%d",    m_levelTierList, Level::MAIN, MAX_NUM_LAYER_IDS + 1, "Tier to use for interpretation of --Level")
+  ("ProfileCompatibility%d", m_profileCompatibility,   Profile::NONE, MAX_NUM_LAYER_IDS + 1, "Compatible profile to be used when encoding")
+  ("ProgressiveSource%d", m_progressiveSourceFlagList, false, MAX_NUM_LAYER_IDS + 1, "Indicate that source is progressive")
+  ("InterlacedSource%d",  m_interlacedSourceFlagList,  false, MAX_NUM_LAYER_IDS + 1, "Indicate that source is interlaced")
+  ("NonPackedSource%d",   m_nonPackedConstraintFlagList, false, MAX_NUM_LAYER_IDS + 1, "Indicate that source does not contain frame packing")
+  ("FrameOnly%d",         m_frameOnlyConstraintFlagList, false, MAX_NUM_LAYER_IDS + 1, "Indicate that the bitstream contains only frames")
     
   ("LayerPTLIndex%d", m_layerPTLIdx, 0, MAX_VPS_LAYER_ID_PLUS1, "Index of PTL for each layer")
-  ("ListOfProfileTierLevelOls%d", cfg_listOfLayerPTLOfOlss, string(""), MAX_VPS_LAYER_ID_PLUS1, "PTL Index for each layer in each OLS except the first OLS. The PTL index for layer in the first OLS is set to 1")
+  ("ListOfProfileTierLevelOls%d", cfg_listOfLayerPTLOfOlss, string(""), MAX_VPS_OUTPUT_LAYER_SETS_PLUS1, "PTL Index for each layer in each OLS except the first OLS. The PTL index for layer in the first OLS is set to 1")
 #else
   ("Profile", m_profile,   Profile::NONE, "Profile to be used when encoding (Incomplete)")
@@ -1965 +1972 @@
     }
 #if MULTIPLE_PTL_SUPPORT
-    if (olsCtr > startOlsCtr) // Non-default OLS
-    {
-      scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[m_outputLayerSetIdx[olsCtr - startOlsCtr - 1]], "List of PTL for each layer in OLS", m_listOfLayerPTLofOlss[olsCtr] );
-    }
-    else
-    {
-      scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsCtr], "List of PTL for each layer in OLS", m_listOfLayerPTLofOlss[olsCtr] );
-    }
+    Int olsToLsIndex = (olsCtr > startOlsCtr) ? m_outputLayerSetIdx[olsCtr - m_numLayerSets] : olsCtr;
+    scanStringToArray( cfg_listOfLayerPTLOfOlss[olsCtr], m_numLayerInIdList[olsToLsIndex], "List of PTL for each layers in OLS", m_listOfLayerPTLofOlss[olsCtr] );
+    //For conformance checking
+    //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main profile is indicated as follows:
+    //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
+    //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main 10 profile is indicated as follows:
+    //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
+    //The following assert may be updated / upgraded to take care of general_profile_compatibility_flag.
+    for ( Int ii = 1; ii < m_numLayerInIdList[olsToLsIndex]; ii++)
+    {
+      if (m_layerSetLayerIdList[ii - 1] != 0 && m_layerSetLayerIdList[ii] != 0)  //Profile / profile compatibility of enhancement layers must indicate the same profile.
+      {
+        assert( (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||
+                (m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) ||   
+                (m_profileCompatibility[m_listOfLayerPTLofOlss[olsCtr][ii]] == m_profileList[m_listOfLayerPTLofOlss[olsCtr][ii - 1]]) );
+      }
+    }   
 #endif
   }

branches/SHM-dev/source/App/TAppEncoder/TAppEncCfg.h

@@ -123 +123 @@
   Int           m_numPTLInfo;
   Int           m_layerPTLIdx[MAX_VPS_LAYER_ID_PLUS1]; ///< scalability_mask
-  Profile::Name m_profileList[NUM_POSSIBLE_LEVEL];
-  Level::Tier   m_levelTierList[NUM_POSSIBLE_LEVEL];
-  Level::Name   m_levelList[NUM_POSSIBLE_LEVEL];
-  Bool          m_progressiveSourceFlagList[NUM_POSSIBLE_LEVEL];
-  Bool          m_interlacedSourceFlagList[NUM_POSSIBLE_LEVEL];
-  Bool          m_nonPackedConstraintFlagList[NUM_POSSIBLE_LEVEL];
-  Bool          m_frameOnlyConstraintFlagList[NUM_POSSIBLE_LEVEL];
+  Profile::Name m_profileList[MAX_NUM_LAYER_IDS + 1];
+  Level::Tier   m_levelTierList[MAX_NUM_LAYER_IDS + 1];
+  Level::Name   m_levelList[MAX_NUM_LAYER_IDS + 1];
+  Profile::Name m_profileCompatibility[MAX_NUM_LAYER_IDS + 1];
+  Bool          m_progressiveSourceFlagList[MAX_NUM_LAYER_IDS + 1];
+  Bool          m_interlacedSourceFlagList[MAX_NUM_LAYER_IDS + 1];
+  Bool          m_nonPackedConstraintFlagList[MAX_NUM_LAYER_IDS + 1];
+  Bool          m_frameOnlyConstraintFlagList[MAX_NUM_LAYER_IDS + 1];
 
   std::vector< std::vector<Int> > m_listOfLayerPTLofOlss;

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

@@ -211 +211 @@
     profileTierLevel.setTierFlag(m_levelTierList[ii]);
     profileTierLevel.setProfileIdc(m_profileList[ii]);
-    profileTierLevel.setProfileCompatibilityFlag(m_profileList[ii], 1);
+    profileTierLevel.setProfileCompatibilityFlag(m_profileCompatibility[ii], 1);
     profileTierLevel.setProgressiveSourceFlag(m_progressiveSourceFlagList[ii]);
     profileTierLevel.setInterlacedSourceFlag(m_interlacedSourceFlagList[ii]);

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -589 +589 @@
 #if SVC_EXTENSION
 #if MULTIPLE_PTL_SUPPORT
-  TComPTL     m_pcPTLList[NUM_POSSIBLE_LEVEL];
+  TComPTL     m_pcPTLList[MAX_NUM_LAYER_IDS + 1];
 #endif
 #if DERIVE_LAYER_ID_LIST_VARIABLES

branches/SHM-dev/source/Lib/TLibCommon/TypeDef.h

@@ -71 +71 @@
 
 #define MULTIPLE_PTL_SUPPORT             1      ///< Fixing profile, tier and level signalling
-#define NUM_POSSIBLE_LEVEL               13     ///< Number of possible level as described in R1013
 
 #define R0226_CONSTRAINT_TMVP_SEI        1      ///< JCTVC-R0226, Modification to semantics in temporal motion vector prediction constraints SEI message
@@ -805 +804 @@
     MAIN10 = 2,
     MAINSTILLPICTURE = 3,
+#if MULTIPLE_PTL_SUPPORT
+    RANGEEXTENSION = 4,
+    RANGEEXTENSIONHIGH = 5,
+    MULTIVIEWMAIN = 6,
+    SCALABLEMAIN = 7,
+    SCALABLEMAIN10 = 7,
+#endif
   };
 }

branches/SHM-dev/source/Lib/TLibDecoder/TDecCAVLC.cpp

@@ -1789 +1789 @@
         READ_CODE( numBitsForPtlIdx, uiCode, "profile_level_tier_idx[i]" ); 
         vps->setProfileLevelTierIdx(i, j, uiCode );
+#if MULTIPLE_PTL_SUPPORT
+        //For conformance checking
+        //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main profile is indicated as follows:
+        //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
+        //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main 10 profile is indicated as follows:
+        //If OpTid of the output operation point is equal to vps_max_sub_layer_minus1, the conformance is indicated by general_profile_idc being equal to 7 or general_profile_compatibility_flag[ 7 ] being equal to 1
+        //The following assert may be updated / upgraded to take care of general_profile_compatibility_flag.
+        if (j > 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j) != 0 && vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, j - 1) != 0)
+        {
+          assert(vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileIdc() == vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileIdc() ||
+                 vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileCompatibilityFlag(vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileIdc()) ||  
+                 vps->getPTL(vps->getProfileLevelTierIdx(i, j))->getGeneralPTL()->getProfileCompatibilityFlag(vps->getPTL(vps->getProfileLevelTierIdx(i, j - 1))->getGeneralPTL()->getProfileIdc())  );
+        }
+#endif
       }
     }