Changeset 1188 in SHVCSoftware

Timestamp:

8 Jul 2015, 03:40:48 (9 years ago)

Author:

seregin

Message:

macro cleanup: P0166_MODIFIED_PPS_EXTENSION, LAYER_DECPICBUFF_PARAM, DPB_CONSTRAINTS

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibDecoder/TDecCAVLC.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 P0166_MODIFIED_PPS_EXTENSION     1      ///< JCTVC-P0166: add pps_extension_type_flag
-#define LAYER_DECPICBUFF_PARAM           1      ///< JCTVC-Q0102 Proposal 2 infer value from layer DPB param
-#define DPB_CONSTRAINTS                  1      ///< JCTVC-Q0100 RPS DPB constraints
 #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]

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

@@ -1444 +1444 @@
         rps->setNumberOfPictures(offset);
       }
-#if DPB_CONSTRAINTS
+
+#if SVC_EXTENSION
+      // DPB constraints
       if( pcSlice->getVPS()->getVpsExtensionFlag() == 1 )
       {
@@ -1476 +1478 @@
       }
 #endif
+
       if ( pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_LP
         || pcSlice->getNalUnitType() == NAL_UNIT_CODED_SLICE_BLA_W_RADL