ref: 508cd5a6bfa0fcc231f95810aad27c09f5a20806
parent: 66ce10c13dee8d64f4249189df450e4b14cf9ca3
author: Dmitry Kovalev <[email protected]>
date: Wed May 21 08:20:07 EDT 2014
Reusing rd_less_than_thresh() function. Change-Id: I29df10fde86128467f5e99fc373ac04f004257e1
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -284,9 +284,8 @@
(1 << INTER_OFFSET(this_mode)))
continue;
- if (best_rd < ((int64_t)rd_threshes[mode_idx[this_mode]] *
- rd_thresh_freq_fact[this_mode] >> 5) ||
- rd_threshes[mode_idx[this_mode]] == INT_MAX)
+ if (rd_less_than_thresh(best_rd, rd_threshes[mode_idx[this_mode]],
+ rd_thresh_freq_fact[this_mode]))
continue;
if (this_mode == NEWMV) {--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -9,7 +9,6 @@
*/
#include <assert.h>
-#include <limits.h>
#include <math.h>
#include <stdio.h>
@@ -2991,11 +2990,6 @@
ctx->mic = *xd->mi[0];
}
-static INLINE int rd_less_than_thresh(int64_t best_rd, int thresh,
- int thresh_fact) {- return best_rd < ((int64_t)thresh * thresh_fact >> 5) || thresh == INT_MAX;
-}
-
// Updating rd_thresh_freq_fact[] here means that the different
// partition/block sizes are handled independently based on the best
// choice for the current partition. It may well be better to keep a scaled
@@ -3228,7 +3222,7 @@
// Test best rd so far against threshold for trying this mode.
if (rd_less_than_thresh(best_rd, rd_threshes[mode_index],
- rd_thresh_freq_fact[mode_index]))
+ rd_thresh_freq_fact[mode_index]))
continue;
this_mode = vp9_mode_order[mode_index].mode;
--- a/vp9/encoder/vp9_rdopt.h
+++ b/vp9/encoder/vp9_rdopt.h
@@ -11,6 +11,8 @@
#ifndef VP9_ENCODER_VP9_RDOPT_H_
#define VP9_ENCODER_VP9_RDOPT_H_
+#include <limits.h>
+
#include "vp9/encoder/vp9_encoder.h"
#ifdef __cplusplus
@@ -86,6 +88,11 @@
void vp9_set_rd_speed_thresholds(VP9_COMP *cpi);
void vp9_set_rd_speed_thresholds_sub8x8(VP9_COMP *cpi);
+
+static INLINE int rd_less_than_thresh(int64_t best_rd, int thresh,
+ int thresh_fact) {+ return best_rd < ((int64_t)thresh * thresh_fact >> 5) || thresh == INT_MAX;
+}
static INLINE int full_pixel_search(VP9_COMP *cpi, MACROBLOCK *x,
BLOCK_SIZE bsize, MV *mvp_full,