summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorJim Bankoski <jimbankoski@google.com>2014-08-19 09:58:57 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-08-19 09:58:57 -0700
commit0cb31c727084ed32922f92f6d14717ae002d492e (patch)
treeab9c6f76be46e5516e62d34cc47d87e83caceb76 /vp9/encoder
parentc92cb1ceb4700f2c861565c816691793278fd1a6 (diff)
parentb29d517344d2bee03fd061e54ce7376a2a7cf9d3 (diff)
downloadlibvpx-0cb31c727084ed32922f92f6d14717ae002d492e.tar
libvpx-0cb31c727084ed32922f92f6d14717ae002d492e.tar.gz
libvpx-0cb31c727084ed32922f92f6d14717ae002d492e.tar.bz2
libvpx-0cb31c727084ed32922f92f6d14717ae002d492e.zip
Merge "vp9_firstpass.c : remove unused parm in get_zero_motion"
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_firstpass.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index 4467dee88..36af81514 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -1082,8 +1082,7 @@ static double get_prediction_decay_rate(const VP9_COMMON *cm,
// This function gives an estimate of how badly we believe the prediction
// quality is decaying from frame to frame.
-static double get_zero_motion_factor(const VP9_COMMON *cm,
- const FIRSTPASS_STATS *frame) {
+static double get_zero_motion_factor(const FIRSTPASS_STATS *frame) {
const double sr_ratio = frame->coded_error /
DOUBLE_DIVIDE_CHECK(frame->sr_coded_error);
const double zero_motion_pct = frame->pcnt_inter -
@@ -1614,9 +1613,8 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
decay_accumulator = decay_accumulator * loop_decay_rate;
// Monitor for static sections.
- zero_motion_accumulator =
- MIN(zero_motion_accumulator,
- get_zero_motion_factor(&cpi->common, &next_frame));
+ zero_motion_accumulator = MIN(zero_motion_accumulator,
+ get_zero_motion_factor(&next_frame));
// Break clause to detect very still sections after motion. For example,
// a static image after a fade or other transition.
@@ -1986,9 +1984,8 @@ static void find_next_key_frame(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
break;
// Monitor for static sections.
- zero_motion_accumulator =
- MIN(zero_motion_accumulator,
- get_zero_motion_factor(&cpi->common, &next_frame));
+ zero_motion_accumulator =MIN(zero_motion_accumulator,
+ get_zero_motion_factor(&next_frame));
// For the first few frames collect data to decide kf boost.
if (i <= (rc->max_gf_interval * 2)) {