Mercurial > x265
changeset 5768:e1e65013eabe draft
rd: fix error in merge-skip identfication in rd 1,0
Cost was not calculated if the best mode is merge-skip in rd 1,0
author | Deepthi Devaki <deepthidevaki@multicorewareinc.com> |
---|---|
date | Tue, 17 Dec 2013 18:17:29 +0530 |
parents | 92c49332452b |
children | 206fb08d5e12 |
files | source/encoder/compress.cpp |
diffstat | 1 files changed, 1 insertions(+-), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/source/encoder/compress.cpp Tue Dec 17 17:04:07 2013 +0530 +++ b/source/encoder/compress.cpp Tue Dec 17 18:17:29 2013 +0530 @@ -283,6 +283,7 @@ void TEncCu::xComputeCostMerge2Nx2N(TCom outTempCU->getCUMvField(REF_PIC_LIST_1)->setAllMvField(mvFieldNeighbours[1 + 2 * bestMergeCand], SIZE_2Nx2N, 0, 0); outTempCU->m_totalBits = outBestCU->m_totalBits; outTempCU->m_totalDistortion = outBestCU->m_totalDistortion; + outTempCU->m_totalCost = m_rdCost->calcRdSADCost(outTempCU->m_totalDistortion, outTempCU->m_totalBits); if (m_cfg->param.rdLevel > 2) { //calculate the motion compensation for chroma for the best mode selected