Changeset 636 in 3DVCSoftware for branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncRateCtrl.cpp
- Timestamp:
- 16 Oct 2013, 11:27:16 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HTM-8.2-dev0-KWU/source/Lib/TLibEncoder/TEncRateCtrl.cpp
r635 r636 726 726 m_lastPicture = NULL; 727 727 list<TEncRCPic*>::reverse_iterator it; 728 #if KWU_RC_MADPRED_E0227 728 729 for ( it = listPreviousPictures.rbegin(); it != listPreviousPictures.rend(); it++ ) 729 730 { … … 734 735 } 735 736 } 737 #endif 736 738 #endif 737 739 … … 1092 1094 { 1093 1095 Pel* pOrg = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0); 1094 Pel* pRec = pcCU->getSlice()->getIvPic(false, 0)->getPicYuv Pred()->getLumaAddr(pcCU->getAddr(), 0);1096 Pel* pRec = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvRec()->getLumaAddr(pcCU->getAddr(), 0); 1095 1097 Pel* pDep = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0); 1096 1098 Int iStride = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getStride(); … … 1121 1123 pcCU->getPosInPic(0, PosX, PosY); 1122 1124 if((PosX + *iDisparity) < 0 || (PosX + *iDisparity + iWidth) >= pcCU->getSlice()->getSPS()->getMaxCUWidth()) 1125 { 1123 1126 Disp = 0; 1127 } 1124 1128 1125 1129 for( y = 0; y < iHeight; y++ ) … … 1138 1142 m_LCUs[ LCUIdx ].m_IVMAD = IVMAD; 1139 1143 if(m_lastPicture) 1144 { 1140 1145 m_LCUs[ LCUIdx ].m_MAD = m_lastPicture->getLCU(LCUIdx).m_MAD; 1146 } 1141 1147 1142 1148 MAD = m_LCUs[ LCUIdx ].m_IVMAD; … … 2076 2082 m_sourceHeightInLCU = (sourceHeight / maxCUHeight) + (( sourceHeight % maxCUHeight) ? 1 : 0); 2077 2083 m_isLowdelay = (sizeIntraPeriod == -1) ? true : false; 2084 #if KWU_RC_MADPRED_E0227 2078 2085 m_prevBitrate = ( targetKbps * 1000 ); // in units of 1,024 bps 2079 2086 m_currBitrate = ( targetKbps * 1000 ); 2087 #else 2088 m_prevBitrate = ( targetKbps << 10 ); // in units of 1,024 bps 2089 m_currBitrate = ( targetKbps << 10 ); 2090 #endif 2080 2091 m_frameRate = frameRate; 2081 2092 m_refFrameNum = m_isLowdelay ? (sizeGOP) : (sizeGOP>>1); … … 2453 2464 2454 2465 Pel* pOrg = pcCU->getPic()->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0); 2455 Pel* pRec = pcCU->getPic()->getPicYuv Pred()->getLumaAddr(pcCU->getAddr(), 0);2466 Pel* pRec = pcCU->getPic()->getPicYuvRec()->getLumaAddr(pcCU->getAddr(), 0); 2456 2467 Int stride = pcCU->getPic()->getStride(); 2457 2468 … … 2483 2494 2484 2495 Pel* pOrg = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0); 2485 Pel* pRec = pcCU->getSlice()->getIvPic(false, 0)->getPicYuv Pred()->getLumaAddr(pcCU->getAddr(), 0);2496 Pel* pRec = pcCU->getSlice()->getIvPic(false, 0)->getPicYuvRec()->getLumaAddr(pcCU->getAddr(), 0); 2486 2497 Pel* pDep = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getLumaAddr(pcCU->getAddr(), 0); 2487 2498 Int iStride = pcCU->getSlice()->getIvPic(true, pcCU->getSlice()->getViewIndex())->getPicYuvOrg()->getStride();
Note: See TracChangeset for help on using the changeset viewer.