Changeset 1137 in SHVCSoftware for branches/SHM-dev

Timestamp:

7 Jul 2015, 23:15:25 (9 years ago)

Author:

seregin

Message:

macro cleanup: BITRATE_PICRATE_SIGNALLING

Location:

branches/SHM-dev/source/Lib

Files:

• TLibCommon/TComSlice.h (modified) (3 diffs)
• TLibCommon/TypeDef.h (modified) (1 diff)
• TLibEncoder/TEncCavlc.cpp (modified) (1 diff)

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

@@ -635 +635 @@
   UInt       m_layerIdxInVps[MAX_NUM_LAYER_IDS];            // Maps layer_id_in_nuh with the layer ID in the VPS
 #endif
-#if BITRATE_PICRATE_SIGNALLING
 #if Q0078_ADD_LAYER_SETS
   UInt       m_maxSLInLayerSetMinus1[MAX_VPS_LAYER_SETS_PLUS1 + MAX_NUM_ADD_LAYER_SETS];
@@ -641 +640 @@
   UInt       m_maxSLInLayerSetMinus1[MAX_VPS_LAYER_SETS_PLUS1];
 #endif
-#endif
-    
   Bool       m_ilpSshSignalingEnabledFlag;
 #if VPS_EXTN_PROFILE_INFO
@@ -1005 +1002 @@
   Void   setLayerIdxInVps(Int layerId, UInt layerIdx)           { m_layerIdxInVps[layerId] = layerIdx; }
 #endif
-#if BITRATE_PICRATE_SIGNALLING
   UInt   getMaxSLayersInLayerSetMinus1(Int ls)                  { return m_maxSLInLayerSetMinus1[ls]; }
   Void   setMaxSLayersInLayerSetMinus1(Int ls, Int x)           { m_maxSLInLayerSetMinus1[ls] = x;    }
-#endif
   Bool   getIlpSshSignalingEnabledFlag()                        { return m_ilpSshSignalingEnabledFlag;}
   Void   setIlpSshSignalingEnabledFlag(Bool x)                  { m_ilpSshSignalingEnabledFlag = x;}

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

@@ -196 +196 @@
 #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 BITRATE_PICRATE_SIGNALLING       1      ///< JCTVC-Q0102 Proposal 3 signal bitrate, picrate only up to the maximum temporal sub-layers in the corresponding layer set
 #define LAYER_DECPICBUFF_PARAM           1      ///< JCTVC-Q0102 Proposal 2 infer value from layer DPB param
 #define HRD_BPB                          1      ///< JCTVC-Q0101 Bitstream Partition Buffering Proposals

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

@@ -2480 +2480 @@
 #endif
     {
-#if BITRATE_PICRATE_SIGNALLING
       for( j = 0; j <= vps->getMaxSLayersInLayerSetMinus1(i); j++ )
-#else
-      for( j = 0; j < vps->getMaxTLayers(); j++ )
-#endif
       {
         if( vps->getBitRatePresentVpsFlag() )