Changeset 951 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

3 Jan 2015, 01:49:56 (11 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/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (1 diff)
• TLibCommon/TypeDef.h (modified) (2 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (1 diff)

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
       }
     }