diff options
Diffstat (limited to 'vp8')
| -rw-r--r-- | vp8/common/common.h | 12 | ||||
| -rw-r--r-- | vp8/common/treecoder.h | 2 | ||||
| -rw-r--r-- | vp8/decoder/onyxd_int.h | 8 | ||||
| -rw-r--r-- | vp8/encoder/lookahead.h | 2 | ||||
| -rw-r--r-- | vp8/encoder/onyx_if.c | 4 | ||||
| -rw-r--r-- | vp8/encoder/onyx_int.h | 8 | ||||
| -rw-r--r-- | vp8/vp8_cx_iface.c | 8 | ||||
| -rw-r--r-- | vp8/vp8_dx_iface.c | 2 |
8 files changed, 23 insertions, 23 deletions
diff --git a/vp8/common/common.h b/vp8/common/common.h index 8593e822b..2c30e8d6c 100644 --- a/vp8/common/common.h +++ b/vp8/common/common.h @@ -31,15 +31,15 @@ extern "C" { /* Use this for variably-sized arrays. */ -#define vp8_copy_array(Dest, Src, N) \ - { \ - assert(sizeof(*Dest) == sizeof(*Src)); \ - memcpy(Dest, Src, N * sizeof(*Src)); \ +#define vp8_copy_array(Dest, Src, N) \ + { \ + assert(sizeof(*(Dest)) == sizeof(*(Src))); \ + memcpy(Dest, Src, (N) * sizeof(*(Src))); \ } -#define vp8_zero(Dest) memset(&Dest, 0, sizeof(Dest)); +#define vp8_zero(Dest) memset(&(Dest), 0, sizeof(Dest)); -#define vp8_zero_array(Dest, N) memset(Dest, 0, N * sizeof(*Dest)); +#define vp8_zero_array(Dest, N) memset(Dest, 0, (N) * sizeof(*(Dest))); #ifdef __cplusplus } // extern "C" diff --git a/vp8/common/treecoder.h b/vp8/common/treecoder.h index 00b1e7b24..d7d8d0ead 100644 --- a/vp8/common/treecoder.h +++ b/vp8/common/treecoder.h @@ -32,7 +32,7 @@ typedef const bool_coder_spec c_bool_coder_spec; typedef const bool_writer c_bool_writer; typedef const bool_reader c_bool_reader; -#define vp8_complement(x) (255 - x) +#define vp8_complement(x) (255 - (x)) /* We build coding trees compactly in arrays. Each node of the tree is a pair of vp8_tree_indices. diff --git a/vp8/decoder/onyxd_int.h b/vp8/decoder/onyxd_int.h index 75286e430..cf2c066d9 100644 --- a/vp8/decoder/onyxd_int.h +++ b/vp8/decoder/onyxd_int.h @@ -136,8 +136,8 @@ int vp8_remove_decoder_instances(struct frame_buffers *fb); #if CONFIG_DEBUG #define CHECK_MEM_ERROR(lval, expr) \ do { \ - lval = (expr); \ - if (!lval) \ + (lval) = (expr); \ + if (!(lval)) \ vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR, \ "Failed to allocate " #lval " at %s:%d", __FILE__, \ __LINE__); \ @@ -145,8 +145,8 @@ int vp8_remove_decoder_instances(struct frame_buffers *fb); #else #define CHECK_MEM_ERROR(lval, expr) \ do { \ - lval = (expr); \ - if (!lval) \ + (lval) = (expr); \ + if (!(lval)) \ vpx_internal_error(&pbi->common.error, VPX_CODEC_MEM_ERROR, \ "Failed to allocate " #lval); \ } while (0) diff --git a/vp8/encoder/lookahead.h b/vp8/encoder/lookahead.h index 4e2766b1c..bf0401190 100644 --- a/vp8/encoder/lookahead.h +++ b/vp8/encoder/lookahead.h @@ -74,7 +74,7 @@ int vp8_lookahead_push(struct lookahead_ctx *ctx, YV12_BUFFER_CONFIG *src, struct lookahead_entry *vp8_lookahead_pop(struct lookahead_ctx *ctx, int drain); #define PEEK_FORWARD 1 -#define PEEK_BACKWARD -1 +#define PEEK_BACKWARD (-1) /**\brief Get a future source buffer to encode * * \param[in] ctx Pointer to the lookahead context diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index a30821ac1..bdc4bdc42 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -687,8 +687,8 @@ static void set_default_lf_deltas(VP8_COMP *cpi) { /* Convenience macros for mapping speed and mode into a continuous * range */ -#define GOOD(x) (x + 1) -#define RT(x) (x + 7) +#define GOOD(x) ((x) + 1) +#define RT(x) ((x) + 7) static int speed_map(int speed, const int *map) { int res; diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index a4e3f2f79..a48c4d5f7 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -716,8 +716,8 @@ void vp8_set_speed_features(VP8_COMP *cpi); #if CONFIG_DEBUG #define CHECK_MEM_ERROR(lval, expr) \ do { \ - lval = (expr); \ - if (!lval) \ + (lval) = (expr); \ + if (!(lval)) \ vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, \ "Failed to allocate " #lval " at %s:%d", __FILE__, \ __LINE__); \ @@ -725,8 +725,8 @@ void vp8_set_speed_features(VP8_COMP *cpi); #else #define CHECK_MEM_ERROR(lval, expr) \ do { \ - lval = (expr); \ - if (!lval) \ + (lval) = (expr); \ + if (!(lval)) \ vpx_internal_error(&cpi->common.error, VPX_CODEC_MEM_ERROR, \ "Failed to allocate " #lval); \ } while (0) diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index d01d2095f..c0e3ada0c 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -106,10 +106,10 @@ static vpx_codec_err_t update_error_state( return VPX_CODEC_INVALID_PARAM; \ } while (0) -#define RANGE_CHECK(p, memb, lo, hi) \ - do { \ - if (!(((p)->memb == lo || (p)->memb > (lo)) && (p)->memb <= hi)) \ - ERROR(#memb " out of range [" #lo ".." #hi "]"); \ +#define RANGE_CHECK(p, memb, lo, hi) \ + do { \ + if (!(((p)->memb == (lo) || (p)->memb > (lo)) && (p)->memb <= (hi))) \ + ERROR(#memb " out of range [" #lo ".." #hi "]"); \ } while (0) #define RANGE_CHECK_HI(p, memb, hi) \ diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index 7db77195b..f441ed46f 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -38,7 +38,7 @@ typedef vpx_codec_stream_info_t vp8_stream_info_t; /* Structures for handling memory allocations */ typedef enum { VP8_SEG_ALG_PRIV = 256, VP8_SEG_MAX } mem_seg_id_t; -#define NELEMENTS(x) ((int)(sizeof(x) / sizeof(x[0]))) +#define NELEMENTS(x) ((int)(sizeof(x) / sizeof((x)[0]))) struct vpx_codec_alg_priv { vpx_codec_priv_t base; |