# HG changeset patch
# User Deepthi Nandakumar <[email protected]>
# Date 1433696064 -19800
# Sun Jun 07 22:24:24 2015 +0530
# Node ID 45ca4cb5bc769a54630e7715212295cc86768c70
# Parent 2c5d6a1825389e052badbb46e3b4fdfe3b65aa48
motion: set search range correctly for bidir prediction
diff -r 2c5d6a182538 -r 45ca4cb5bc76 source/encoder/analysis.cpp
--- a/source/encoder/analysis.cpp Fri Jun 05 08:36:51 2015 -0700
+++ b/source/encoder/analysis.cpp Sun Jun 07 22:24:24 2015 +0530
@@ -1713,17 +1713,15 @@
bool bTryZero = bestME[0].mv.notZero() || bestME[1].mv.notZero();
if (bTryZero)
{
- /* Do not try zero MV if unidir motion predictors are beyond
- * valid search area */
- MV mvmin, mvmax;
- int merange = X265_MAX(m_param->sourceWidth, m_param->sourceHeight);
- setSearchRange(cu, mvzero, merange, mvmin, mvmax);
- mvmax.y += 2; // there is some pad for subpel refine
- mvmin <<= 2;
- mvmax <<= 2;
+ /* Do not try zero MV if unidir motion predictors are beyond valid
search area */
+ MV mvmin0, mvmax0, mvmin1, mvmax1;
+ setSearchRange(cu, bestME[0].mvp, m_param->searchRange, mvmin0,
mvmax0);
+ setSearchRange(cu, bestME[1].mvp, m_param->searchRange, mvmin1,
mvmax1);
+ mvmin0 <<= 2; mvmax0 <<= 2;
+ mvmin1 <<= 2; mvmax1 <<= 2;
- bTryZero &= bestME[0].mvp.checkRange(mvmin, mvmax);
- bTryZero &= bestME[1].mvp.checkRange(mvmin, mvmax);
+ bTryZero &= bestME[0].mvp.checkRange(mvmin0, mvmax0);
+ bTryZero &= bestME[1].mvp.checkRange(mvmin1, mvmax1);
}
if (bTryZero)
{
diff -r 2c5d6a182538 -r 45ca4cb5bc76 source/encoder/search.cpp
--- a/source/encoder/search.cpp Fri Jun 05 08:36:51 2015 -0700
+++ b/source/encoder/search.cpp Sun Jun 07 22:24:24 2015 +0530
@@ -2214,17 +2214,15 @@
bool bTryZero = bestME[0].mv.notZero() || bestME[1].mv.notZero();
if (bTryZero)
{
- /* Do not try zero MV if unidir motion predictors are beyond
- * valid search area */
- MV mvmin, mvmax;
- int merange = X265_MAX(m_param->sourceWidth,
m_param->sourceHeight);
- setSearchRange(cu, mvzero, merange, mvmin, mvmax);
- mvmax.y += 2; // there is some pad for subpel refine
- mvmin <<= 2;
- mvmax <<= 2;
-
- bTryZero &= bestME[0].mvp.checkRange(mvmin, mvmax);
- bTryZero &= bestME[1].mvp.checkRange(mvmin, mvmax);
+ /* Do not try zero MV if unidir motion predictors are beyond
valid search area */
+ MV mvmin0, mvmax0, mvmin1, mvmax1;
+ setSearchRange(cu, bestME[0].mvp, m_param->searchRange,
mvmin0, mvmax0);
+ setSearchRange(cu, bestME[1].mvp, m_param->searchRange,
mvmin1, mvmax1);
+ mvmin0 <<= 2; mvmax0 <<= 2;
+ mvmin1 <<= 2; mvmax1 <<= 2;
+
+ bTryZero &= bestME[0].mvp.checkRange(mvmin0, mvmax0);
+ bTryZero &= bestME[1].mvp.checkRange(mvmin1, mvmax1);
}
if (bTryZero)
{
_______________________________________________
x265-devel mailing list
[email protected]
https://mailman.videolan.org/listinfo/x265-devel
