summaryrefslogtreecommitdiff
path: root/vp9/encoder
diff options
context:
space:
mode:
authorYunqing Wang <yunqingwang@google.com>2014-01-31 16:09:28 -0800
committerYunqing Wang <yunqingwang@google.com>2014-01-31 16:30:04 -0800
commit11a9366e3b19a69d5abf109c1708158648197ccf (patch)
tree12e55776639a06d92f58e37da44706c127f51f21 /vp9/encoder
parent5ccd1932198967f11a8ff15dda31974b1f8465e7 (diff)
downloadlibvpx-11a9366e3b19a69d5abf109c1708158648197ccf.tar
libvpx-11a9366e3b19a69d5abf109c1708158648197ccf.tar.gz
libvpx-11a9366e3b19a69d5abf109c1708158648197ccf.tar.bz2
libvpx-11a9366e3b19a69d5abf109c1708158648197ccf.zip
Rename a loopfilter parameter
As pointed out by Dmitry and James, "partial" is a Microsoft- specific c++ keyword, and it is renamed. Change-Id: Ia0fc11ceb89e54b3195287f89f7e26edbbe9beb8
Diffstat (limited to 'vp9/encoder')
-rw-r--r--vp9/encoder/vp9_picklpf.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_picklpf.c b/vp9/encoder/vp9_picklpf.c
index 0c0a20f90..5b0ecf799 100644
--- a/vp9/encoder/vp9_picklpf.c
+++ b/vp9/encoder/vp9_picklpf.c
@@ -36,11 +36,11 @@ void vp9_set_alt_lf_level(VP9_COMP *cpi, int filt_val) {
static int try_filter_frame(const YV12_BUFFER_CONFIG *sd, VP9_COMP *const cpi,
MACROBLOCKD *const xd, VP9_COMMON *const cm,
- int filt_level, int partial) {
+ int filt_level, int partial_frame) {
int filt_err;
vp9_set_alt_lf_level(cpi, filt_level);
- vp9_loop_filter_frame(cm, xd, filt_level, 1, partial);
+ vp9_loop_filter_frame(cm, xd, filt_level, 1, partial_frame);
filt_err = vp9_calc_ss_err(sd, cm->frame_to_show);
@@ -51,7 +51,7 @@ static int try_filter_frame(const YV12_BUFFER_CONFIG *sd, VP9_COMP *const cpi,
}
static void search_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
- int partial) {
+ int partial_frame) {
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
VP9_COMMON *const cm = &cpi->common;
struct loopfilter *const lf = &cm->lf;
@@ -73,7 +73,7 @@ static void search_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
// Make a copy of the unfiltered / processed recon buffer
vpx_yv12_copy_y(cm->frame_to_show, &cpi->last_frame_uf);
- best_err = try_filter_frame(sd, cpi, xd, cm, filt_mid, partial);
+ best_err = try_filter_frame(sd, cpi, xd, cm, filt_mid, partial_frame);
filt_best = filt_mid;
ss_err[filt_mid] = best_err;
@@ -95,7 +95,7 @@ static void search_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
if (filt_direction <= 0 && filt_low != filt_mid) {
// Get Low filter error score
if (ss_err[filt_low] < 0) {
- filt_err = try_filter_frame(sd, cpi, xd, cm, filt_low, partial);
+ filt_err = try_filter_frame(sd, cpi, xd, cm, filt_low, partial_frame);
ss_err[filt_low] = filt_err;
} else {
filt_err = ss_err[filt_low];
@@ -114,7 +114,7 @@ static void search_filter_level(const YV12_BUFFER_CONFIG *sd, VP9_COMP *cpi,
// Now look at filt_high
if (filt_direction >= 0 && filt_high != filt_mid) {
if (ss_err[filt_high] < 0) {
- filt_err = try_filter_frame(sd, cpi, xd, cm, filt_high, partial);
+ filt_err = try_filter_frame(sd, cpi, xd, cm, filt_high, partial_frame);
ss_err[filt_high] = filt_err;
} else {
filt_err = ss_err[filt_high];