ref: 7c6a49bada8a233f7c3a5c0a386d86bcc316aaea
parent: f1761a74cd7eac4deed88d672e23e8079a9c1f54
parent: 11a9366e3b19a69d5abf109c1708158648197ccf
author: Yunqing Wang <yunqingwang@google.com>
date: Fri Jan 31 13:33:33 EST 2014
Merge "Rename a loopfilter parameter"
--- a/vp9/common/vp9_loopfilter.c
+++ b/vp9/common/vp9_loopfilter.c
@@ -1244,12 +1244,12 @@
void vp9_loop_filter_frame(VP9_COMMON *cm, MACROBLOCKD *xd,
int frame_filter_level,
- int y_only, int partial) {+ int y_only, int partial_frame) {int start_mi_row, end_mi_row, mi_rows_to_filter;
if (!frame_filter_level) return;
start_mi_row = 0;
mi_rows_to_filter = cm->mi_rows;
- if (partial && cm->mi_rows > 8) {+ if (partial_frame && cm->mi_rows > 8) {start_mi_row = cm->mi_rows >> 1;
start_mi_row &= 0xfffffff8;
mi_rows_to_filter = MAX(cm->mi_rows / 8, 8);
--- a/vp9/common/vp9_loopfilter.h
+++ b/vp9/common/vp9_loopfilter.h
@@ -107,7 +107,7 @@
void vp9_loop_filter_frame(struct VP9Common *cm,
struct macroblockd *mbd,
int filter_level,
- int y_only, int partial);
+ int y_only, int partial_frame);
// Apply the loop filter to [start, stop) macro block rows in frame_buffer.
void vp9_loop_filter_rows(const YV12_BUFFER_CONFIG *frame_buffer,
--- a/vp9/decoder/vp9_dthread.c
+++ b/vp9/decoder/vp9_dthread.c
@@ -134,7 +134,7 @@
VP9_COMMON *cm,
MACROBLOCKD *xd,
int frame_filter_level,
- int y_only, int partial) {+ int y_only, int partial_frame) {// Number of superblock rows and cols
const int sb_rows = mi_cols_aligned_to_sb(cm->mi_rows) >> MI_BLOCK_SIZE_LOG2;
int i;
--- a/vp9/decoder/vp9_dthread.h
+++ b/vp9/decoder/vp9_dthread.h
@@ -55,6 +55,6 @@
struct VP9Common *cm,
struct macroblockd *xd,
int frame_filter_level,
- int y_only, int partial);
+ int y_only, int partial_frame);
#endif // VP9_DECODER_VP9_DTHREAD_H_
--- a/vp9/encoder/vp9_picklpf.c
+++ b/vp9/encoder/vp9_picklpf.c
@@ -36,11 +36,11 @@
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 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 @@
// 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 @@
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 @@
// 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];
--
⑨