Changeset 959 in SHVCSoftware for branches/SHM-upgrade/source/Lib

Timestamp:

6 Jan 2015, 03:12:18 (10 years ago)

Author:

seregin

Message:

update on PTL

Location:

branches/SHM-upgrade/source/Lib

Files:

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

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

@@ -628 +628 @@
 #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-upgrade/source/Lib/TLibCommon/TypeDef.h

@@ -247 +247 @@
 #endif
 #define MULTIPLE_PTL_SUPPORT             1      ///< Profile, tier and level signalling
-#define NUM_POSSIBLE_LEVEL               13
 
 #define VPS_DPB_SIZE_TABLE               1      ///< JCTVC-O0217: DPB operations: signaling DPB-related parameters
@@ -930 +929 @@
     MAINREXT = 4,
     HIGHTHROUGHPUTREXT = 5,
+#if MULTIPLE_PTL_SUPPORT
+    MULTIVIEWMAIN = 6,
+    SCALABLEMAIN = 7,
+    SCALABLEMAIN10 = 7,
+#endif
   };
 }

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

@@ -3163 +3163 @@
       if( vps->getNecessaryLayerFlag(i, j) )
       {
-        READ_CODE( numBitsForPtlIdx, uiCode, "profile_level_tier_idx[i]" ); 
+        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
       }
     }