Ignore:
Timestamp:
16 Oct 2013, 11:27:16 (11 years ago)
Author:
kwu-htm
Message:

Clean-up version of JCT3V-E0227.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncRateCtrl.cpp

    r635 r636  
    726726  m_lastPicture = NULL;
    727727  list<TEncRCPic*>::reverse_iterator it;
     728#if KWU_RC_MADPRED_E0227
    728729  for ( it = listPreviousPictures.rbegin(); it != listPreviousPictures.rend(); it++ )
    729730  {
     
    734735    }
    735736  }
     737#endif
    736738#endif
    737739
     
    10921094  {
    10931095    Pel*  pOrg    = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0);
    1094     Pel*  pRec    = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvPred()->getLumaAddr(pcCU->getAddr(), 0);
     1096    Pel*  pRec    = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvRec()->getLumaAddr(pcCU->getAddr(), 0);
    10951097    Pel*  pDep    = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0);
    10961098    Int   iStride = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getStride();
     
    11211123    pcCU->getPosInPic(0, PosX, PosY);
    11221124    if((PosX + *iDisparity) < 0 || (PosX + *iDisparity + iWidth) >= pcCU->getSlice()->getSPS()->getMaxCUWidth())
     1125    {
    11231126      Disp = 0;
     1127    }
    11241128
    11251129    for( y = 0; y < iHeight; y++ )
     
    11381142    m_LCUs[ LCUIdx ].m_IVMAD = IVMAD;
    11391143    if(m_lastPicture)
     1144    {
    11401145      m_LCUs[ LCUIdx ].m_MAD = m_lastPicture->getLCU(LCUIdx).m_MAD;
     1146    }
    11411147
    11421148    MAD = m_LCUs[ LCUIdx ].m_IVMAD;
     
    20762082  m_sourceHeightInLCU        = (sourceHeight / maxCUHeight) + (( sourceHeight %  maxCUHeight) ? 1 : 0); 
    20772083  m_isLowdelay               = (sizeIntraPeriod == -1) ? true : false;
     2084#if KWU_RC_MADPRED_E0227
    20782085  m_prevBitrate              = ( targetKbps * 1000 );  // in units of 1,024 bps
    20792086  m_currBitrate              = ( targetKbps * 1000 );
     2087#else
     2088  m_prevBitrate              = ( targetKbps << 10 );  // in units of 1,024 bps
     2089  m_currBitrate              = ( targetKbps << 10 );
     2090#endif
    20802091  m_frameRate                = frameRate;
    20812092  m_refFrameNum              = m_isLowdelay ? (sizeGOP) : (sizeGOP>>1);
     
    24532464
    24542465  Pel*  pOrg   = pcCU->getPic()->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0);
    2455   Pel*  pRec   = pcCU->getPic()->getPicYuvPred()->getLumaAddr(pcCU->getAddr(), 0);
     2466  Pel*  pRec   = pcCU->getPic()->getPicYuvRec()->getLumaAddr(pcCU->getAddr(), 0);
    24562467  Int   stride = pcCU->getPic()->getStride();
    24572468
     
    24832494
    24842495  Pel*  pOrg    = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0);
    2485   Pel*  pRec    = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvPred()->getLumaAddr(pcCU->getAddr(), 0);
     2496  Pel*  pRec    = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvRec()->getLumaAddr(pcCU->getAddr(), 0);
    24862497  Pel*  pDep    = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0);
    24872498  Int   iStride = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getStride();
Note: See TracChangeset for help on using the changeset viewer.