From 5e16d397bd67b6d870c1ac34f50799f5c2fd6f91 Mon Sep 17 00:00:00 2001 From: James Zern Date: Mon, 17 Aug 2015 18:19:22 -0700 Subject: vpx_dsp_common: add VPX prefix to MIN/MAX prevents redeclaration warnings; vp8 has its own define which will be resolved in a future commit Change-Id: Ic941fef3dd4262fcdce48b73075fe6b375f11c9c --- vp9/encoder/vp9_denoiser.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vp9/encoder/vp9_denoiser.c') diff --git a/vp9/encoder/vp9_denoiser.c b/vp9/encoder/vp9_denoiser.c index 5f992856b..bf6c533ce 100644 --- a/vp9/encoder/vp9_denoiser.c +++ b/vp9/encoder/vp9_denoiser.c @@ -120,10 +120,10 @@ int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, adj = adj_val[2]; } if (diff > 0) { - avg[c] = MIN(UINT8_MAX, sig[c] + adj); + avg[c] = VPXMIN(UINT8_MAX, sig[c] + adj); total_adj += adj; } else { - avg[c] = MAX(0, sig[c] - adj); + avg[c] = VPXMAX(0, sig[c] - adj); total_adj -= adj; } } @@ -160,13 +160,13 @@ int vp9_denoiser_filter_c(const uint8_t *sig, int sig_stride, // Diff positive means we made positive adjustment above // (in first try/attempt), so now make negative adjustment to bring // denoised signal down. - avg[c] = MAX(0, avg[c] - adj); + avg[c] = VPXMAX(0, avg[c] - adj); total_adj -= adj; } else { // Diff negative means we made negative adjustment above // (in first try/attempt), so now make positive adjustment to bring // denoised signal up. - avg[c] = MIN(UINT8_MAX, avg[c] + adj); + avg[c] = VPXMIN(UINT8_MAX, avg[c] + adj); total_adj += adj; } } -- cgit v1.2.3