Changeset 1289 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibDecoder


Ignore:
Timestamp:
18 Jul 2015, 00:52:46 (10 years ago)
Author:
seregin
Message:

port rev 4323 (g_uiMaxCUWidth, g_uiMaxCUHeight)

Location:
branches/SHM-dev/source/Lib/TLibDecoder
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r1287 r1289  
    204204
    205205//! decode CU block recursively
    206 Void TDecCu::xDecodeCU( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool &isLastCtuOfSliceSegment)
    207 {
    208   TComPic* pcPic = pcCU->getPic();
     206Void TDecCu::xDecodeCU( TComDataCU*const pcCU, const UInt uiAbsPartIdx, const UInt uiDepth, Bool &isLastCtuOfSliceSegment)
     207{
     208  TComPic* pcPic        = pcCU->getPic();
     209  const TComSPS &sps    = pcPic->getPicSym()->getSPS();
     210  const TComPPS &pps    = pcPic->getPicSym()->getPPS();
     211  const UInt maxCuWidth = sps.getMaxCUWidth();
     212  const UInt maxCuHeight= sps.getMaxCUHeight();
    209213  UInt uiCurNumParts    = pcPic->getNumPartitionsInCtu() >> (uiDepth<<1);
    210214  UInt uiQNumParts      = uiCurNumParts>>2;
    211215
     216
    212217  Bool bBoundary = false;
    213218  UInt uiLPelX   = pcCU->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
    214   UInt uiRPelX   = uiLPelX + (g_uiMaxCUWidth>>uiDepth)  - 1;
     219  UInt uiRPelX   = uiLPelX + (maxCuWidth>>uiDepth)  - 1;
    215220  UInt uiTPelY   = pcCU->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
    216   UInt uiBPelY   = uiTPelY + (g_uiMaxCUHeight>>uiDepth) - 1;
    217 
    218   TComSlice * pcSlice = pcCU->getPic()->getSlice(pcCU->getPic()->getCurrSliceIdx());
    219 
    220 #if SVC_EXTENSION
     221  UInt uiBPelY   = uiTPelY + (maxCuHeight>>uiDepth) - 1;
     222
     223#if SVC_EXTENSION
     224  TComSlice * pcSlice = pcPic->getSlice(pcPic->getCurrSliceIdx());
     225
    221226  if( ( uiRPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getPicHeightInLumaSamples() ) )
    222227#else
    223   if( ( uiRPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiBPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) )
     228  if( ( uiRPelX < sps.getPicWidthInLumaSamples() ) && ( uiBPelY < sps.getPicHeightInLumaSamples() ) )
    224229#endif
    225230  {
    … …  
    234239  {
    235240    UInt uiIdx = uiAbsPartIdx;
    236     if( (g_uiMaxCUWidth>>uiDepth) == (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuDQPDepth())) && pcCU->getSlice()->getPPS()->getUseDQP())
     241    if( (maxCuWidth>>uiDepth) == (maxCuWidth >> ( pps.getMaxCuDQPDepth())) && pps.getUseDQP()) // TODO: tidy expression
    237242    {
    238243      setdQPFlag(true);
    … …  
    240245    }
    241246
    242     if( (g_uiMaxCUWidth>>uiDepth) == (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuChromaQpAdjDepth())) && pcCU->getSlice()->getUseChromaQpAdj() )
     247    if( (maxCuWidth>>uiDepth) == (maxCuWidth >> ( pps.getMaxCuChromaQpAdjDepth())) && pcCU->getSlice()->getUseChromaQpAdj() ) // TODO: tidy expression
    243248    {
    244249      setIsChromaQpAdjCoded(true);
    … …  
    253258      if ( !isLastCtuOfSliceSegment && ( uiLPelX < pcCU->getSlice()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getPicHeightInLumaSamples() ) )
    254259#else
    255       if ( !isLastCtuOfSliceSegment && ( uiLPelX < pcCU->getSlice()->getSPS()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcCU->getSlice()->getSPS()->getPicHeightInLumaSamples() ) )
     260      if ( !isLastCtuOfSliceSegment && ( uiLPelX < sps.getPicWidthInLumaSamples() ) && ( uiTPelY < sps.getPicHeightInLumaSamples() ) )
    256261#endif
    257262      {
    … …  
    265270      uiIdx += uiQNumParts;
    266271    }
    267     if( (g_uiMaxCUWidth>>uiDepth) == (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuDQPDepth())) && pcCU->getSlice()->getPPS()->getUseDQP())
     272    if( (maxCuWidth>>uiDepth) == (maxCuWidth >> ( pps.getMaxCuDQPDepth())) && pps.getUseDQP()) // TODO: tidy expression
    268273    {
    269274      if ( getdQPFlag() )
    … …  
    276281  }
    277282
    278   if( (g_uiMaxCUWidth>>uiDepth) >= (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuDQPDepth())) && pcCU->getSlice()->getPPS()->getUseDQP())
     283  if( (maxCuWidth>>uiDepth) >= (maxCuWidth >> ( pps.getMaxCuDQPDepth())) && pps.getUseDQP()) // TODO: tidy expression
    279284  {
    280285    setdQPFlag(true);
    … …  
    282287  }
    283288
    284   if( (g_uiMaxCUWidth>>uiDepth) >= (g_uiMaxCUWidth >> ( pcCU->getSlice()->getPPS()->getMaxCuChromaQpAdjDepth())) && pcCU->getSlice()->getUseChromaQpAdj() )
     289  if( (maxCuWidth>>uiDepth) >= (maxCuWidth >> ( pps.getMaxCuChromaQpAdjDepth())) && pcCU->getSlice()->getUseChromaQpAdj() ) // TODO: tidy expression
    285290  {
    286291    setIsChromaQpAdjCoded(true);
    287292  }
    288293
    289   if (pcCU->getSlice()->getPPS()->getTransquantBypassEnableFlag())
     294  if (pps.getTransquantBypassEnableFlag())
    290295  {
    291296    m_pcEntropyDecoder->decodeCUTransquantBypassFlag( pcCU, uiAbsPartIdx, uiDepth );
    … …  
    393398{
    394399  TComPic* pcPic = pCtu->getPic();
     400  TComSlice * pcSlice = pCtu->getSlice();
     401  const TComSPS &sps=*(pcSlice->getSPS());
    395402
    396403  Bool bBoundary = false;
    397404  UInt uiLPelX   = pCtu->getCUPelX() + g_auiRasterToPelX[ g_auiZscanToRaster[uiAbsPartIdx] ];
    398   UInt uiRPelX   = uiLPelX + (g_uiMaxCUWidth>>uiDepth)  - 1;
     405  UInt uiRPelX   = uiLPelX + (sps.getMaxCUWidth()>>uiDepth)  - 1;
    399406  UInt uiTPelY   = pCtu->getCUPelY() + g_auiRasterToPelY[ g_auiZscanToRaster[uiAbsPartIdx] ];
    400   UInt uiBPelY   = uiTPelY + (g_uiMaxCUHeight>>uiDepth) - 1;
    401 
    402   TComSlice * pcSlice = pCtu->getPic()->getSlice(pCtu->getPic()->getCurrSliceIdx());
     407  UInt uiBPelY   = uiTPelY + (sps.getMaxCUHeight()>>uiDepth) - 1;
    403408
    404409#if SVC_EXTENSION
    405410  if( ( uiRPelX >= pcSlice->getPicWidthInLumaSamples() ) || ( uiBPelY >= pcSlice->getPicHeightInLumaSamples() ) )
    406411#else
    407   if( ( uiRPelX >= pcSlice->getSPS()->getPicWidthInLumaSamples() ) || ( uiBPelY >= pcSlice->getSPS()->getPicHeightInLumaSamples() ) )
     412  if( ( uiRPelX >= sps.getPicWidthInLumaSamples() ) || ( uiBPelY >= sps.getPicHeightInLumaSamples() ) )
    408413#endif
    409414  {
    … …  
    424429      if( ( uiLPelX < pcSlice->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getPicHeightInLumaSamples() ) )
    425430#else
    426       if( ( uiLPelX < pcSlice->getSPS()->getPicWidthInLumaSamples() ) && ( uiTPelY < pcSlice->getSPS()->getPicHeightInLumaSamples() ) )
     431      if( ( uiLPelX < sps.getPicWidthInLumaSamples() ) && ( uiTPelY < sps.getPicHeightInLumaSamples() ) )
    427432#endif
    428433      {
    … …  
    534539
    535540  TComDataCU *pcCU = rTu.getCU();
     541  const TComSPS &sps=*(pcCU->getSlice()->getSPS());
    536542  const UInt uiAbsPartIdx=rTu.GetAbsPartIdxTU();
    537543
    … …  
    649655  const Int clipbd = pcCU->getSlice()->getBitDepth(toChannelType(compID));
    650656#else
    651   const Int clipbd = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID));
     657  const Int clipbd = sps.getBitDepth(toChannelType(compID));
    652658#endif
    653659#if O0043_BEST_EFFORT_DECODING
    654   const Int bitDepthDelta = pcCU->getSlice()->getSPS()->getStreamBitDepth(toChannelType(compID)) - clipbd;
     660  const Int bitDepthDelta = sps.getStreamBitDepth(toChannelType(compID)) - clipbd;
    655661#endif
    656662
    … …  
    836842  const UInt uiPcmLeftShiftBit = pcCU->getSlice()->getBitDepth(toChannelType(compID)) - pcCU->getSlice()->getSPS()->getPCMBitDepth(toChannelType(compID));
    837843#else
    838   const UInt uiPcmLeftShiftBit = pcCU->getSlice()->getSPS()->getBitDepth(toChannelType(compID)) - pcCU->getSlice()->getSPS()->getPCMBitDepth(toChannelType(compID));
     844  const TComSPS &sps           = *(pcCU->getSlice()->getSPS());
     845  const UInt uiPcmLeftShiftBit = sps.getBitDepth(toChannelType(compID)) - sps.getPCMBitDepth(toChannelType(compID));
    839846#endif
    840847
    … …  
    859866Void TDecCu::xReconPCM( TComDataCU* pcCU, UInt uiDepth )
    860867{
     868  const UInt maxCuWidth     = pcCU->getSlice()->getSPS()->getMaxCUWidth();
     869  const UInt maxCuHeight    = pcCU->getSlice()->getSPS()->getMaxCUHeight();
    861870  for (UInt ch=0; ch < pcCU->getPic()->getNumberValidComponents(); ch++)
    862871  {
    863872    const ComponentID compID = ComponentID(ch);
    864     const UInt width  = (g_uiMaxCUWidth >>(uiDepth+m_ppcYuvResi[uiDepth]->getComponentScaleX(compID)));
    865     const UInt height = (g_uiMaxCUHeight>>(uiDepth+m_ppcYuvResi[uiDepth]->getComponentScaleY(compID)));
     873    const UInt width  = (maxCuWidth >>(uiDepth+m_ppcYuvResi[uiDepth]->getComponentScaleX(compID)));
     874    const UInt height = (maxCuHeight>>(uiDepth+m_ppcYuvResi[uiDepth]->getComponentScaleY(compID)));
    866875    const UInt stride = m_ppcYuvResi[uiDepth]->getStride(compID);
    867876    Pel * pPCMChannel = pcCU->getPCMSample(compID);
    … …  
    878887{
    879888  const ChromaFormat format = pCU->getPic()->getChromaFormat();
    880   const UInt numValidComp=getNumberValidComponents(format);
     889  const UInt numValidComp   = getNumberValidComponents(format);
     890  const UInt maxCuWidth     = pCU->getSlice()->getSPS()->getMaxCUWidth();
     891  const UInt maxCuHeight    = pCU->getSlice()->getSPS()->getMaxCUHeight();
    881892
    882893  for (UInt componentIndex = 0; componentIndex < numValidComp; componentIndex++)
    … …  
    884895    const ComponentID component = ComponentID(componentIndex);
    885896
    886     const UInt width  = g_uiMaxCUWidth  >> (depth + getComponentScaleX(component, format));
    887     const UInt height = g_uiMaxCUHeight >> (depth + getComponentScaleY(component, format));
     897    const UInt width  = maxCuWidth  >> (depth + getComponentScaleX(component, format));
     898    const UInt height = maxCuHeight >> (depth + getComponentScaleY(component, format));
    888899
    889900    Pel *source      = m_ppcYuvReco[depth]->getAddr(component, 0, width);

  • branches/SHM-dev/source/Lib/TLibDecoder/TDecCu.h

    r1263 r1289  
    106106protected:
    107107
    108   Void xDecodeCU                ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool &isLastCtuOfSliceSegment);
     108  Void xDecodeCU                ( TComDataCU* const pcCU, const UInt uiAbsPartIdx, const UInt uiDepth, Bool &isLastCtuOfSliceSegment);
    109109  Void xFinishDecodeCU          ( TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth, Bool &isLastCtuOfSliceSegment);
    110110  Bool xDecodeSliceEnd          ( TComDataCU* pcCU, UInt uiAbsPartIdx );

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

    r1287 r1289  
    371371  {
    372372    Bool bIpcmFlag = true;
     373    const TComSPS &sps=*(pcCU->getSlice()->getSPS());
    373374
    374375    pcCU->setPartSizeSubParts  ( SIZE_2Nx2N, uiAbsPartIdx, uiDepth );
    375     pcCU->setSizeSubParts      ( g_uiMaxCUWidth>>uiDepth, g_uiMaxCUHeight>>uiDepth, uiAbsPartIdx, uiDepth );
     376    pcCU->setSizeSubParts      ( sps.getMaxCUWidth()>>uiDepth, sps.getMaxCUHeight()>>uiDepth, uiAbsPartIdx, uiDepth );
    376377    pcCU->setTrIdxSubParts     ( 0, uiAbsPartIdx, uiDepth );
    377378    pcCU->setIPCMFlagSubParts  ( bIpcmFlag, uiAbsPartIdx, uiDepth );
    … …  
    439440    pcCU->setPredModeSubParts( MODE_INTER,  uiAbsPartIdx, uiDepth );
    440441    pcCU->setPartSizeSubParts( SIZE_2Nx2N, uiAbsPartIdx, uiDepth );
    441     pcCU->setSizeSubParts( g_uiMaxCUWidth>>uiDepth, g_uiMaxCUHeight>>uiDepth, uiAbsPartIdx, uiDepth );
     442    pcCU->setSizeSubParts( pcCU->getSlice()->getSPS()->getMaxCUWidth()>>uiDepth, pcCU->getSlice()->getSPS()->getMaxCUHeight()>>uiDepth, uiAbsPartIdx, uiDepth );
    442443    pcCU->setMergeFlagSubParts( true , uiAbsPartIdx, 0, uiDepth );
    443444  }
    … …  
    515516  }
    516517#if RExt__DECODER_DEBUG_BIT_STATISTICS
    517   const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__SPLIT_FLAG, g_aucConvertToBit[g_uiMaxCUWidth>>uiDepth]+2);
     518  const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__SPLIT_FLAG, g_aucConvertToBit[pcCU->getSlice()->getSPS()->getMaxCUWidth()>>uiDepth]+2);
    518519#endif
    519520
    … …  
    537538  UInt uiSymbol, uiMode = 0;
    538539  PartSize eMode;
     540  const UChar cuWidth =UChar(pcCU->getSlice()->getSPS()->getMaxCUWidth()>>uiDepth);
     541  const UChar cuHeight=UChar(pcCU->getSlice()->getSPS()->getMaxCUHeight()>>uiDepth);
    539542
    540543#if RExt__DECODER_DEBUG_BIT_STATISTICS
    541   const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__PART_SIZE, g_aucConvertToBit[g_uiMaxCUWidth>>uiDepth]+2);
     544  const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__PART_SIZE, g_aucConvertToBit[cuWidth]+2);
    542545#endif
    543546
    … …  
    567570    UInt uiMaxNumBits = 2;
    568571
    569     if( uiDepth == g_uiMaxCUDepth - g_uiAddCUDepth && !( (g_uiMaxCUWidth>>uiDepth) == 8 && (g_uiMaxCUHeight>>uiDepth) == 8 ) )
     572    if( uiDepth == g_uiMaxCUDepth - g_uiAddCUDepth && !( cuWidth == 8 && cuHeight == 8 ) )
    570573    {
    571574      uiMaxNumBits ++;
    … …  
    605608  }
    606609  pcCU->setPartSizeSubParts( eMode, uiAbsPartIdx, uiDepth );
    607   pcCU->setSizeSubParts( g_uiMaxCUWidth>>uiDepth, g_uiMaxCUHeight>>uiDepth, uiAbsPartIdx, uiDepth );
     610  pcCU->setSizeSubParts( cuWidth, cuHeight, uiAbsPartIdx, uiDepth );
    608611}
    609612
    … …  
    643646  }
    644647#if RExt__DECODER_DEBUG_BIT_STATISTICS
    645   const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__INTRA_DIR_ANG, g_aucConvertToBit[g_uiMaxCUWidth>>depth]+2, CHANNEL_TYPE_LUMA);
     648  const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__INTRA_DIR_ANG, g_aucConvertToBit[pcCU->getSlice()->getSPS()->getMaxCUWidth()>>depth]+2, CHANNEL_TYPE_LUMA);
    646649#endif
    647650  for (j=0;j<partNum;j++)
    … …  
    696699  UInt uiSymbol;
    697700#if RExt__DECODER_DEBUG_BIT_STATISTICS
    698   const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__INTRA_DIR_ANG, g_aucConvertToBit[g_uiMaxCUWidth>>uiDepth]+2, CHANNEL_TYPE_CHROMA);
     701  const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__INTRA_DIR_ANG, g_aucConvertToBit[pcCU->getSlice()->getSPS()->getMaxCUWidth()>>uiDepth]+2, CHANNEL_TYPE_CHROMA);
    699702#endif
    700703
    … …  
    975978  UInt symbol;
    976979#if RExt__DECODER_DEBUG_BIT_STATISTICS
    977   const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__CHROMA_QP_ADJUSTMENT, g_aucConvertToBit[g_uiMaxCUWidth>>depth]+2, CHANNEL_TYPE_CHROMA);
     980  const TComCodingStatisticsClassType ctype(STATS__CABAC_BITS__CHROMA_QP_ADJUSTMENT, g_aucConvertToBit[cu->getSlice()->getSPS()->getMaxCUWidth()>>depth]+2, CHANNEL_TYPE_CHROMA);
    978981#endif
    979982
    … …  
    18691872
    18701873#if RExt__DECODER_DEBUG_BIT_STATISTICS
    1871   const TComCodingStatisticsClassType ctype(STATS__EXPLICIT_RDPCM_BITS, g_aucConvertToBit[g_uiMaxCUWidth>>rTu.GetTransformDepthTotal()]+2);
     1874  const TComCodingStatisticsClassType ctype(STATS__EXPLICIT_RDPCM_BITS, g_aucConvertToBit[cu->getSlice()->getSPS()->getMaxCUWidth()>>rTu.GetTransformDepthTotal()]+2);
    18721875#endif
    18731876

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

    r1288 r1289  
    254254    }
    255255
    256     rpcPic->create( vps, sps, pps, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true, m_layerId);
     256    rpcPic->create( vps, sps, pps, g_uiMaxCUDepth, true, m_layerId);
    257257#else //SVC_EXTENSION
    258     rpcPic->create ( sps, pps, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);
     258    rpcPic->create ( sps, pps, g_uiMaxCUDepth, true);
    259259#endif //SVC_EXTENSION
    260260   
    … …  
    303303  }
    304304
    305   rpcPic->create( vps, sps, pps, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true, m_layerId);
     305  rpcPic->create( vps, sps, pps, g_uiMaxCUDepth, true, m_layerId);
    306306#else  //SVC_EXTENSION
    307   rpcPic->create ( sps, pps, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true);
     307  rpcPic->create ( sps, pps, g_uiMaxCUDepth, true);
    308308#endif //SVC_EXTENSION
    309309}
    … …  
    493493        UInt refLayerId = 0;
    494494
    495         pBLPic->create( *vps, *sps, *pps, sps->getMaxCUWidth(), sps->getMaxCUHeight(), sps->getMaxCUDepth(), true, refLayerId);
     495        pBLPic->create( *vps, *sps, *pps, sps->getMaxCUDepth(), true, refLayerId);
    496496
    497497        // it is needed where the VPS is accessed through the slice
    … …  
    572572
    573573    // TODO: remove the use of the following globals:
    574     g_uiMaxCUWidth  = sps->getMaxCUWidth();
    575     g_uiMaxCUHeight = sps->getMaxCUHeight();
    576574    g_uiMaxCUDepth  = sps->getMaxCUDepth();
    577575#if SVC_EXTENSION
    … …  
    613611    m_cLoopFilter.create( sps->getMaxCUDepth() );
    614612    m_cPrediction.initTempBuff(sps->getChromaFormatIdc());
     613
    615614
    616615    Bool isField = false;
    … …  
    702701
    703702    // Check if any new SEI has arrived
    704     if(!m_SEIs.empty())
    705     {
    706       // Currently only decoding Unit SEI message occurring between VCL NALUs copied
    707       SEIMessages &picSEI = m_pcPic->getSEIs();
    708       SEIMessages decodingUnitInfos = extractSeisByType (m_SEIs, SEI::DECODING_UNIT_INFO);
    709       picSEI.insert(picSEI.end(), decodingUnitInfos.begin(), decodingUnitInfos.end());
    710       deleteSEIs(m_SEIs);
    711     }
     703     if(!m_SEIs.empty())
     704     {
     705       // Currently only decoding Unit SEI message occurring between VCL NALUs copied
     706       SEIMessages &picSEI = m_pcPic->getSEIs();
     707       SEIMessages decodingUnitInfos = extractSeisByType (m_SEIs, SEI::DECODING_UNIT_INFO);
     708       picSEI.insert(picSEI.end(), decodingUnitInfos.begin(), decodingUnitInfos.end());
     709       deleteSEIs(m_SEIs);
     710     }
    712711  }
    713712
    … …  
    21992198  if( m_layerId > 0 )
    22002199  {
    2201     g_uiMaxCUWidth  = sps->getMaxCUWidth();
    2202     g_uiMaxCUHeight = sps->getMaxCUHeight();
    22032200    g_uiMaxCUDepth  = sps->getMaxCUDepth();
    22042201    g_uiAddCUDepth  = max (0, sps->getLog2MinCodingBlockSize() - (Int)sps->getQuadtreeTULog2MinSize() );
    … …  
    22102207        m_cIlpPic[j] = new  TComPic;
    22112208
    2212         m_cIlpPic[j]->create(*vps, *sps, *slice->getPPS(), g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, true, m_layerId);
     2209        m_cIlpPic[j]->create(*vps, *sps, *slice->getPPS(), g_uiMaxCUDepth, true, m_layerId);
    22132210
    22142211        for (Int i=0; i<m_cIlpPic[j]->getPicSym()->getNumberOfCtusInFrame(); i++)
    … …  
    23892386      Int picHeight   = pcSlice->getPicHeightInLumaSamples();
    23902387      m_pColorMappedPic = new TComPicYuv;
    2391       m_pColorMappedPic->create( picWidth, picHeight, pcSlice->getChromaFormatIdc()/*CHROMA_420*/, g_uiMaxCUWidth, g_uiMaxCUHeight, g_uiMaxCUDepth, NULL );
     2388      m_pColorMappedPic->create( picWidth, picHeight, pcSlice->getChromaFormatIdc()/*CHROMA_420*/, pcSlice->getSPS()->getMaxCUWidth(), pcSlice->getSPS()->getMaxCUHeight(), g_uiMaxCUDepth, true, NULL );
    23922389    }
    23932390  }
Note: See TracChangeset for help on using the changeset viewer.