Merge "Tuning SATD rate calculation for speed"

502ac722 · Jingning Han · Gerrit Code Review · 1c39c5b9 · 531468a0 · 502ac722
Commit 502ac722 authored Mar 31, 2015 by Jingning Han Committed by Gerrit Code Review Mar 31, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

vp9/encoder/vp9_pickmode.c vp9/encoder/vp9_pickmode.c +5 -1

No files found.
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -401,7 +401,11 @@ static void block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate, int64_t *dist,
        }

        *dist += vp9_block_error(coeff, dqcoeff, step << 4, &this_sse) >> shift;
-        *rate += (int)vp9_satd((const int16_t *)qcoeff, step << 4);
+
+        if (*eob == 1)
+          *rate += (int)abs(qcoeff[0]);
+        else if (*eob > 1)
+          *rate += (int)vp9_satd((const int16_t *)qcoeff, step << 4);

        *sse += (this_sse >> shift);
        *skippable &= (*eob == 0);