Commit efdad1f4 authored by hui su's avatar hui su Committed by Frédéric BARBIER
Browse files

Add NELEMENTS() macro in aom_dsp/aom_dsp_common.h

Change-Id: Ia8da431c7a1faa43e130ce71da9561957c5556e7
parent 69d21011
...@@ -31,6 +31,8 @@ extern "C" { ...@@ -31,6 +31,8 @@ extern "C" {
#define AOMMIN(x, y) (((x) < (y)) ? (x) : (y)) #define AOMMIN(x, y) (((x) < (y)) ? (x) : (y))
#define AOMMAX(x, y) (((x) > (y)) ? (x) : (y)) #define AOMMAX(x, y) (((x) > (y)) ? (x) : (y))
#define NELEMENTS(x) (sizeof((x)) / sizeof((x)[0]))
#define IMPLIES(a, b) (!(a) || (b)) // Logical 'a implies b' (or 'a -> b') #define IMPLIES(a, b) (!(a) || (b)) // Logical 'a implies b' (or 'a -> b')
#define IS_POWER_OF_TWO(x) (((x) & ((x)-1)) == 0) #define IS_POWER_OF_TWO(x) (((x) & ((x)-1)) == 0)
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
#include "./rate_hist.h" #include "./rate_hist.h"
#include "./warnings.h" #include "./warnings.h"
#include "aom/aom_integer.h" #include "aom/aom_integer.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_ports/aom_timer.h" #include "aom_ports/aom_timer.h"
#include "aom_ports/mem_ops.h" #include "aom_ports/mem_ops.h"
#if CONFIG_WEBM_IO #if CONFIG_WEBM_IO
...@@ -627,7 +628,6 @@ void usage_exit(void) { ...@@ -627,7 +628,6 @@ void usage_exit(void) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#define NELEMENTS(x) (sizeof(x) / sizeof(x[0]))
#if CONFIG_AV1_ENCODER #if CONFIG_AV1_ENCODER
#define ARG_CTRL_CNT_MAX NELEMENTS(av1_arg_ctrl_map) #define ARG_CTRL_CNT_MAX NELEMENTS(av1_arg_ctrl_map)
#endif #endif
......
...@@ -348,8 +348,6 @@ static uint8_t get_filter_level(const loop_filter_info_n *lfi_n, ...@@ -348,8 +348,6 @@ static uint8_t get_filter_level(const loop_filter_info_n *lfi_n,
} }
#endif #endif
#define NELEMENTS(x) (sizeof((x)) / sizeof((x)[0]))
void av1_loop_filter_init(AV1_COMMON *cm) { void av1_loop_filter_init(AV1_COMMON *cm) {
assert(MB_MODE_COUNT == NELEMENTS(mode_lf_lut)); assert(MB_MODE_COUNT == NELEMENTS(mode_lf_lut));
loop_filter_info_n *lfi = &cm->lf_info; loop_filter_info_n *lfi = &cm->lf_info;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment