Changeset 1135 in SHVCSoftware

Timestamp:

7 Jul 2015, 23:08:44 (9 years ago)

Author:

seregin

Message:

macro cleanup: CHANGE_NUMSUBDPB_IDX

Location:

branches/SHM-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (2 diffs)
• Lib/TLibCommon/TComSlice.cpp (modified) (3 diffs)
• Lib/TLibCommon/TComSlice.h (modified) (1 diff)
• Lib/TLibCommon/TypeDef.h (modified) (1 diff)
• Lib/TLibDecoder/TDecCAVLC.cpp (modified) (3 diffs)
• Lib/TLibEncoder/TEncCavlc.cpp (modified) (3 diffs)

branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -1698 +1698 @@
   for(i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
-#if CHANGE_NUMSUBDPB_IDX
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
-#endif
     Int layerSetId = vps->getOutputLayerSetIdx(i);
 
@@ -1707 +1705 @@
 
       Int maxNumReorderPics = -1;
-#if CHANGE_NUMSUBDPB_IDX
       for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++)
-#else
-      for(Int k = 0; k < vps->getNumSubDpbs(i); k++)
-#endif
       {
         Int layerId = vps->getLayerSetLayerIdList(layerSetId, k); // k-th layer in the output layer set

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

@@ -3207 +3207 @@
 {
   // Derive number of sub-DPBs
-#if CHANGE_NUMSUBDPB_IDX
   // For layer set 0
   m_numSubDpbs[0] = 1;
@@ -3215 +3214 @@
     m_numSubDpbs[i] = m_numLayerInIdList[i];
   }
-#else
-  // For output layer set 0
-  setNumSubDpbs(0, 1);
-  // For other output layer sets
-  for( Int i = 1; i < getNumOutputLayerSets(); i++)
-  {
-    setNumSubDpbs( i, getNumLayersInIdList( getOutputLayerSetIdx(i)) );
-  }
-#endif
 }
 #endif
@@ -3439 +3429 @@
                                       // then will be continue to be false - i.e. the j-th sub-layer DPB info is not signaled
         checkFlagInner[j] |= ( getMaxVpsNumReorderPics(i, j) != getMaxVpsNumReorderPics(i, j - 1) );
-#if CHANGE_NUMSUBDPB_IDX
+
         for(Int subDpbIdx = 0; subDpbIdx < getNumSubDpbs(layerSetIdxForOutputLayerSet) && !checkFlagInner[j]; subDpbIdx++)  // If checkFlagInner[j] is true, break and signal the values
-#else
-        for(Int k = 0; k < getNumSubDpbs(i) && !checkFlagInner[j]; k++)  // If checkFlagInner[j] is true, break and signal the values
-#endif
         {
           checkFlagInner[j] |= ( getMaxVpsDecPicBufferingMinus1(i, subDpbIdx, j - 1) != getMaxVpsDecPicBufferingMinus1(i, subDpbIdx, j) );

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

@@ -787 +787 @@
   Int        m_maxVpsNumReorderPics        [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];
   Int        m_maxVpsLatencyIncreasePlus1  [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];
-#if CHANGE_NUMSUBDPB_IDX
 #if Q0078_ADD_LAYER_SETS
   Int        m_numSubDpbs                  [MAX_VPS_LAYER_SETS_PLUS1 + 2*MAX_NUM_ADD_LAYER_SETS];
 #else
   Int        m_numSubDpbs                  [MAX_VPS_LAYER_SETS_PLUS1];
-#endif
-#else
-  Int        m_numSubDpbs                  [MAX_VPS_OP_LAYER_SETS_PLUS1];
 #endif
 #endif

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

@@ -82 +82 @@
 #define DISCARDABLE_PIC_RPS              1      ///< JCTVC-P0130: Inter-layer RPS and temporal RPS should not contain picture with discardable_flag equal to 1
 #define VPS_EXTN_UEV_CODING              1      ///< JCTVC-P0306: Code some syntax elements as ue(v), and remove some syntax elements that duplicate behaviour
-#define CHANGE_NUMSUBDPB_IDX             1      ///< Change index of NumSubDpb from output layer set to layer set, to be more aligned with the Spec
 #define ALIGNED_BUMPING                  1      ///< JCTVC-P0192: Align bumping of pictures in an AU
 #define FIX_ALIGN_BUMPING                1

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

@@ -3536 +3536 @@
   {
     UInt maxSLMinus1 = 0;
-#if CHANGE_NUMSUBDPB_IDX
     Int optLsIdx = vps->getOutputLayerSetIdx( i );
-#else
-    Int optLsIdx = i;
-#endif
 #if BITRATE_PICRATE_SIGNALLING
     optLsIdx = i;
@@ -3560 +3556 @@
   for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
-#if CHANGE_NUMSUBDPB_IDX
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
-#endif
+
     READ_FLAG( uiCode, "sub_layer_flag_info_present_flag[i]");  vps->setSubLayerFlagInfoPresentFlag( i, uiCode ? true : false );
 #if SUB_LAYERS_IN_LAYER_SET
@@ -3595 +3590 @@
       if( vps->getSubLayerDpbInfoPresentFlag(i, j) )  // If sub-layer DPB information is present
       {
-#if CHANGE_NUMSUBDPB_IDX
         for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++)
-#else
-        for(Int k = 0; k < vps->getNumSubDpbs(i); k++)
-#endif
         {
 #if DPB_INTERNAL_BL_SIG

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

@@ -2426 +2426 @@
     {
         UInt maxSLMinus1 = 0;
-#if CHANGE_NUMSUBDPB_IDX
         Int optLsIdx = vps->getOutputLayerSetIdx( i );
-#else
-        Int optLsIdx = i;
-#endif
 #if BITRATE_PICRATE_SIGNALLING
         optLsIdx = i;
@@ -2449 +2445 @@
   for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
   {
-#if CHANGE_NUMSUBDPB_IDX
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
-#endif
+
     WRITE_FLAG( vps->getSubLayerFlagInfoPresentFlag( i ), "sub_layer_flag_info_present_flag[i]");
 #if SUB_LAYERS_IN_LAYER_SET
@@ -2473 +2468 @@
       if( vps->getSubLayerDpbInfoPresentFlag(i, j) )
       {
-#if CHANGE_NUMSUBDPB_IDX
         for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-#else
-        for(Int k = 0; k < vps->getNumSubDpbs(i); k++)
-#endif
         {
 #if DPB_INTERNAL_BL_SIG