ref: f1fcd74e3ea77ff7cbe9a8ab37ceec3888ba8ac3
parent: 86edcb0cc78fac2c3c086702fa98934e690bc290
parent: 6b6f367c3d25bdd87f80a8e5b5380963733c6f0a
author: John Koleszar <jkoleszar@google.com>
date: Thu Jul 14 20:05:06 EDT 2011
Merge remote branch 'origin/master' into experimental Change-Id: Icbeb14d64ed3d9337606b591dde4e0669540a10d
--- a/vp8/common/extend.c
+++ b/vp8/common/extend.c
@@ -85,10 +85,10 @@
src->y_height, src->y_width,
et, el, eb, er);
- et = (et + 1) >> 1;
- el = (el + 1) >> 1;
- eb = (eb + 1) >> 1;
- er = (er + 1) >> 1;
+ et = dst->border >> 1;
+ el = dst->border >> 1;
+ eb = (dst->border >> 1) + dst->uv_height - src->uv_height;
+ er = (dst->border >> 1) + dst->uv_width - src->uv_width;
copy_and_extend_plane(src->u_buffer, src->uv_stride,
dst->u_buffer, dst->uv_stride,
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -630,10 +630,6 @@
sf->recode_loop = 1;
sf->quarter_pixel_search = 1;
sf->half_pixel_search = 1;
- sf->full_freq[0] = 7;
- sf->full_freq[1] = 7;
- sf->min_fs_radius = 8;
- sf->max_fs_radius = 32;
sf->iterative_sub_pixel = 1;
sf->optimize_coefficients = 1;
sf->use_fastquant_for_pick = 0;
@@ -676,8 +672,6 @@
sf->thresh_mult[THR_SPLITG ] = 5000;
sf->thresh_mult[THR_SPLITA ] = 5000;
- sf->full_freq[0] = 7;
- sf->full_freq[1] = 15;
sf->first_step = 0;
sf->max_step_search_steps = MAX_MVSEARCH_STEPS;
@@ -735,8 +729,6 @@
sf->thresh_mult[THR_SPLITG ] = 10000;
sf->thresh_mult[THR_SPLITA ] = 10000;
#endif
- sf->full_freq[0] = 15;
- sf->full_freq[1] = 31;
if (Speed > 0)
{@@ -830,8 +822,6 @@
// alt ref frames
sf->recode_loop = 2;
- sf->full_freq[0] = 31;
- sf->full_freq[1] = 63;
}
if (Speed > 3)
@@ -852,15 +842,11 @@
sf->recode_loop = 0; // recode loop off
sf->RD = 0; // Turn rd off
- sf->full_freq[0] = 63;
- sf->full_freq[1] = 127;
}
if (Speed > 4)
{sf->auto_filter = 0; // Faster selection of loop filter
- sf->full_freq[0] = INT_MAX;
- sf->full_freq[1] = INT_MAX;
cpi->mode_check_freq[THR_V_PRED] = 2;
cpi->mode_check_freq[THR_H_PRED] = 2;
@@ -922,8 +908,6 @@
sf->thresh_mult[THR_SPLITMV ] = 5000;
sf->thresh_mult[THR_SPLITG ] = 10000;
sf->thresh_mult[THR_SPLITA ] = 10000;
- sf->full_freq[0] = 15;
- sf->full_freq[1] = 31;
sf->search_method = NSTEP;
if (Speed > 0)
@@ -1004,8 +988,6 @@
sf->thresh_mult[THR_SPLITA ] = 50000;
}
- sf->full_freq[0] = 31;
- sf->full_freq[1] = 63;
}
if (Speed > 2)
@@ -1032,15 +1014,11 @@
sf->thresh_mult[THR_SPLITG ] = INT_MAX;
sf->thresh_mult[THR_SPLITA ] = INT_MAX;
- sf->full_freq[0] = 63;
- sf->full_freq[1] = 127;
}
if (Speed > 3)
{sf->RD = 0;
- sf->full_freq[0] = INT_MAX;
- sf->full_freq[1] = INT_MAX;
sf->auto_filter = 1;
}
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -180,9 +180,6 @@
int half_pixel_search;
int quarter_pixel_search;
int thresh_mult[MAX_MODES];
- int full_freq[2];
- int min_fs_radius;
- int max_fs_radius;
int max_step_search_steps;
int first_step;
int optimize_coefficients;
--
⑨