Changeset 941 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

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

Author:

seregin

Message:

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

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.h (modified) (5 diffs)
• TypeDef.h (modified) (1 diff)

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

@@ -582 +582 @@
   Bool        m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1];
 #endif
+#if !MULTIPLE_PTL_SUPPORT
   TComPTL     m_pcPTL;
+#else
+  TComPTL     m_pcPTLList[NUM_POSSIBLE_LEVEL];
+#endif
   TimingInfo  m_timingInfo;
 
@@ -649 +653 @@
   UInt       m_profileLayerSetRef[MAX_VPS_LAYER_SETS_PLUS1];    // The value with index 0 will not be used.
 #endif
-  std::vector<TComPTL>    m_pcPTLForExtn;  
+#if !MULTIPLE_PTL_SUPPORT
+  std::vector<TComPTL>    m_pcPTLForExtn;
+#endif
 #endif
 #if VPS_EXTN_OP_LAYER_SETS
@@ -964 +970 @@
   Void    setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id)  { m_layerIdIncludedFlag[opsIdx][id] = v;    }
 
+#if !MULTIPLE_PTL_SUPPORT
   TComPTL* getPTL() { return &m_pcPTL; }
+#else
+  TComPTL* getPTL() { return &m_pcPTLList[0]; }
+  TComPTL* getPTL(UInt idx) { return &m_pcPTLList[idx]; }
+#endif
   TimingInfo* getTimingInfo() { return &m_timingInfo; }
 
@@ -1065 +1076 @@
 #endif
 
+#if !MULTIPLE_PTL_SUPPORT
   std::vector<TComPTL>* getPTLForExtnPtr()                      { return &m_pcPTLForExtn;          }
   TComPTL* getPTLForExtn(Int id)                                { return &m_pcPTLForExtn[id];      }
+#endif
 #endif
 #if VPS_EXTN_OP_LAYER_SETS
@@ -1132 +1145 @@
   Int    getProfileLevelTierIdx(Int const olsIdx, Int const layerIdx)     { return m_profileLevelTierIdx[olsIdx][layerIdx]; }
   Void   setProfileLevelTierIdx(Int const olsIdx, Int const layerIdx, Int const ptlIdx)     { m_profileLevelTierIdx[olsIdx][layerIdx] = ptlIdx; }
+#if MULTIPLE_PTL_SUPPORT
+  Void   addProfileLevelTierIdx(Int const olsIdx, Int const ptlIdx)     { m_profileLevelTierIdx[olsIdx].push_back(ptlIdx); }
+#endif
   Int calculateLenOfSyntaxElement( Int const numVal );
 #else

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

@@ -69 +69 @@
 #define VPS_VUI_BSP_HRD_PARAMS           1      ///< JCTVC-R0231: Define the VPS VUI BSP hrd_params() as a separate function, and apply changes adopted.
 #define O0137_MAX_LAYERID                1      ///< JCTVC-O0137, JCTVC-O0200, JCTVC-O0223: restrict nuh_layer_id and vps_max_layers_minus1
+
+#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