Changeset 1100 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibEncoder

Timestamp:

6 Jul 2015, 20:20:51 (10 years ago)

Author:

seregin

Message:

macro cleanup: RESOLUTION_BASED_DPB

File:

• branches/SHM-dev/source/Lib/TLibEncoder/TEncCavlc.cpp (modified) (2 diffs)

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

@@ -2665 +2665 @@
       {
 #if CHANGE_NUMSUBDPB_IDX
-#if RESOLUTION_BASED_DPB
-        for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++)
-#else
         for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-#endif
 #else
         for(Int k = 0; k < vps->getNumSubDpbs(i); k++)
@@ -2684 +2680 @@
         }
         WRITE_UVLC( vps->getMaxVpsNumReorderPics( i, j), "max_vps_num_reorder_pics[i][j]" );              
-#if RESOLUTION_BASED_DPB
-        if( vps->getNumSubDpbs(layerSetIdxForOutputLayerSet) != vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ) )  // NumSubDpbs
-        {
-          for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
-          {
-            WRITE_UVLC( vps->getMaxVpsLayerDecPicBuffMinus1( i, k, j), "max_vps_layer_dec_pic_buff_minus1[i][k][j]" );
-          }
-        }
-#endif
+
         WRITE_UVLC( vps->getMaxVpsLatencyIncreasePlus1( i, j), "max_vps_latency_increase_plus1[i][j]" );        
       }