remove unused postproc parameters
BUG=webm:1612
Change-Id: I92937417403af2c943e903ba66799609ef6ab635
diff --git a/vp8/common/postproc.c b/vp8/common/postproc.c
index 2ed19c4..c03b16b 100644
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -60,8 +60,7 @@
}
void vp8_deblock(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh,
- int flag) {
+ YV12_BUFFER_CONFIG *post, int q) {
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5);
@@ -72,8 +71,6 @@
* is a skipped block. */
unsigned char *ylimits = cm->pp_limits_buffer;
unsigned char *uvlimits = cm->pp_limits_buffer + 16 * cm->mb_cols;
- (void)low_var_thresh;
- (void)flag;
if (ppl > 0) {
for (mbr = 0; mbr < cm->mb_rows; ++mbr) {
@@ -116,8 +113,7 @@
}
}
-void vp8_de_noise(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh, int flag,
+void vp8_de_noise(VP8_COMMON *cm, YV12_BUFFER_CONFIG *source, int q,
int uvfilter) {
int mbr;
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
@@ -125,9 +121,6 @@
int mb_rows = cm->mb_rows;
int mb_cols = cm->mb_cols;
unsigned char *limits = cm->pp_limits_buffer;
- (void)post;
- (void)low_var_thresh;
- (void)flag;
memset(limits, (unsigned char)ppl, 16 * mb_cols);
@@ -216,11 +209,10 @@
vp8_yv12_copy_frame(&oci->post_proc_buffer, &oci->post_proc_buffer_int);
if (flags & VP8D_DEMACROBLOCK) {
vp8_deblock(oci, &oci->post_proc_buffer_int, &oci->post_proc_buffer,
- q + (deblock_level - 5) * 10, 1, 0);
+ q + (deblock_level - 5) * 10);
vp8_de_mblock(&oci->post_proc_buffer, q + (deblock_level - 5) * 10);
} else if (flags & VP8D_DEBLOCK) {
- vp8_deblock(oci, &oci->post_proc_buffer_int, &oci->post_proc_buffer, q,
- 1, 0);
+ vp8_deblock(oci, &oci->post_proc_buffer_int, &oci->post_proc_buffer, q);
}
}
/* Move partially towards the base q of the previous frame */
@@ -228,12 +220,12 @@
(3 * oci->postproc_state.last_base_qindex + oci->base_qindex) >> 2;
} else if (flags & VP8D_DEMACROBLOCK) {
vp8_deblock(oci, oci->frame_to_show, &oci->post_proc_buffer,
- q + (deblock_level - 5) * 10, 1, 0);
+ q + (deblock_level - 5) * 10);
vp8_de_mblock(&oci->post_proc_buffer, q + (deblock_level - 5) * 10);
oci->postproc_state.last_base_qindex = oci->base_qindex;
} else if (flags & VP8D_DEBLOCK) {
- vp8_deblock(oci, oci->frame_to_show, &oci->post_proc_buffer, q, 1, 0);
+ vp8_deblock(oci, oci->frame_to_show, &oci->post_proc_buffer, q);
oci->postproc_state.last_base_qindex = oci->base_qindex;
} else {
vp8_yv12_copy_frame(oci->frame_to_show, &oci->post_proc_buffer);
diff --git a/vp8/common/postproc.h b/vp8/common/postproc.h
index a14f5f1..492c52a 100644
--- a/vp8/common/postproc.h
+++ b/vp8/common/postproc.h
@@ -29,12 +29,11 @@
int vp8_post_proc_frame(struct VP8Common *oci, YV12_BUFFER_CONFIG *dest,
vp8_ppflags_t *ppflags);
-void vp8_de_noise(struct VP8Common *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh, int flag,
+void vp8_de_noise(struct VP8Common *cm, YV12_BUFFER_CONFIG *source, int q,
int uvfilter);
void vp8_deblock(struct VP8Common *cm, YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int q, int low_var_thresh, int flag);
+ YV12_BUFFER_CONFIG *post, int q);
#define MFQE_PRECISION 4
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 8bd4f36..cd0c2e1 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -62,9 +62,6 @@
extern int vp8_update_coef_context(VP8_COMP *cpi);
#endif
-extern void vp8_deblock_frame(YV12_BUFFER_CONFIG *source,
- YV12_BUFFER_CONFIG *post, int filt_lvl,
- int low_var_thresh, int flag);
extern unsigned int vp8_get_processor_freq();
int vp8_calc_ss_err(YV12_BUFFER_CONFIG *source, YV12_BUFFER_CONFIG *dest);
@@ -3791,8 +3788,7 @@
// (temporal denoising) mode.
if (cpi->oxcf.noise_sensitivity >= 3) {
if (cpi->denoiser.denoise_pars.spatial_blur != 0) {
- vp8_de_noise(cm, cpi->Source, cpi->Source,
- cpi->denoiser.denoise_pars.spatial_blur, 1, 0, 0);
+ vp8_de_noise(cm, cpi->Source, cpi->denoiser.denoise_pars.spatial_blur, 1);
}
}
#endif
@@ -3813,9 +3809,9 @@
}
if (cm->frame_type == KEY_FRAME) {
- vp8_de_noise(cm, cpi->Source, cpi->Source, l, 1, 0, 1);
+ vp8_de_noise(cm, cpi->Source, l, 1);
} else {
- vp8_de_noise(cm, cpi->Source, cpi->Source, l, 1, 0, 1);
+ vp8_de_noise(cm, cpi->Source, l, 1);
src = cpi->Source->y_buffer;
@@ -5189,7 +5185,7 @@
double weight = 0;
vp8_deblock(cm, cm->frame_to_show, &cm->post_proc_buffer,
- cm->filter_level * 10 / 6, 1, 0);
+ cm->filter_level * 10 / 6);
vpx_clear_system_state();
ye = calc_plane_error(orig->y_buffer, orig->y_stride, pp->y_buffer,
