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

Timestamp:

8 Jul 2015, 03:42:38 (10 years ago)

Author:

seregin

Message:

macro cleanup: DPB_INTERNAL_BL_SIG

File:

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

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

@@ -2315 +2315 @@
 Void TEncCavlc::codeVpsDpbSizeTable(TComVPS *vps)
 {
-  for(Int i = 1; i < vps->getNumOutputLayerSets(); i++)
+  for( Int i = 1; i < vps->getNumOutputLayerSets(); i++ )
   {
     Int layerSetIdxForOutputLayerSet = vps->getOutputLayerSetIdx( i );
@@ -2327 +2327 @@
         WRITE_FLAG( vps->getSubLayerDpbInfoPresentFlag( i, j), "sub_layer_dpb_info_present_flag[i]");  
       }
+
       if( vps->getSubLayerDpbInfoPresentFlag(i, j) )
       {
         for(Int k = 0; k < vps->getNumLayersInIdList( layerSetIdxForOutputLayerSet ); k++)
         {
-#if DPB_INTERNAL_BL_SIG
-        if( vps->getNecessaryLayerFlag(i, k) && (vps->getBaseLayerInternalFlag() || (vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, k) != 0)) )
-#endif
-          WRITE_UVLC( vps->getMaxVpsDecPicBufferingMinus1( i, k, j ), "max_vps_dec_pic_buffering_minus1[i][k][j]" );
-        }
+          if( vps->getNecessaryLayerFlag(i, k) && (vps->getBaseLayerInternalFlag() || (vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, k) != 0)) )
+          {
+            WRITE_UVLC( vps->getMaxVpsDecPicBufferingMinus1( i, k, j ), "max_vps_dec_pic_buffering_minus1[i][k][j]" );
+          }
+        }
+
         WRITE_UVLC( vps->getMaxVpsNumReorderPics( i, j), "max_vps_num_reorder_pics[i][j]" );