On Sun, Oct 27, 2013 at 5:23 PM, Wenju He <we...@multicorewareinc.com>wrote:
> # HG changeset patch
> # User Wenju He <we...@multicorewareinc.com>
> # Date 1382911597 18000
> # Sun Oct 27 17:06:37 2013 -0500
> # Node ID e1453bc3ae1e6b882762ce7205298e8983c35c67
> # Parent ccac3a7d3622b7326443745c1ecae0e2edd3e539
> fix variable name, msg to mrg
>
both of these are queued for default, thanks
>
> diff -r ccac3a7d3622 -r e1453bc3ae1e source/Lib/TLibEncoder/TEncSearch.cpp
> --- a/source/Lib/TLibEncoder/TEncSearch.cpp Fri Oct 25 22:40:09 2013
> -0500
> +++ b/source/Lib/TLibEncoder/TEncSearch.cpp Sun Oct 27 17:06:37 2013
> -0500
> @@ -2473,9 +2473,9 @@
>
> if (cu->getPartitionSize(partAddr) != SIZE_2Nx2N)
> {
> - UInt msgInterDir = 0;
> + UInt mrgInterDir = 0;
> TComMvField mrgMvField[2];
> - UInt msgIndex = 0;
> + UInt mrgIndex = 0;
>
> UInt meInterDir = 0;
> TComMvField meMvField[2];
> @@ -2497,13 +2497,13 @@
>
> // find Merge result
> UInt mrgCost = MAX_UINT;
> - xMergeEstimation(cu, partIdx, msgInterDir, mrgMvField,
> msgIndex, mrgCost, mvFieldNeighbours, interDirNeighbours,
> numValidMergeCand);
> + xMergeEstimation(cu, partIdx, mrgInterDir, mrgMvField,
> mrgIndex, mrgCost, mvFieldNeighbours, interDirNeighbours,
> numValidMergeCand);
> if (mrgCost < meCost)
> {
> // set Merge result
> cu->setMergeFlagSubParts(true, partAddr, partIdx,
> cu->getDepth(partAddr));
> - cu->setMergeIndexSubParts(msgIndex, partAddr, partIdx,
> cu->getDepth(partAddr));
> - cu->setInterDirSubParts(msgInterDir, partAddr, partIdx,
> cu->getDepth(partAddr));
> + cu->setMergeIndexSubParts(mrgIndex, partAddr, partIdx,
> cu->getDepth(partAddr));
> + cu->setInterDirSubParts(mrgInterDir, partAddr, partIdx,
> cu->getDepth(partAddr));
> {
>
> cu->getCUMvField(REF_PIC_LIST_0)->setAllMvField(mrgMvField[0], partSize,
> partAddr, 0, partIdx);
>
> cu->getCUMvField(REF_PIC_LIST_1)->setAllMvField(mrgMvField[1], partSize,
> partAddr, 0, partIdx);
> _______________________________________________
> x265-devel mailing list
> x265-devel@videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
--
Steve Borho
_______________________________________________
x265-devel mailing list
x265-devel@videolan.org
https://mailman.videolan.org/listinfo/x265-devel
