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

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

Files:

• TLibCommon/TComSlice.h (modified) (5 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.cpp (modified) (5 diffs)
• TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• TLibEncoder/TEncCavlc.cpp (modified) (4 diffs)

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

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

@@ -1375 +1375 @@
   {
     vps->setProfilePresentFlag(1, false);
+#if !MULTIPLE_PTL_SUPPORT
     vps->getPTLForExtnPtr()->empty();
     vps->getPTLForExtnPtr()->resize(2);
     vps->getPTLForExtn(1)->copyProfileInfo( vps->getPTL() );
     parsePTL( vps->getPTLForExtn(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
+#else
+    parsePTL( vps->getPTL(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif
@@ -1600 +1604 @@
   READ_CODE(  6, uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
 #else
-  READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); vps->setNumProfileTierLevel( uiCode + 1 );
+  READ_UVLC(  uiCode, "vps_num_profile_tier_level_minus1"); 
+  vps->setNumProfileTierLevel( uiCode + 1 );
+  //vps->setNumProfileTierLevel( 3 );
+  int aa = vps->getNumProfileTierLevel();
 #endif
 #if PER_LAYER_PTL
   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++)
@@ -1612 +1621 @@
 #endif
   {
-    READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); vps->setProfilePresentFlag(idx, uiCode ? true : false);
+    READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); 
+    vps->setProfilePresentFlag(idx, uiCode ? true : false);
     if( !vps->getProfilePresentFlag(idx) )
     {
 #if P0048_REMOVE_PROFILE_REF
       // Copy profile information from previous one
+#if !MULTIPLE_PTL_SUPPORT
       vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) );
+#else
+      vps->getPTL(idx)->copyProfileInfo( vps->getPTL( idx - 1 ) );
+#endif
 #else
       READ_CODE( 6, uiCode, "profile_ref_minus1[i]" ); vps->setProfileLayerSetRef(idx, uiCode + 1);
@@ -1629 +1643 @@
 #endif
     }
+#if !MULTIPLE_PTL_SUPPORT
     parsePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
+    parsePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif
@@ -1673 +1691 @@
   if( vps->getNumLayerSets() > 1 )
   {
-    READ_UVLC( uiCode, "num_add_olss" );            vps->setNumAddOutputLayerSets( uiCode );
+    READ_UVLC( uiCode, "num_add_olss" );            
+    vps->setNumAddOutputLayerSets( uiCode );
     READ_CODE( 2, uiCode, "default_output_layer_idc" );   vps->setDefaultTargetOutputLayerIdc( uiCode );
   }

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

@@ -354 +354 @@
 #else
     m_iMaxRefPicNum = pcSlice->getVPS()->getMaxVpsDecPicBufferingMinus1( getCommonDecoderParams()->getTargetOutputLayerSetIdx(), pcSlice->getLayerId(), pcSlice->getTLayer() ) + 1; // m_uiMaxDecPicBuffering has the space for the picture currently being decoded
-    //TODO: HENDRY -- Do the checking here.
 #endif
   }
@@ -1088 +1087 @@
     m_isNoOutputPriorPics = false;
   }
-
-  //TODO: HENDRY -- Probably do the checking for max number of positive and negative pics here
-
 
   //For inference of PicOutputFlag

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

@@ -1088 +1088 @@
   if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
   {
+#if !MULTIPLE_PTL_SUPPORT
     codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 );
+#else
+    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif
@@ -1254 +1258 @@
 #endif
 #if LIST_OF_PTL
+#if !MULTIPLE_PTL_SUPPORT
   assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size());
+#else
+  //Do something here to make sure the loop is correct to consider base layer internal stuff
+#endif
   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx <= vps->getNumProfileTierLevel() - 1; idx++)
 #else
@@ -1260 +1268 @@
 #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
@@ -1267 +1278 @@
     }
 #endif
+#if !MULTIPLE_PTL_SUPPORT
     codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#else
+    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
+#endif
   }
 #endif