ref: 5eb9bfa4e3eaa496c32b482ae5794747819d0b83
parent: 5fdd0f1fe071659873ed99eab14cf30078ed6ba4
parent: 80b344dec568ef1b04c8820fde2117c1caaafb10
author: Johann <[email protected]>
date: Tue Dec 16 10:54:29 EST 2014
Merge "Silence -Werror=unused-parameter"
--- a/vp8/common/loopfilter.c
+++ b/vp8/common/loopfilter.c
@@ -261,6 +261,7 @@
int mb_col;
int filter_level;
loop_filter_info_n *lfi_n = &cm->lf_info;
+ (void)post_uvstride;
for (mb_col = 0; mb_col < cm->mb_cols; mb_col++)
{
--- a/vp8/common/postproc.c
+++ b/vp8/common/postproc.c
@@ -518,6 +518,7 @@
unsigned int Width, unsigned int Height, int Pitch)
{
unsigned int i, j;
+ (void)bothclamp;
for (i = 0; i < Height; i++)
{
--- a/vp8/decoder/decodeframe.c
+++ b/vp8/decoder/decodeframe.c
@@ -101,6 +101,8 @@
int i;
#if CONFIG_ERROR_CONCEALMENT
int corruption_detected = 0;
+#else
+ (void)mb_idx;
#endif
if (xd->mode_info_context->mbmi.mb_skip_coeff)
--- a/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@ -591,6 +591,8 @@
static void decode_mb_mode_mvs(VP8D_COMP *pbi, MODE_INFO *mi,
MB_MODE_INFO *mbmi)
{
+ (void)mbmi;
+
/* Read the Macroblock segmentation map if it is being updated explicitly
* this frame (reset to 0 above by default)
* By default on a key frame reset all MBs to segment 0
--- a/vp8/decoder/onyxd_if.c
+++ b/vp8/decoder/onyxd_if.c
@@ -87,6 +87,7 @@
pbi->ec_enabled = oxcf->error_concealment;
pbi->overlaps = NULL;
#else
+ (void)oxcf;
pbi->ec_enabled = 0;
#endif
/* Error concealment is activated after a key frame has been
@@ -303,6 +304,8 @@
{
VP8_COMMON *cm = &pbi->common;
int retcode = -1;
+ (void)size;
+ (void)source;
pbi->common.error.error_code = VPX_CODEC_OK;
@@ -407,6 +410,7 @@
#if CONFIG_POSTPROC
ret = vp8_post_proc_frame(&pbi->common, sd, flags);
#else
+ (void)flags;
if (pbi->common.frame_to_show)
{
--- a/vp8/decoder/threading.c
+++ b/vp8/decoder/threading.c
@@ -96,6 +96,8 @@
int i;
#if CONFIG_ERROR_CONCEALMENT
int corruption_detected = 0;
+#else
+ (void)mb_idx;
#endif
if (xd->mode_info_context->mbmi.mb_skip_coeff)
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -82,6 +82,7 @@
{
unsigned int act;
unsigned int sse;
+ (void)cpi;
/* TODO: This could also be done over smaller areas (8x8), but that would
* require extensive changes elsewhere, as lambda is assumed to be fixed
* over an entire MB in most of the code.
@@ -1149,6 +1150,8 @@
while (++b < 16);
}
+#else
+ (void)cpi;
#endif
++x->ymode_count[m];
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -132,6 +132,7 @@
FIRSTPASS_STATS *stats)
{
struct vpx_codec_cx_pkt pkt;
+ (void)cpi;
pkt.kind = VPX_CODEC_STATS_PKT;
pkt.data.twopass_stats.buf = stats;
pkt.data.twopass_stats.sz = sizeof(FIRSTPASS_STATS);
@@ -418,6 +419,7 @@
int raw_stride = raw_buffer->y_stride;
unsigned char *ref_ptr;
int ref_stride = x->e_mbd.pre.y_stride;
+ (void)cpi;
/* Set up pointers for this macro block raw buffer */
raw_ptr = (unsigned char *)(raw_buffer->y_buffer + recon_yoffset
@@ -1409,6 +1411,7 @@
void vp8_end_second_pass(VP8_COMP *cpi)
{
+ (void)cpi;
}
/* This function gives and estimate of how badly we believe the prediction
@@ -1419,6 +1422,7 @@
double prediction_decay_rate;
double motion_decay;
double motion_pct = next_frame->pcnt_motion;
+ (void)cpi;
/* Initial basis is the % mbs inter coded */
prediction_decay_rate = next_frame->pcnt_inter;
@@ -1547,6 +1551,7 @@
double this_frame_mvr_ratio;
double this_frame_mvc_ratio;
double motion_pct;
+ (void)cpi;
/* Accumulate motion stats. */
motion_pct = this_frame->pcnt_motion;
--- a/vp8/encoder/mcomp.c
+++ b/vp8/encoder/mcomp.c
@@ -888,6 +888,8 @@
fcenter_mv.as_mv.row = center_mv->as_mv.row >> 3;
fcenter_mv.as_mv.col = center_mv->as_mv.col >> 3;
+ (void)mvcost;
+
/* adjust ref_mv to make sure it is within MV range */
vp8_clamp_mv(ref_mv, x->mv_col_min, x->mv_col_max, x->mv_row_min, x->mv_row_max);
br = ref_mv->as_mv.row;
@@ -911,6 +913,8 @@
else if (search_param >= 1) hex_range = 63;
dia_range = 8;
+#else
+ (void)search_param;
#endif
/* hex search */
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -5831,6 +5831,7 @@
cpi->common.show_frame_mi = cpi->common.mi;
ret = vp8_post_proc_frame(&cpi->common, dest, flags);
#else
+ (void)flags;
if (cpi->common.frame_to_show)
{
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -180,6 +180,7 @@
(void) ref_mv;
(void) error_per_bit;
(void) vfp;
+ (void) mb;
(void) mvcost;
(void) distortion;
(void) sse;
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -837,6 +837,9 @@
static int rd_inter16x16_uv(VP8_COMP *cpi, MACROBLOCK *x, int *rate,
int *distortion, int fullpixel)
{
+ (void)cpi;
+ (void)fullpixel;
+
vp8_build_inter16x16_predictors_mbuv(&x->e_mbd);
vp8_subtract_mbuv(x->src_diff,
x->src.u_buffer, x->src.v_buffer, x->src.uv_stride,
@@ -854,6 +857,9 @@
static int rd_inter4x4_uv(VP8_COMP *cpi, MACROBLOCK *x, int *rate,
int *distortion, int fullpixel)
{
+ (void)cpi;
+ (void)fullpixel;
+
vp8_build_inter4x4_predictors_mbuv(&x->e_mbd);
vp8_subtract_mbuv(x->src_diff,
x->src.u_buffer, x->src.v_buffer, x->src.uv_stride,
--- a/vp8/encoder/temporal_filter.c
+++ b/vp8/encoder/temporal_filter.c
@@ -163,6 +163,8 @@
int pre = d->offset;
int pre_stride = x->e_mbd.pre.y_stride;
+ (void)error_thresh;
+
best_ref_mv1.as_int = 0;
best_ref_mv1_full.as_mv.col = best_ref_mv1.as_mv.col >>3;
best_ref_mv1_full.as_mv.row = best_ref_mv1.as_mv.row >>3;
--- a/vp8/vp8_cx_iface.c
+++ b/vp8/vp8_cx_iface.c
@@ -384,6 +384,8 @@
oxcf->mr_down_sampling_factor.den = mr_cfg->mr_down_sampling_factor.den;
oxcf->mr_low_res_mode_info = mr_cfg->mr_low_res_mode_info;
}
+#else
+ (void)mr_cfg;
#endif
oxcf->cpu_used = vp8_cfg.cpu_used;
@@ -628,6 +630,9 @@
*mem_loc = (void *)shared_mem_loc;
res = VPX_CODEC_OK;
}
+#else
+ (void)cfg;
+ (void)mem_loc;
#endif
return res;
}
--- a/vp8/vp8_dx_iface.c
+++ b/vp8/vp8_dx_iface.c
@@ -74,6 +74,7 @@
* known)
*/
(void)si;
+ (void)flags;
return sizeof(vpx_codec_alg_priv_t);
}
@@ -647,6 +648,8 @@
return VPX_CODEC_INVALID_PARAM;
#else
+ (void)ctx;
+ (void)args;
return VPX_CODEC_INCAPABLE;
#endif
}
--- a/vpxenc.c
+++ b/vpxenc.c
@@ -1197,6 +1197,7 @@
static void validate_stream_config(const struct stream_state *stream,
const struct VpxEncoderConfig *global) {
const struct stream_state *streami;
+ (void)global;
if (!stream->config.cfg.g_w || !stream->config.cfg.g_h)
fatal("Stream %d: Specify stream dimensions with --width (-w) "