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

Timestamp:

31 Dec 2014, 07:37:45 (10 years ago)

Author:

seregin

Message:

temporal improvement for profile/level signalling

Location:

branches/SHM-upgrade/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (5 diffs)
• TLibCommon/TypeDef.h (modified) (2 diffs)
• TLibDecoder/TDecCAVLC.cpp (modified) (6 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (6 diffs)

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

@@ -621 +621 @@
   Bool        m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1];
 #endif
-
+#if !MULTIPLE_PTL_SUPPORT
   TComPTL     m_pcPTL;
+#endif
   TimingInfo  m_timingInfo;
 
 #if SVC_EXTENSION
+#if MULTIPLE_PTL_SUPPORT
+  TComPTL     m_pcPTLList[NUM_POSSIBLE_LEVEL];
+#endif
 #if DERIVE_LAYER_ID_LIST_VARIABLES
 #if Q0078_ADD_LAYER_SETS
@@ -689 +693 @@
   UInt       m_profileLayerSetRef[MAX_VPS_LAYER_SETS_PLUS1];    // The value with index 0 will not be used.
 #endif
+#if !MULTIPLE_PTL_SUPPORT
   std::vector<TComPTL>    m_pcPTLForExtn;  
+#endif
 #endif
 #if VPS_EXTN_OP_LAYER_SETS
@@ -1004 +1010 @@
   Void    setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id)  { m_layerIdIncludedFlag[opsIdx][id] = v;    }
 
+#if !MULTIPLE_PTL_SUPPORT
   TComPTL* getPTL() { return &m_pcPTL; }
+#endif
+
   TimingInfo* getTimingInfo() { return &m_timingInfo; }
 
 #if SVC_EXTENSION
+#if MULTIPLE_PTL_SUPPORT
+  TComPTL* getPTL() { return &m_pcPTLList[0]; }
+  TComPTL* getPTL(UInt idx) { return &m_pcPTLList[idx]; }
+#endif
 #if DERIVE_LAYER_ID_LIST_VARIABLES
   Int     getLayerSetLayerIdList(Int set, Int layerId)          { return m_layerSetLayerIdList[set][layerId]; }
@@ -1105 +1118 @@
 #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
@@ -1172 +1187 @@
   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; }
-  Int calculateLenOfSyntaxElement( Int const numVal );
+#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
   Int    getProfileLevelTierIdx(Int i)                        { return m_profileLevelTierIdx[i]; }

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

@@ -245 +245 @@
 #define MAX_NUM_ADD_LAYER_SETS           1023
 #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
@@ -927 +929 @@
     MAINREXT = 4,
     HIGHTHROUGHPUTREXT = 5,
-#if SVC_EXTENSION
-    SCALABLE = 6,
-    SCALABLE10 = 7,
-#endif
   };
 }

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

@@ -2234 +2234 @@
   for (Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
+#if MULTIPLE_PTL_SUPPORT
+    READ_FLAG( uiCode, "sub_layer_profile_present_flag[i]" ); rpcPTL->setSubLayerProfilePresentFlag(i, uiCode);
+#else
     if(profilePresentFlag)
     {
       READ_FLAG( uiCode, "sub_layer_profile_present_flag[i]" ); rpcPTL->setSubLayerProfilePresentFlag(i, uiCode);
     }
+#endif
     READ_FLAG( uiCode, "sub_layer_level_present_flag[i]"   ); rpcPTL->setSubLayerLevelPresentFlag  (i, uiCode);
   }
@@ -2252 +2256 @@
   for(Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
+#if MULTIPLE_PTL_SUPPORT
+    if( rpcPTL->getSubLayerProfilePresentFlag(i) )
+#else
     if( profilePresentFlag && rpcPTL->getSubLayerProfilePresentFlag(i) )
+#endif
     {
       parseProfileTier(rpcPTL->getSubLayerPTL(i));
@@ -2744 +2752 @@
   {
     vps->setProfilePresentFlag(1, false);
+#if MULTIPLE_PTL_SUPPORT
+    parsePTL( vps->getPTL(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
+#else
     vps->getPTLForExtnPtr()->empty();
     vps->getPTLForExtnPtr()->resize(2);
     vps->getPTLForExtn(1)->copyProfileInfo( vps->getPTL() );
     parsePTL( vps->getPTLForExtn(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif
@@ -2974 +2986 @@
   Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
 #endif
+#if !MULTIPLE_PTL_SUPPORT
   vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel());
+#endif
 #if LIST_OF_PTL
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
@@ -2986 +3000 @@
 #if P0048_REMOVE_PROFILE_REF
       // Copy profile information from previous one
+#if MULTIPLE_PTL_SUPPORT
+      vps->getPTL(idx)->copyProfileInfo( vps->getPTL( idx - 1 ) );
+#else
       vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) );
+#endif
 #else
       READ_CODE( 6, uiCode, "profile_ref_minus1[i]" ); vps->setProfileLayerSetRef(idx, uiCode + 1);
@@ -2998 +3016 @@
 #endif
     }
+#if MULTIPLE_PTL_SUPPORT
+    parsePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
     parsePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif

branches/SHM-upgrade/source/Lib/TLibEncoder/TEncCavlc.cpp

@@ -1455 +1455 @@
   for (Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
+#if MULTIPLE_PTL_SUPPORT
+    WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" );
+#else
     if(profilePresentFlag)
     {
       WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" );
     }
+#endif
 
     WRITE_FLAG( pcPTL->getSubLayerLevelPresentFlag(i),   "sub_layer_level_present_flag[i]" );
@@ -1473 +1477 @@
   for(Int i = 0; i < maxNumSubLayersMinus1; i++)
   {
+#if MULTIPLE_PTL_SUPPORT
+    if( pcPTL->getSubLayerProfilePresentFlag(i) )
+#else
     if( profilePresentFlag && pcPTL->getSubLayerProfilePresentFlag(i) )
+#endif
     {
       codeProfileTier(pcPTL->getSubLayerPTL(i));  // sub_layer_...
@@ -2060 +2068 @@
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
+#if MULTIPLE_PTL_SUPPORT
+    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
+#else
     codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif
@@ -2226 +2238 @@
 #endif
 #if LIST_OF_PTL
+#if MULTIPLE_PTL_SUPPORT
+  //Do something here to make sure the loop is correct to consider base layer internal stuff
+#else
   assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size());
+#endif
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
 #else
@@ -2232 +2248 @@
 #endif
   {
+#if MULTIPLE_PTL_SUPPORT
+    vps->setProfilePresentFlag(idx, true);
+#endif
     WRITE_FLAG( vps->getProfilePresentFlag(idx),       "vps_profile_present_flag[i]" );
 #if !P0048_REMOVE_PROFILE_REF
@@ -2239 +2258 @@
     }
 #endif
+#if MULTIPLE_PTL_SUPPORT
+    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
     codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif