Changeset 1189 in SHVCSoftware

Timestamp:

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

Author:

seregin

Message:

macro cleanup: DPB_INTERNAL_BL_SIG

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -117 +117 @@
 
 #define P0138_USE_ALT_CPB_PARAMS_FLAG    1      ///< JCTVC-P0138: use_alt_cpb_params_flag syntax in buffering period SEI message extension
-#define DPB_INTERNAL_BL_SIG              1      ///< JCTVC-R0153: external base layer
 #define OLS_IDX_CHK                      1      ///< JCTVC-R0155: Proposal 2 valid range for output_layer_set_idx_to_vps[i]
 #define R0157_RESTRICT_PPSID_FOR_CGS_LUT 1      ///< JCTVC-R0157: when pps_pic_parameter_set_id greater than or equal to 8, colour_mapping_enabled_flag shall be equal to 0

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

@@ -3309 +3309 @@
         }
       }
+
       if( vps->getSubLayerDpbInfoPresentFlag(i, j) )  // If sub-layer DPB information is present
       {
         for(Int k = 0; k < vps->getNumSubDpbs(layerSetIdxForOutputLayerSet); k++)
         {
-#if DPB_INTERNAL_BL_SIG
-            uiCode=0;
-
-        if( vps->getNecessaryLayerFlag(i, k) && ( vps->getBaseLayerInternalFlag() || vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, k) ) )
-#endif
-          READ_UVLC( uiCode, "max_vps_dec_pic_buffering_minus1[i][k][j]" ); vps->setMaxVpsDecPicBufferingMinus1( i, k, j, uiCode );
+          uiCode=0;
+
+          if( vps->getNecessaryLayerFlag(i, k) && ( vps->getBaseLayerInternalFlag() || vps->getLayerSetLayerIdList(layerSetIdxForOutputLayerSet, k) ) )
+          {
+            READ_UVLC( uiCode, "max_vps_dec_pic_buffering_minus1[i][k][j]" ); vps->setMaxVpsDecPicBufferingMinus1( i, k, j, uiCode );
+          }
         }
         READ_UVLC( uiCode, "max_vps_num_reorder_pics[i][j]" );              vps->setMaxVpsNumReorderPics( i, j, uiCode);

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]" );