Changeset 1138 in SHVCSoftware for branches/SHM-dev/source/Lib

Timestamp:

7 Jul 2015, 23:16:29 (9 years ago)

Author:

seregin

Message:

macro cleanup: R0227_BR_PR_ADD_LAYER_SET

Location:

branches/SHM-dev/source/Lib

Files:

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

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

@@ -68 +68 @@
 #define R0227_VUI_BSP_HRD_FLAG           1      ///< JCTVC-R0227, Conformance checking such that VPS VUI HRD only present if VPS timing info is signalled
 #define R0227_REP_FORMAT_CONSTRAINT      1      ///< JCTVC-R0227, Conformance checking such that representation format of a particular layer shall not be greater than the one defined in VPS for that layer
-#define R0227_BR_PR_ADD_LAYER_SET        1      ///< JCTVC-R0227, Signalling of bit-rate and picture rate for additional layer set
 #define R0042_PROFILE_INDICATION         1      ///< JCTVC-R0042, Profile indication for additional layer sets
 

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

@@ -2471 +2471 @@
   {
 #if Q0078_ADD_LAYER_SETS
-#if R0227_BR_PR_ADD_LAYER_SET
     for( i = vps->getBaseLayerInternalFlag() ? 0 : 1; i < vps->getNumLayerSets(); i++ )
-#else
-    for( i = 0; i <= vps->getVpsNumLayerSetsMinus1(); i++ )
-#endif
 #else
     for( i = 0; i < vps->getNumLayerSets(); i++ )