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


Ignore:
Timestamp:
8 Jul 2015, 03:09:51 (10 years ago)
Author:
seregin
Message:

macro cleanup: DPB_PARAMS_MAXTLAYERS, MULTIPLE_PTL_SUPPORT

Location:
branches/SHM-dev/source/Lib
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r1180 r1182  
    582582  UInt        m_numOpSets;
    583583  Bool        m_layerIdIncludedFlag[MAX_VPS_OP_SETS_PLUS1][MAX_VPS_NUH_RESERVED_ZERO_LAYER_ID_PLUS1];
    584 #endif
    585 #if !MULTIPLE_PTL_SUPPORT
    586584  TComPTL     m_pcPTL;
    587585#endif
    … …  
    591589  Bool        m_baseLayerInternalFlag;
    592590  Bool        m_baseLayerAvailableFlag;
    593 #if MULTIPLE_PTL_SUPPORT
    594591  TComPTL     m_pcPTLList[MAX_NUM_LAYER_IDS + 1];
    595 #endif
    596592
    597593  std::vector< std::vector<Int> >     m_layerSetLayerIdList;
    … …  
    623619  // Profile-tier-level signalling related
    624620  Bool       m_profilePresentFlag[MAX_VPS_LAYER_SETS_PLUS1];    // The value with index 0 will not be used.
    625 #if !MULTIPLE_PTL_SUPPORT
     621#if !SVC_EXTENSION
    626622  std::vector<TComPTL>    m_pcPTLForExtn; 
    627623#endif
    … …  
    811807  Void    setLayerIdIncludedFlag(Bool v, UInt opsIdx, UInt id)  { m_layerIdIncludedFlag[opsIdx][id] = v;    }
    812808
    813 #if !MULTIPLE_PTL_SUPPORT
     809#if !SVC_EXTENSION
    814810  TComPTL* getPTL() { return &m_pcPTL; }
    815811#endif
    … …  
    847843  }
    848844#endif
    849 #if MULTIPLE_PTL_SUPPORT
    850   TComPTL* getPTL() { return &m_pcPTLList[0]; }
    851   TComPTL* getPTL(UInt idx) { return &m_pcPTLList[idx]; }
    852 #endif
     845  TComPTL* getPTL()                                             { return &m_pcPTLList[0]; }
     846  TComPTL* getPTL(UInt idx)                                     { return &m_pcPTLList[idx]; }
     847
    853848  Int     getLayerSetLayerIdList(Int set, Int layerId)          { return m_layerSetLayerIdList[set][layerId]; }
    854849  Void    setLayerSetLayerIdList(Int set, Int layerId, Int x)   { m_layerSetLayerIdList[set][layerId] = x;    }
    … …  
    928923  Void   setProfilePresentFlag(Int id, Bool x)                  { m_profilePresentFlag[id] = x;    }
    929924
    930 #if !MULTIPLE_PTL_SUPPORT
    931   std::vector<TComPTL>* getPTLForExtnPtr()                      { return &m_pcPTLForExtn;          }
    932   TComPTL* getPTLForExtn(Int id)                                { return &m_pcPTLForExtn[id];      }
    933 #endif
    934925  // Target output layer signalling related
    935926  UInt   getNumOutputLayerSets()                                { return m_numOutputLayerSets;     }
    … …  
    976967  Int    getProfileLevelTierIdx(Int const olsIdx, Int const layerIdx)                   { return m_profileLevelTierIdx[olsIdx][layerIdx]; }
    977968  Void   setProfileLevelTierIdx(Int const olsIdx, Int const layerIdx, Int const ptlIdx) { m_profileLevelTierIdx[olsIdx][layerIdx] = ptlIdx; }
    978 #if MULTIPLE_PTL_SUPPORT
    979969  Void   addProfileLevelTierIdx(Int const olsIdx, Int const ptlIdx)             { m_profileLevelTierIdx[olsIdx].push_back(ptlIdx); }
    980 #endif
    981970  Int    calculateLenOfSyntaxElement( Int const numVal );
    982971

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

    r1181 r1182  
    117117#define O0062_POC_LSB_NOT_PRESENT_FLAG   1      ///< JCTVC-O0062: signal poc_lsb_not_present_flag for each layer in VPS extension
    118118
    119 #define MULTIPLE_PTL_SUPPORT             1      ///< Profile, tier and level signalling
    120 
    121119#define VPS_DPB_SIZE_TABLE               1      ///< JCTVC-O0217: DPB operations: signaling DPB-related parameters
    122120
    123 #define DPB_PARAMS_MAXTLAYERS            1      ///< JCTVC-P0156 DPB parameters up to maximum temporal sub-layers in the layer set
    124121#define NO_CLRAS_OUTPUT_FLAG             1
    125122
    … …  
    783780    MAINREXT = 4,
    784781    HIGHTHROUGHPUTREXT = 5,
    785 #if MULTIPLE_PTL_SUPPORT
     782#if SVC_EXTENSION
    786783    MULTIVIEWMAIN = 6,
    787784    SCALABLEMAIN = 7,

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

    r1180 r1182  
    21092109  for (Int i = 0; i < maxNumSubLayersMinus1; i++)
    21102110  {
    2111 #if MULTIPLE_PTL_SUPPORT
     2111#if SVC_EXTENSION
    21122112    READ_FLAG( uiCode, "sub_layer_profile_present_flag[i]" ); rpcPTL->setSubLayerProfilePresentFlag(i, uiCode);
    21132113#else
    … …  
    21312131  for(Int i = 0; i < maxNumSubLayersMinus1; i++)
    21322132  {
    2133 #if MULTIPLE_PTL_SUPPORT
     2133#if SVC_EXTENSION
    21342134    if( rpcPTL->getSubLayerProfilePresentFlag(i) )
    21352135#else
    … …  
    21832183    READ_FLAG(    uiCode, "general_one_picture_only_constraint_flag");
    21842184    READ_FLAG(    uiCode, "general_lower_bit_rate_constraint_flag"); ptl->setLowerBitRateConstraintFlag(uiCode != 0);
    2185 #if MULTIPLE_PTL_SUPPORT
     2185#if SVC_EXTENSION
    21862186    READ_CODE(32, uiCode, "general_reserved_zero_34bits");  READ_CODE(2, uiCode, "general_reserved_zero_34bits");
    21872187  }
    … …  
    26622662  {
    26632663    vps->setProfilePresentFlag(1, false);
    2664 #if MULTIPLE_PTL_SUPPORT
    26652664    parsePTL( vps->getPTL(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
    2666 #else
    2667     vps->getPTLForExtnPtr()->empty();
    2668     vps->getPTLForExtnPtr()->resize(2);
    2669     vps->getPTLForExtn(1)->copyProfileInfo( vps->getPTL() );
    2670     parsePTL( vps->getPTLForExtn(1), vps->getProfilePresentFlag(1), vps->getMaxTLayers() - 1 );
    2671 #endif
    26722665  }
    26732666
    … …  
    28572850
    28582851  Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
    2859 #if !MULTIPLE_PTL_SUPPORT
    2860   vps->getPTLForExtnPtr()->resize(vps->getNumProfileTierLevel());
    2861 #endif
    2862 
    2863   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
     2852
     2853  for( Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++ )
    28642854  {
    28652855    READ_FLAG( uiCode, "vps_profile_present_flag[i]" ); vps->setProfilePresentFlag(idx, uiCode ? true : false);
     2856
    28662857    if( !vps->getProfilePresentFlag(idx) )
    28672858    {
    28682859      // Copy profile information from previous one
    2869 #if MULTIPLE_PTL_SUPPORT
    28702860      vps->getPTL(idx)->copyProfileInfo( vps->getPTL( idx - 1 ) );
    2871 #else
    2872       vps->getPTLForExtn(idx)->copyProfileInfo( (idx==1) ? vps->getPTL() : vps->getPTLForExtn( idx - 1 ) );
    2873 #endif
    2874     }
    2875 #if MULTIPLE_PTL_SUPPORT
     2861    }
     2862
    28762863    parsePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
    2877 #else
    2878     parsePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
    2879 #endif
    28802864  }
    28812865
    … …  
    29522936
    29532937    vps->getProfileLevelTierIdx(i)->assign(vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet), -1);
    2954     for(j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet) ; j++)
     2938
     2939    for( j = 0; j < vps->getNumLayersInIdList(layerSetIdxForOutputLayerSet); j++ )
    29552940    {
    29562941      if( vps->getNecessaryLayerFlag(i, j) && (vps->getNumProfileTierLevel()-1) > 0 )
    … …  
    29592944        vps->setProfileLevelTierIdx(i, j, uiCode );
    29602945
    2961 #if MULTIPLE_PTL_SUPPORT
    29622946        //For conformance checking
    29632947        //Conformance of a layer in an output operation point associated with an OLS in a bitstream to the Scalable Main profile is indicated as follows:
    … …  
    29772961          }
    29782962        }
    2979 #endif
    29802963      }
    29812964    }

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

    r1180 r1182  
    13331333  for (Int i = 0; i < maxNumSubLayersMinus1; i++)
    13341334  {
    1335 #if MULTIPLE_PTL_SUPPORT
     1335#if SVC_EXTENSION
    13361336    WRITE_FLAG( pcPTL->getSubLayerProfilePresentFlag(i), "sub_layer_profile_present_flag[i]" );
    13371337#else
    … …  
    13551355  for(Int i = 0; i < maxNumSubLayersMinus1; i++)
    13561356  {
    1357 #if MULTIPLE_PTL_SUPPORT
     1357#if SVC_EXTENSION
    13581358    if( pcPTL->getSubLayerProfilePresentFlag(i) )
    13591359#else
    … …  
    13731373  WRITE_CODE( ptl->getProfileSpace(), 2 ,     "XXX_profile_space[]");
    13741374  WRITE_FLAG( ptl->getTierFlag()==Level::HIGH, "XXX_tier_flag[]"    );
    1375 #if MULTIPLE_PTL_SUPPORT
     1375#if SVC_EXTENSION
    13761376  WRITE_CODE( (ptl->getProfileIdc() == Profile::SCALABLEMAIN || ptl->getProfileIdc() == Profile::SCALABLEMAIN10) ? 7 : Int(ptl->getProfileIdc()), 5 ,  "XXX_profile_idc[]"  );
    13771377#else
    … …  
    14011401    WRITE_FLAG(0,                                    "general_one_picture_only_constraint_flag");
    14021402    WRITE_FLAG(ptl->getLowerBitRateConstraintFlag(), "general_lower_bit_rate_constraint_flag");
    1403 #if MULTIPLE_PTL_SUPPORT
     1403#if SVC_EXTENSION
    14041404    WRITE_CODE(0, 32,  "general_reserved_zero_34bits");  WRITE_CODE(0, 2,  "general_reserved_zero_34bits");
    14051405  }
    … …  
    19771977  if( vps->getMaxLayers() > 1 && vps->getBaseLayerInternalFlag() )
    19781978  {
    1979 #if MULTIPLE_PTL_SUPPORT
    19801979    codePTL( vps->getPTL(1), false, vps->getMaxTLayers() - 1 );
    1981 #else
    1982     codePTL( vps->getPTLForExtn(1), false, vps->getMaxTLayers() - 1 );
    1983 #endif
    19841980  }
    19851981
    … …  
    21122108  Int const numBitsForPtlIdx = vps->calculateLenOfSyntaxElement( vps->getNumProfileTierLevel() );
    21132109
    2114 #if MULTIPLE_PTL_SUPPORT
    21152110  //Do something here to make sure the loop is correct to consider base layer internal stuff
    2116 #else
    2117   assert( vps->getNumProfileTierLevel() == vps->getPTLForExtnPtr()->size());
    2118 #endif
    2119   for(Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++)
    2120   {
    2121 #if MULTIPLE_PTL_SUPPORT
     2111
     2112  for( Int idx = vps->getBaseLayerInternalFlag() ? 2 : 1; idx < vps->getNumProfileTierLevel(); idx++ )
     2113  {
    21222114    vps->setProfilePresentFlag(idx, true);
    2123 #endif
     2115
    21242116    WRITE_FLAG( vps->getProfilePresentFlag(idx),       "vps_profile_present_flag[i]" );
    2125 #if MULTIPLE_PTL_SUPPORT
     2117
    21262118    codePTL( vps->getPTL(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
    2127 #else
    2128     codePTL( vps->getPTLForExtn(idx), vps->getProfilePresentFlag(idx), vps->getMaxTLayers() - 1 );
    2129 #endif
    21302119  }
    21312120

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

    r1174 r1182  
    240240
    241241  // set the VPS profile information
    242 #if !MULTIPLE_PTL_SUPPORT
    243   *m_cVPS.getPTL() = *m_cSPS.getPTL();
    244 #endif
    245242#if VPS_VUI_BSP_HRD_PARAMS
    246243  m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( true );
    247244#else
     245  *m_cVPS.getPTL() = *m_cSPS.getPTL();
    248246  m_cVPS.getTimingInfo()->setTimingInfoPresentFlag       ( false );
    249247#endif
Note: See TracChangeset for help on using the changeset viewer.