Mercurial > x265
changeset 1646:10be770fed3d draft
Merged multicoreware/xhevc into default
author | Deepthi Devaki Akkoorath <deepthidevaki@multicorewareinc.com> |
---|---|
date | Thu, 23 May 2013 15:06:55 +0530 |
parents | 58e2072fea54 (current diff) 39fc1b0ef1ab (diff) |
children | e52cb5bb677a |
files | |
diffstat | 2 files changed, 4 insertions(+-), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/source/Lib/TLibEncoder/TEncCu.cpp Thu May 23 12:43:33 2013 +0530 +++ b/source/Lib/TLibEncoder/TEncCu.cpp Thu May 23 15:06:55 2013 +0530 @@ -1558,9 +1558,9 @@ Void TEncCu::xCheckIntraPCM(TComDataCU*& * \param rpcTempCU * \returns Void */ -Void TEncCu::xCheckBestMode(TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth) +Void TEncCu::xCheckBestMode(TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth, float lambda) { - if (rpcTempCU->getTotalCost() < rpcBestCU->getTotalCost()) + if (rpcTempCU->getTotalCost() < lambda*rpcBestCU->getTotalCost()) { TComYuv* pcYuv; // Change Information data @@ -1585,6 +1585,7 @@ Void TEncCu::xCheckBestMode(TComDataCU*& } } + void TEncCu::swapCU(TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth) { TComYuv* pcYuv;
--- a/source/Lib/TLibEncoder/TEncCu.h Thu May 23 12:43:33 2013 +0530 +++ b/source/Lib/TLibEncoder/TEncCu.h Thu May 23 15:06:55 2013 +0530 @@ -133,7 +133,7 @@ protected: Void xEncodeCU(TComDataCU* pcCU, UInt uiAbsPartIdx, UInt uiDepth); Int xComputeQP(TComDataCU* pcCU, UInt uiDepth); - Void xCheckBestMode(TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth); + Void xCheckBestMode(TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth, float lambda = 1.0); Void swapCU(TComDataCU*& rpcBestCU, TComDataCU*& rpcTempCU, UInt uiDepth);