Remove unused macros. Change-Id: I7bfe8ae788636ac1573b8934f988f157acc13cd3
diff --git a/aom_dsp/intrapred.c b/aom_dsp/intrapred.c index 176884d..7184ccb 100644 --- a/aom_dsp/intrapred.c +++ b/aom_dsp/intrapred.c
@@ -20,10 +20,6 @@ #include "aom_mem/aom_mem.h" #include "aom_ports/bitops.h" -#define DST(x, y) dst[(x) + (y)*stride] -#define AVG3(a, b, c) (((a) + 2 * (b) + (c) + 2) >> 2) -#define AVG2(a, b) (((a) + (b) + 1) >> 1) - static INLINE void v_predictor(uint8_t *dst, ptrdiff_t stride, int bw, int bh, const uint8_t *above, const uint8_t *left) { int r;
diff --git a/aom_dsp/x86/loopfilter_sse2.c b/aom_dsp/x86/loopfilter_sse2.c index f6c00be..660ccd8 100644 --- a/aom_dsp/x86/loopfilter_sse2.c +++ b/aom_dsp/x86/loopfilter_sse2.c
@@ -52,44 +52,6 @@ mask = _mm_and_si128(mask, _mm_srli_si128(mask, 8)); \ } while (0) -// filter_mask and hev_mask -#define FILTER_HEV_MASK \ - do { \ - /* (abs(q1 - q0), abs(p1 - p0) */ \ - __m128i flat = abs_diff(q1p1, q0p0); \ - /* abs(p1 - q1), abs(p0 - q0) */ \ - const __m128i abs_p1q1p0q0 = abs_diff(p1p0, q1q0); \ - __m128i abs_p0q0, abs_p1q1, work; \ - \ - /* const uint8_t hev = hev_mask(thresh, *op1, *op0, *oq0, *oq1); */ \ - hev = \ - _mm_unpacklo_epi8(_mm_max_epu8(flat, _mm_srli_si128(flat, 8)), zero); \ - hev = _mm_cmpgt_epi16(hev, thresh); \ - hev = _mm_packs_epi16(hev, hev); \ - \ - /* const int8_t mask = filter_mask(*limit, *blimit, */ \ - /* p3, p2, p1, p0, q0, q1, q2, q3); */ \ - abs_p0q0 = \ - _mm_adds_epu8(abs_p1q1p0q0, abs_p1q1p0q0); /* abs(p0 - q0) * 2 */ \ - abs_p1q1 = \ - _mm_unpackhi_epi8(abs_p1q1p0q0, abs_p1q1p0q0); /* abs(p1 - q1) */ \ - abs_p1q1 = _mm_srli_epi16(abs_p1q1, 9); \ - abs_p1q1 = _mm_packs_epi16(abs_p1q1, abs_p1q1); /* abs(p1 - q1) / 2 */ \ - /* abs(p0 - q0) * 2 + abs(p1 - q1) / 2 */ \ - mask = _mm_adds_epu8(abs_p0q0, abs_p1q1); \ - /* abs(p3 - p2), abs(p2 - p1) */ \ - work = abs_diff(p3p2, p2p1); \ - flat = _mm_max_epu8(work, flat); \ - /* abs(q3 - q2), abs(q2 - q1) */ \ - work = abs_diff(q3q2, q2q1); \ - flat = _mm_max_epu8(work, flat); \ - flat = _mm_max_epu8(flat, _mm_srli_si128(flat, 8)); \ - mask = _mm_unpacklo_epi64(mask, flat); \ - mask = _mm_subs_epu8(mask, limit); \ - mask = _mm_cmpeq_epi8(mask, zero); \ - mask = _mm_and_si128(mask, _mm_srli_si128(mask, 8)); \ - } while (0) - AOM_FORCE_INLINE void filter4_sse2(__m128i *p1p0, __m128i *q1q0, __m128i *hev, __m128i *mask, __m128i *qs1qs0, __m128i *ps1ps0) {
diff --git a/av1/av1_cx_iface.c b/av1/av1_cx_iface.c index 759f77b..62ae021 100644 --- a/av1/av1_cx_iface.c +++ b/av1/av1_cx_iface.c
@@ -25,7 +25,6 @@ #include "aom_ports/mem_ops.h" #define MAG_SIZE (4) -#define MAX_INDEX_SIZE (256) #define MAX_NUM_ENHANCEMENT_LAYERS 128 struct av1_extracfg { @@ -209,11 +208,6 @@ if (!((p)->memb <= (hi))) ERROR(#memb " out of range [.." #hi "]"); \ } while (0) -#define RANGE_CHECK_LO(p, memb, lo) \ - do { \ - if (!((p)->memb >= (lo))) ERROR(#memb " out of range [" #lo "..]"); \ - } while (0) - #define RANGE_CHECK_BOOL(p, memb) \ do { \ if (!!((p)->memb) != (p)->memb) ERROR(#memb " expected boolean"); \ @@ -1177,9 +1171,6 @@ return AOM_CODEC_OK; } -// Turn on to test if supplemental superframe data breaks decoding -#define TEST_SUPPLEMENTAL_SUPERFRAME_DATA 0 - #if !CONFIG_BUFFER_MODEL // av1 uses 10,000,000 ticks/second as time stamp #define TICKS_PER_SEC 10000000LL
diff --git a/av1/common/convolve.c b/av1/common/convolve.c index f20aaf9..79f4802 100644 --- a/av1/common/convolve.c +++ b/av1/common/convolve.c
@@ -22,10 +22,6 @@ #include "aom_dsp/aom_dsp_common.h" #include "aom_ports/mem.h" -#define MAX_BLOCK_WIDTH (MAX_SB_SIZE) -#define MAX_BLOCK_HEIGHT (MAX_SB_SIZE) -#define MAX_STEP (32) - void av1_convolve_horiz_rs_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const int16_t *x_filters, int x0_qn,
diff --git a/av1/common/pred_common.c b/av1/common/pred_common.c index 14a5cf1..d77739d 100644 --- a/av1/common/pred_common.c +++ b/av1/common/pred_common.c
@@ -142,9 +142,6 @@ (((ref_frame) >= BWDREF_FRAME) && ((ref_frame) <= ALTREF_FRAME)) #define IS_BACKWARD_REF_FRAME(ref_frame) CHECK_BACKWARD_REFS(ref_frame) -#define CHECK_GOLDEN_OR_LAST3(ref_frame) \ - (((ref_frame) == GOLDEN_FRAME) || ((ref_frame) == LAST3_FRAME)) - int av1_get_reference_mode_context(const MACROBLOCKD *xd) { int ctx; const MB_MODE_INFO *const above_mbmi = xd->above_mbmi;
diff --git a/av1/common/scan.c b/av1/common/scan.c index 98f019f..31a787b 100644 --- a/av1/common/scan.c +++ b/av1/common/scan.c
@@ -839,14 +839,6 @@ 927, 958, 989, 1020, 1021, 990, 959, 991, 1022, 1023 }; -// Approximate versions, which reuse the 32x32 scan and assume rest of the -// coeffs to be zero. -#define default_scan_32x64 default_scan_32x32 -#define default_scan_64x32 default_scan_32x32 -#define default_scan_64x64 default_scan_32x32 -#define default_scan_16x64 default_scan_16x32 -#define default_scan_64x16 default_scan_32x16 - // Neighborhood 2-tuples for various scans and blocksizes, // in {top, left} order for each position in corresponding scan order. DECLARE_ALIGNED(16, static const int16_t, @@ -2384,12 +2376,6 @@ 990, 1021, 991, 1022, 0, 0 }; -#define default_scan_32x64_neighbors default_scan_32x32_neighbors -#define default_scan_64x32_neighbors default_scan_32x32_neighbors -#define default_scan_64x64_neighbors default_scan_32x32_neighbors -#define default_scan_16x64_neighbors default_scan_16x32_neighbors -#define default_scan_64x16_neighbors default_scan_32x16_neighbors - DECLARE_ALIGNED(16, static const int16_t, av1_default_iscan_4x4[16]) = { 0, 1, 5, 6, 2, 4, 7, 12, 3, 8, 11, 13, 9, 10, 14, 15 };
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 542b6f7..5c10fb4 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -59,7 +59,6 @@ #include "av1/decoder/decodetxb.h" #include "av1/decoder/detokenize.h" -#define MAX_AV1_HEADER_SIZE 80 #define ACCT_STR __func__ // This is needed by ext_tile related unit tests.
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index 9a4ebc0..f901ace 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -2704,10 +2704,12 @@ return cpi; } +#if CONFIG_INTERNAL_STATS #define SNPRINT(H, T) snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T)) #define SNPRINT2(H, T, V) \ snprintf((H) + strlen(H), sizeof(H) - strlen(H), (T), (V)) +#endif // CONFIG_INTERNAL_STATS void av1_remove_compressor(AV1_COMP *cpi) { AV1_COMMON *cm; @@ -2792,8 +2794,7 @@ fclose(f); } - -#endif +#endif // CONFIG_INTERNAL_STATS } for (t = 0; t < cpi->num_workers; ++t) {
diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c index 7b749b2..e8e8543 100644 --- a/av1/encoder/rdopt.c +++ b/av1/encoder/rdopt.c
@@ -69,35 +69,6 @@ { 1, 2 }, { 2, 0 }, { 2, 1 }, { 2, 2 }, }; -#define LAST_FRAME_MODE_MASK \ - ((1 << INTRA_FRAME) | (1 << LAST2_FRAME) | (1 << LAST3_FRAME) | \ - (1 << GOLDEN_FRAME) | (1 << BWDREF_FRAME) | (1 << ALTREF2_FRAME) | \ - (1 << ALTREF_FRAME)) -#define LAST2_FRAME_MODE_MASK \ - ((1 << INTRA_FRAME) | (1 << LAST_FRAME) | (1 << LAST3_FRAME) | \ - (1 << GOLDEN_FRAME) | (1 << BWDREF_FRAME) | (1 << ALTREF2_FRAME) | \ - (1 << ALTREF_FRAME)) -#define LAST3_FRAME_MODE_MASK \ - ((1 << INTRA_FRAME) | (1 << LAST_FRAME) | (1 << LAST2_FRAME) | \ - (1 << GOLDEN_FRAME) | (1 << BWDREF_FRAME) | (1 << ALTREF2_FRAME) | \ - (1 << ALTREF_FRAME)) -#define GOLDEN_FRAME_MODE_MASK \ - ((1 << INTRA_FRAME) | (1 << LAST_FRAME) | (1 << LAST2_FRAME) | \ - (1 << LAST3_FRAME) | (1 << BWDREF_FRAME) | (1 << ALTREF2_FRAME) | \ - (1 << ALTREF_FRAME)) -#define BWDREF_FRAME_MODE_MASK \ - ((1 << INTRA_FRAME) | (1 << LAST_FRAME) | (1 << LAST2_FRAME) | \ - (1 << LAST3_FRAME) | (1 << GOLDEN_FRAME) | (1 << ALTREF2_FRAME) | \ - (1 << ALTREF_FRAME)) -#define ALTREF2_FRAME_MODE_MASK \ - ((1 << INTRA_FRAME) | (1 << LAST_FRAME) | (1 << LAST2_FRAME) | \ - (1 << LAST3_FRAME) | (1 << GOLDEN_FRAME) | (1 << BWDREF_FRAME) | \ - (1 << ALTREF_FRAME)) -#define ALTREF_FRAME_MODE_MASK \ - ((1 << INTRA_FRAME) | (1 << LAST_FRAME) | (1 << LAST2_FRAME) | \ - (1 << LAST3_FRAME) | (1 << GOLDEN_FRAME) | (1 << BWDREF_FRAME) | \ - (1 << ALTREF2_FRAME)) - #define SECOND_REF_FRAME_MASK \ ((1 << ALTREF_FRAME) | (1 << ALTREF2_FRAME) | (1 << BWDREF_FRAME) | \ (1 << GOLDEN_FRAME) | (1 << LAST2_FRAME) | 0x01)