From fd084b2489e5c80a19b72f9b6264bda5eec67fb6 Mon Sep 17 00:00:00 2001 From: Daniel Kang Date: Mon, 13 Aug 2012 16:50:03 -0700 Subject: [PATCH] Shut up warnings added by -Wundef Change-Id: I9c7ef4a75c37aa0e10df75e165e3066614c955ef --- vp8/common/reconintra.c | 2 -- vp8/common/rtcd.c | 55 +++++++---------------------------------------- vp8/common/treecoder.c | 2 ++ vp8/decoder/onyxd_if.c | 2 +- vp8/encoder/dct.h | 2 ++ vp8/encoder/encodeframe.c | 4 ++-- vp8/encoder/firstpass.c | 2 +- vp8/encoder/onyx_if.c | 2 +- vp8/encoder/variance.h | 2 ++ vpx/vp8cx.h | 1 + 10 files changed, 20 insertions(+), 54 deletions(-) diff --git a/vp8/common/reconintra.c b/vp8/common/reconintra.c index 1795a71..8cbbcf2 100644 --- a/vp8/common/reconintra.c +++ b/vp8/common/reconintra.c @@ -319,9 +319,7 @@ void vp8_build_intra_predictors_mby_internal(MACROBLOCKD *xd, d63_predictor(ypred_ptr, y_stride, 16, yabove_row, yleft_col); } break; -#if CONIFG_I8X8 case I8X8_PRED: -#endif case B_PRED: case NEARESTMV: case NEARMV: diff --git a/vp8/common/rtcd.c b/vp8/common/rtcd.c index 4980f48..a7bb92c 100644 --- a/vp8/common/rtcd.c +++ b/vp8/common/rtcd.c @@ -11,59 +11,20 @@ #define RTCD_C #include "vpx_rtcd.h" -#if CONFIG_MULTITHREAD && HAVE_PTHREAD_H -#include -static void once(void (*func)(void)) -{ - static pthread_once_t lock = PTHREAD_ONCE_INIT; - pthread_once(&lock, func); -} - - -#elif CONFIG_MULTITHREAD && defined(_WIN32) -#include -static void once(void (*func)(void)) -{ - /* Using a static initializer here rather than InitializeCriticalSection() - * since there's no race-free context in which to execute it. Protecting - * it with an atomic op like InterlockedCompareExchangePointer introduces - * an x86 dependency, and InitOnceExecuteOnce requires Vista. - */ - static CRITICAL_SECTION lock = {(void *)-1, -1, 0, 0, 0, 0}; - static int done; - - EnterCriticalSection(&lock); - - if (!done) - { - func(); - done = 1; - } - - LeaveCriticalSection(&lock); -} - - -#else /* No-op version that performs no synchronization. vpx_rtcd() is idempotent, * so as long as your platform provides atomic loads/stores of pointers * no synchronization is strictly necessary. */ -static void once(void (*func)(void)) -{ - static int done; +static void once(void (*func)(void)) { + static int done; - if(!done) - { - func(); - done = 1; - } + if(!done) { + func(); + done = 1; + } } -#endif - -void vpx_rtcd() -{ - once(setup_rtcd_internal); +void vpx_rtcd() { + once(setup_rtcd_internal); } diff --git a/vp8/common/treecoder.c b/vp8/common/treecoder.c index 0bb8a0d..5c182d4 100644 --- a/vp8/common/treecoder.c +++ b/vp8/common/treecoder.c @@ -9,6 +9,8 @@ */ +#include "vpx_config.h" + #if CONFIG_DEBUG #include #endif diff --git a/vp8/decoder/onyxd_if.c b/vp8/decoder/onyxd_if.c index f9195b6..63499a8 100644 --- a/vp8/decoder/onyxd_if.c +++ b/vp8/decoder/onyxd_if.c @@ -68,7 +68,7 @@ void vp8_recon_write_yuv_frame(char *name, YV12_BUFFER_CONFIG *s) { fclose(yuv_file); } #endif -// #define WRITE_RECON_BUFFER 1 +#define WRITE_RECON_BUFFER 0 #if WRITE_RECON_BUFFER void write_dx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame) { diff --git a/vp8/encoder/dct.h b/vp8/encoder/dct.h index 2d7b617..8d8a842 100644 --- a/vp8/encoder/dct.h +++ b/vp8/encoder/dct.h @@ -12,6 +12,8 @@ #ifndef __INC_DCT_H #define __INC_DCT_H +#include "vpx_config.h" + #define prototype_fdct(sym) void (sym)(short *input, short *output, int pitch) #if ARCH_X86 || ARCH_X86_64 diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 8778335..d3e0e45 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -32,7 +32,7 @@ #include "vpx_ports/vpx_timer.h" #include "vp8/common/pred_common.h" -// #define DBG_PRNT_SEGMAP 1 +#define DBG_PRNT_SEGMAP 0 #if CONFIG_RUNTIME_CPU_DETECT #define RTCD(x) &cpi->common.rtcd.x @@ -1462,7 +1462,7 @@ void vp8cx_encode_intra_macro_block(VP8_COMP *cpi, sum_intra_stats(cpi, x); vp8_tokenize_mb(cpi, &x->e_mbd, t, 0); } -#if CONFIG_NEWBESTREFMVvp8_tokenize_mb +#if CONFIG_NEWBESTREFMV else vp8_tokenize_mb(cpi, &x->e_mbd, t, 1); #endif diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c index fdc85a9..c1504f2 100644 --- a/vp8/encoder/firstpass.c +++ b/vp8/encoder/firstpass.c @@ -30,7 +30,7 @@ #include "vp8/common/quant_common.h" #include "encodemv.h" -// #define OUTPUT_FPF 1 +#define OUTPUT_FPF 0 #if CONFIG_RUNTIME_CPU_DETECT #define IF_RTCD(x) (x) diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 46e0689..bcbc857 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -2605,7 +2605,7 @@ void write_yuv_frame_to_file(YV12_BUFFER_CONFIG *frame) { } #endif -// #define WRITE_RECON_BUFFER 1 +#define WRITE_RECON_BUFFER 0 #if WRITE_RECON_BUFFER void write_cx_frame_to_file(YV12_BUFFER_CONFIG *frame, int this_frame) { diff --git a/vp8/encoder/variance.h b/vp8/encoder/variance.h index 0bfd93c..73a0a6b 100644 --- a/vp8/encoder/variance.h +++ b/vp8/encoder/variance.h @@ -12,6 +12,8 @@ #ifndef VARIANCE_H #define VARIANCE_H +#include "vpx_config.h" + #define prototype_sad(sym)\ unsigned int (sym)\ (\ diff --git a/vpx/vp8cx.h b/vpx/vp8cx.h index 504b6d7..6a0eaa2 100644 --- a/vpx/vp8cx.h +++ b/vpx/vp8cx.h @@ -22,6 +22,7 @@ */ #ifndef VP8CX_H #define VP8CX_H +#include "vpx_config.h" #include "vpx_codec_impl_top.h" /*!\name Algorithm interface for VP8 -- 2.7.4