Changeset 1161 in SHVCSoftware


Ignore:
Timestamp:
8 Jul 2015, 00:54:26 (9 years ago)
Author:
seregin
Message:

macro cleanup: DERIVE_LAYER_ID_LIST_VARIABLES, VPS_EXTN_MASK_AND_DIM_INFO

Location:
branches/SHM-dev/source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/SHM-dev/source/App/TAppEncoder/TAppEncTop.cpp

    r1157 r1161  
    13451345  }
    13461346#endif
    1347 #if VPS_EXTN_MASK_AND_DIM_INFO
     1347
    13481348#if AVC_BASE
    13491349  vps->setNonHEVCBaseLayerFlag( m_nonHEVCBaseLayerFlag );
    … …  
    13551355  vps->setAvcBaseLayerFlag(false);
    13561356#endif
     1357
    13571358  vps->setSplittingFlag(false);
     1359
    13581360  for(i = 0; i < MAX_VPS_NUM_SCALABILITY_TYPES; i++)
    13591361  {
    … …  
    14031405    }
    14041406  }
    1405 #endif
    14061407#endif
    14071408
    … …  
    15361537#endif
    15371538  // The Layer ID List variables should be derived here.
    1538 #if DERIVE_LAYER_ID_LIST_VARIABLES
    15391539  vps->deriveLayerIdListVariables();
    1540 #endif
    15411540#if Q0078_ADD_LAYER_SETS
    15421541  vps->setPredictedLayerIds();

  • branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

    r1157 r1161  
    19891989  }
    19901990
    1991 #if VPS_EXTN_MASK_AND_DIM_INFO
    19921991  m_nonHEVCBaseLayerFlag = false;
    19931992  m_splittingFlag = false;
     1993  m_nuhLayerIdPresentFlag = false;
    19941994  ::memset(m_scalabilityMask, 0, sizeof(m_scalabilityMask));
    19951995  ::memset(m_dimensionIdLen, 0, sizeof(m_dimensionIdLen));
    1996   m_nuhLayerIdPresentFlag = false;
    19971996  ::memset(m_layerIdInNuh, 0, sizeof(m_layerIdInNuh));
    19981997  ::memset(m_dimensionId, 0, sizeof(m_dimensionId));
    … …  
    20001999  m_numScalabilityTypes = 0;
    20012000  ::memset(m_layerIdxInVps, 0, sizeof(m_layerIdxInVps));
    2002 #endif
     2001
    20032002#if VPS_EXTN_PROFILE_INFO
    20042003  ::memset(m_profilePresentFlag, 0, sizeof(m_profilePresentFlag));
    … …  
    31303129}
    31313130
    3132 #if DERIVE_LAYER_ID_LIST_VARIABLES
    31333131Void TComVPS::deriveLayerIdListVariables()
    31343132{
    … …  
    31513149  }
    31523150}
    3153 #endif
     3151
    31543152#if VPS_DPB_SIZE_TABLE
    31553153Void TComVPS::deriveNumberOfSubDpbs()

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

    r1157 r1161  
    596596  TComPTL     m_pcPTLList[MAX_NUM_LAYER_IDS + 1];
    597597#endif
    598 #if DERIVE_LAYER_ID_LIST_VARIABLES
    599598#if Q0078_ADD_LAYER_SETS
    600599  std::vector< std::vector<Int> >     m_layerSetLayerIdList;
    … …  
    603602  Int         m_layerSetLayerIdList[MAX_VPS_LAYER_SETS_PLUS1][MAX_VPS_LAYER_IDX_PLUS1];
    604603  Int         m_numLayerInIdList[MAX_VPS_LAYER_SETS_PLUS1];
    605 #endif
    606604#endif
    607605  UInt        m_maxLayerId;
    … …  
    617615  // Variables related to VPS extensions
    618616  // ------------------------------------------
    619 #if VPS_EXTN_MASK_AND_DIM_INFO
    620617  Bool       m_nonHEVCBaseLayerFlag;
    621618  Bool       m_splittingFlag;
    … …  
    629626  UInt       m_numScalabilityTypes;
    630627  UInt       m_layerIdxInVps[MAX_NUM_LAYER_IDS];            // Maps layer_id_in_nuh with the layer ID in the VPS
    631 #endif
     628
    632629#if Q0078_ADD_LAYER_SETS
    633630  UInt       m_maxSLInLayerSetMinus1[MAX_VPS_LAYER_SETS_PLUS1 + MAX_NUM_ADD_LAYER_SETS];
    … …  
    901898  TComPTL* getPTL(UInt idx) { return &m_pcPTLList[idx]; }
    902899#endif
    903 #if DERIVE_LAYER_ID_LIST_VARIABLES
    904900  Int     getLayerSetLayerIdList(Int set, Int layerId)          { return m_layerSetLayerIdList[set][layerId]; }
    905901  Void    setLayerSetLayerIdList(Int set, Int layerId, Int x)   { m_layerSetLayerIdList[set][layerId] = x;    }
    906902
    907   Int     getNumLayersInIdList(Int set)                          { return m_numLayerInIdList[set]; }
    908   Void    setNumLayersInIdList(Int set, Int x)                   { m_numLayerInIdList[set] = x;    }
     903  Int     getNumLayersInIdList(Int set)                         { return m_numLayerInIdList[set]; }
     904  Void    setNumLayersInIdList(Int set, Int x)                  { m_numLayerInIdList[set] = x;    }
    909905
    910906  Void    deriveLayerIdListVariables();
    911 #endif
    912907#if VPS_DPB_SIZE_TABLE
    913908Void      deriveNumberOfSubDpbs();
    … …  
    946941  UInt    getNumLayerSets()                                     { return m_numLayerSets; }
    947942  Void    setNumLayerSets(UInt v)                               { m_numLayerSets = v;    }
    948 #if VPS_EXTN_MASK_AND_DIM_INFO
     943
    949944  Bool   getNonHEVCBaseLayerFlag()                              { return m_nonHEVCBaseLayerFlag;   }
    950945  Void   setNonHEVCBaseLayerFlag(Bool x)                        { m_nonHEVCBaseLayerFlag = x;      }
    … …  
    973968  UInt   getLayerIdxInVps(Int layerId)                          { return m_layerIdxInVps[layerId];     }
    974969  Void   setLayerIdxInVps(Int layerId, UInt layerIdx)           { m_layerIdxInVps[layerId] = layerIdx; }
    975 #endif
     970
    976971  UInt   getMaxSLayersInLayerSetMinus1(Int ls)                  { return m_maxSLInLayerSetMinus1[ls]; }
    977972  Void   setMaxSLayersInLayerSetMinus1(Int ls, Int x)           { m_maxSLInLayerSetMinus1[ls] = x;    }

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

    r1160 r1161  
    116116#define P0297_VPS_POC_LSB_ALIGNED_FLAG   1      ///< JCTVC-P0297: vps_poc_lsb_aligned_flag for cross-layer POC anchor picture derivation
    117117
    118 #define VPS_EXTN_MASK_AND_DIM_INFO       1      ///< Include avc_base_layer_flag, splitting_flag, scalability mask and dimension related info
    119 #if VPS_EXTN_MASK_AND_DIM_INFO
    120 #define MAX_VPS_NUM_SCALABILITY_TYPES    16
    121 #endif
    122118#define VPS_EXTN_OP_LAYER_SETS           1      ///< Include output layer sets in VPS extension
    123119#define VPS_EXTN_PROFILE_INFO            1      ///< Include profile information for layer sets in VPS extension
    … …  
    132128#endif
    133129#define P0182_VPS_VUI_PS_FLAG            1      ///< JCTVC-P0182, add base_layer_parameter_set_compatibility_flag
    134 
    135 #define DERIVE_LAYER_ID_LIST_VARIABLES   1      ///< Derived variables based on the variables in VPS - for use in syntax table parsing
    136130
    137131#define AVC_BASE                         1      ///< YUV BL reading for AVC base SVC
    … …  
    226220#define MAX_NUM_ADD_LAYER_SETS           1023
    227221#define MAX_SEIS_IN_BSP_NESTING          64
     222#define MAX_VPS_NUM_SCALABILITY_TYPES    16
    228223
    229224#endif // SVC_EXTENSION

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

    r1160 r1161  
    10711071    }
    10721072  }
    1073 #if DERIVE_LAYER_ID_LIST_VARIABLES
     1073
     1074#if SVC_EXTENSION
    10741075  pcVPS->deriveLayerIdListVariables();
    10751076#endif
     1077
    10761078  TimingInfo *timingInfo = pcVPS->getTimingInfo();
    10771079  READ_FLAG(       uiCode, "vps_timing_info_present_flag");         timingInfo->setTimingInfoPresentFlag      (uiCode ? true : false);
    … …  
    26842686  }
    26852687#endif
    2686 #if VPS_EXTN_MASK_AND_DIM_INFO
     2688
    26872689  UInt numScalabilityTypes = 0, i = 0, j = 0;
    26882690
    … …  
    27412743    }
    27422744  }
    2743 #endif
     2745
    27442746#if VIEW_ID_RELATED_SIGNALING
    27452747#if O0109_VIEW_ID_LEN

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

    r1159 r1161  
    19941994  }
    19951995#endif
    1996 #if VPS_EXTN_MASK_AND_DIM_INFO
     1996
    19971997  UInt i = 0, j = 0;
    19981998
    … …  
    20372037    }
    20382038  }
    2039 #endif
     2039
    20402040#if VIEW_ID_RELATED_SIGNALING
    20412041  // if ( pcVPS->getNumViews() > 1 ) 
Note: See TracChangeset for help on using the changeset viewer.