...
 
Commits (13)
......@@ -77,6 +77,7 @@ extern "C" {
#endif
/*!\brief Decorator indicating that given struct/union/enum is packed */
#if 0
#ifndef ATTRIBUTE_PACKED
#if defined(__GNUC__) && __GNUC__
#define ATTRIBUTE_PACKED __attribute__((packed))
......@@ -86,6 +87,9 @@ extern "C" {
#define ATTRIBUTE_PACKED
#endif
#endif /* ATTRIBUTE_PACKED */
#else
#define ATTRIBUTE_PACKED
#endif
/*!\brief Current ABI version number
*
......
......@@ -364,7 +364,7 @@ void aom_dc_predictor_64x32_c(uint8_t *dst, ptrdiff_t stride,
#undef DC_MULTIPLIER_1X2
#undef DC_MULTIPLIER_1X4
static INLINE void highbd_v_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
void highbd_v_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
int bh, const uint16_t *above,
const uint16_t *left, int bd) {
int r;
......@@ -376,7 +376,7 @@ static INLINE void highbd_v_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
}
}
static INLINE void highbd_h_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
void highbd_h_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
int bh, const uint16_t *above,
const uint16_t *left, int bd) {
int r;
......@@ -388,7 +388,7 @@ static INLINE void highbd_h_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
}
}
static INLINE void highbd_paeth_predictor(uint16_t *dst, ptrdiff_t stride,
void highbd_paeth_predictor(uint16_t *dst, ptrdiff_t stride,
int bw, int bh, const uint16_t *above,
const uint16_t *left, int bd) {
int r, c;
......@@ -402,7 +402,7 @@ static INLINE void highbd_paeth_predictor(uint16_t *dst, ptrdiff_t stride,
}
}
static INLINE void highbd_smooth_predictor(uint16_t *dst, ptrdiff_t stride,
void highbd_smooth_predictor(uint16_t *dst, ptrdiff_t stride,
int bw, int bh,
const uint16_t *above,
const uint16_t *left, int bd) {
......@@ -435,7 +435,7 @@ static INLINE void highbd_smooth_predictor(uint16_t *dst, ptrdiff_t stride,
}
}
static INLINE void highbd_smooth_v_predictor(uint16_t *dst, ptrdiff_t stride,
void highbd_smooth_v_predictor(uint16_t *dst, ptrdiff_t stride,
int bw, int bh,
const uint16_t *above,
const uint16_t *left, int bd) {
......@@ -466,7 +466,7 @@ static INLINE void highbd_smooth_v_predictor(uint16_t *dst, ptrdiff_t stride,
}
}
static INLINE void highbd_smooth_h_predictor(uint16_t *dst, ptrdiff_t stride,
void highbd_smooth_h_predictor(uint16_t *dst, ptrdiff_t stride,
int bw, int bh,
const uint16_t *above,
const uint16_t *left, int bd) {
......@@ -511,7 +511,7 @@ static INLINE void highbd_dc_128_predictor(uint16_t *dst, ptrdiff_t stride,
}
}
static INLINE void highbd_dc_left_predictor(uint16_t *dst, ptrdiff_t stride,
void highbd_dc_left_predictor(uint16_t *dst, ptrdiff_t stride,
int bw, int bh,
const uint16_t *above,
const uint16_t *left, int bd) {
......@@ -528,7 +528,7 @@ static INLINE void highbd_dc_left_predictor(uint16_t *dst, ptrdiff_t stride,
}
}
static INLINE void highbd_dc_top_predictor(uint16_t *dst, ptrdiff_t stride,
void highbd_dc_top_predictor(uint16_t *dst, ptrdiff_t stride,
int bw, int bh,
const uint16_t *above,
const uint16_t *left, int bd) {
......@@ -545,7 +545,7 @@ static INLINE void highbd_dc_top_predictor(uint16_t *dst, ptrdiff_t stride,
}
}
static INLINE void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
void highbd_dc_predictor(uint16_t *dst, ptrdiff_t stride, int bw,
int bh, const uint16_t *above,
const uint16_t *left, int bd) {
int i, r, expected_dc, sum = 0;
......
......@@ -13,6 +13,7 @@
#define _CDEF_BLOCK_H (1)
#include "./odintrin.h"
#include "av1/common/enums.h"
#define CDEF_BLOCKSIZE 64
#define CDEF_BLOCKSIZE_LOG2 6
......
......@@ -17,7 +17,7 @@
#include "av1/common/seg_common.h"
#include "av1/common/txb_common.h"
static const aom_cdf_prob
const aom_cdf_prob
default_kf_y_mode_cdf[KF_MODE_CONTEXTS][KF_MODE_CONTEXTS][CDF_SIZE(
INTRA_MODES)] = {
{ { AOM_CDF13(15588, 17027, 19338, 20218, 20682, 21110, 21825, 23244,
......@@ -72,7 +72,7 @@ static const aom_cdf_prob
31355, 31802, 32593) } }
};
static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
2 * MAX_ANGLE_DELTA + 1)] = {
{ AOM_CDF7(2180, 5032, 7567, 22776, 26989, 30217) },
{ AOM_CDF7(2301, 5608, 8801, 23487, 26974, 30330) },
......@@ -84,7 +84,7 @@ static const aom_cdf_prob default_angle_delta_cdf[DIRECTIONAL_MODES][CDF_SIZE(
{ AOM_CDF7(3605, 10428, 12459, 17676, 21244, 30655) }
};
static const aom_cdf_prob default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
const aom_cdf_prob default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
INTRA_MODES)] = { { AOM_CDF13(22801, 23489, 24293, 24756, 25601, 26123,
26606, 27418, 27945, 29228, 29685, 30349) },
{ AOM_CDF13(18673, 19845, 22631, 23318, 23950, 24649,
......@@ -94,7 +94,7 @@ static const aom_cdf_prob default_if_y_mode_cdf[BLOCK_SIZE_GROUPS][CDF_SIZE(
{ AOM_CDF13(20155, 21301, 22838, 23178, 23261, 23533,
23703, 24804, 25352, 26575, 27016, 28049) } };
static const aom_cdf_prob
const aom_cdf_prob
default_uv_mode_cdf[CFL_ALLOWED_TYPES][INTRA_MODES][CDF_SIZE(
UV_INTRA_MODES)] = {
{ { AOM_CDF13(22631, 24152, 25378, 25661, 25986, 26520, 27055, 27923,
......@@ -151,7 +151,7 @@ static const aom_cdf_prob
9875, 10521, 29048) } }
};
static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
EXT_PARTITION_TYPES)] = {
{ AOM_CDF4(19132, 25510, 30392) },
{ AOM_CDF4(13928, 19855, 28540) },
......@@ -175,7 +175,7 @@ static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
{ AOM_CDF8(711, 966, 1172, 32448, 32538, 32617, 32664) },
};
static const aom_cdf_prob default_intra_ext_tx_cdf
const aom_cdf_prob default_intra_ext_tx_cdf
[EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES][CDF_SIZE(TX_TYPES)] = {
{
{
......@@ -365,7 +365,7 @@ static const aom_cdf_prob default_intra_ext_tx_cdf
},
};
static const aom_cdf_prob
const aom_cdf_prob
default_inter_ext_tx_cdf[EXT_TX_SETS_INTER][EXT_TX_SIZES][CDF_SIZE(
TX_TYPES)] = {
{
......@@ -570,7 +570,7 @@ static const aom_cdf_prob default_obmc_cdf[BLOCK_SIZES_ALL][CDF_SIZE(2)] = {
{ AOM_CDF2(26879) }
};
static const aom_cdf_prob default_intra_inter_cdf[INTRA_INTER_CONTEXTS]
const aom_cdf_prob default_intra_inter_cdf[INTRA_INTER_CONTEXTS]
[CDF_SIZE(2)] = {
{ AOM_CDF2(806) },
{ AOM_CDF2(16662) },
......@@ -799,11 +799,11 @@ static const aom_cdf_prob
{ AOM_CDF2(28165) }, { AOM_CDF2(22401) }, { AOM_CDF2(16088) }
};
static const aom_cdf_prob default_skip_cdfs[SKIP_CONTEXTS][CDF_SIZE(2)] = {
const aom_cdf_prob default_skip_cdfs[SKIP_CONTEXTS][CDF_SIZE(2)] = {
{ AOM_CDF2(31671) }, { AOM_CDF2(16515) }, { AOM_CDF2(4576) }
};
static const aom_cdf_prob default_skip_mode_cdfs[SKIP_MODE_CONTEXTS][CDF_SIZE(
const aom_cdf_prob default_skip_mode_cdfs[SKIP_MODE_CONTEXTS][CDF_SIZE(
2)] = { { AOM_CDF2(32621) }, { AOM_CDF2(20708) }, { AOM_CDF2(8127) } };
static const aom_cdf_prob
......@@ -821,10 +821,10 @@ static const aom_cdf_prob
static const aom_cdf_prob default_intrabc_cdf[CDF_SIZE(2)] = { AOM_CDF2(
30531) };
static const aom_cdf_prob default_filter_intra_mode_cdf[CDF_SIZE(
const aom_cdf_prob default_filter_intra_mode_cdf[CDF_SIZE(
FILTER_INTRA_MODES)] = { AOM_CDF5(8949, 12776, 17211, 29558) };
static const aom_cdf_prob default_filter_intra_cdfs[BLOCK_SIZES_ALL][CDF_SIZE(
const aom_cdf_prob default_filter_intra_cdfs[BLOCK_SIZES_ALL][CDF_SIZE(
2)] = { { AOM_CDF2(4621) }, { AOM_CDF2(6743) }, { AOM_CDF2(5893) },
{ AOM_CDF2(7866) }, { AOM_CDF2(12551) }, { AOM_CDF2(9394) },
{ AOM_CDF2(12408) }, { AOM_CDF2(14301) }, { AOM_CDF2(12756) },
......
......@@ -281,7 +281,7 @@ typedef enum {
SHARP_SHARP,
} DUAL_FILTER_TYPE;
typedef enum ATTRIBUTE_PACKED {
typedef enum {
// DCT only
EXT_TX_SET_DCTONLY,
// DCT + Identity only
......
......@@ -20,7 +20,7 @@
#include "aom/aom_integer.h"
#include "aom_dsp/aom_dsp_common.h"
#include "aom_ports/bitops.h"
#include "av1/common/enums.h"
//#include "av1/common/enums.h"
#ifdef __cplusplus
extern "C" {
......
......@@ -16,7 +16,7 @@
#include "av1/common/seg_common.h"
#include "av1/common/blockd.h"
static const int16_t dc_qlookup_Q3[QINDEX_RANGE] = {
const int16_t dc_qlookup_Q3[QINDEX_RANGE] = {
4, 8, 8, 9, 10, 11, 12, 12, 13, 14, 15, 16, 17, 18,
19, 19, 20, 21, 22, 23, 24, 25, 26, 26, 27, 28, 29, 30,
31, 32, 32, 33, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42,
......@@ -88,7 +88,7 @@ static const int16_t dc_qlookup_12_Q3[QINDEX_RANGE] = {
19718, 20521, 21387,
};
static const int16_t ac_qlookup_Q3[QINDEX_RANGE] = {
const int16_t ac_qlookup_Q3[QINDEX_RANGE] = {
4, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
......
This diff is collapsed.
......@@ -14,7 +14,7 @@
#include "av1/common/common_data.h"
#include "av1/common/scan.h"
DECLARE_ALIGNED(16, static const int16_t, default_scan_4x4[16]) = {
DECLARE_ALIGNED(16, const int16_t, default_scan_4x4[16]) = {
0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
};
......
......@@ -12,7 +12,7 @@
#include "./aom_config.h"
#include "av1/common/entropy.h"
static const aom_cdf_prob
const aom_cdf_prob
av1_default_dc_sign_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][DC_SIGN_CONTEXTS]
[CDF_SIZE(2)] = {
{ {
......@@ -57,7 +57,7 @@ static const aom_cdf_prob
} },
};
static const aom_cdf_prob
const aom_cdf_prob
av1_default_txb_skip_cdfs[TOKEN_CDF_Q_CTXS][TX_SIZES][TXB_SKIP_CONTEXTS]
[CDF_SIZE(2)] = { { { { AOM_CDF2(31849) },
{ AOM_CDF2(5892) },
......@@ -320,7 +320,7 @@ static const aom_cdf_prob
{ AOM_CDF2(16384) },
{ AOM_CDF2(16384) } } } };
static const aom_cdf_prob av1_default_eob_extra_cdfs
const aom_cdf_prob av1_default_eob_extra_cdfs
[TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES][EOB_COEF_CONTEXTS][CDF_SIZE(2)] =
{ { { { { AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16961) }, { AOM_CDF2(17223) }, { AOM_CDF2(7621) },
......@@ -643,7 +643,7 @@ static const aom_cdf_prob av1_default_eob_extra_cdfs
{ AOM_CDF2(16384) }, { AOM_CDF2(16384) }, { AOM_CDF2(16384) },
{ AOM_CDF2(16384) } } } } };
static const aom_cdf_prob
const aom_cdf_prob
av1_default_eob_multi16_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
5)] = { { { { AOM_CDF5(840, 1039, 1980, 4895) },
{ AOM_CDF5(370, 671, 1883, 4471) } },
......@@ -662,7 +662,7 @@ static const aom_cdf_prob
{ { AOM_CDF5(19575, 21766, 26044, 29709) },
{ AOM_CDF5(7297, 10767, 19273, 28194) } } } };
static const aom_cdf_prob
const aom_cdf_prob
av1_default_eob_multi32_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
6)] = { { { { AOM_CDF6(400, 520, 977, 2102, 6542) },
{ AOM_CDF6(210, 405, 1315, 3326, 7537) } },
......@@ -681,7 +681,7 @@ static const aom_cdf_prob
{ { AOM_CDF6(22086, 24282, 27010, 29770, 31743) },
{ AOM_CDF6(7699, 10897, 20891, 26926, 31628) } } } };
static const aom_cdf_prob
const aom_cdf_prob
av1_default_eob_multi64_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
7)] = { { { { AOM_CDF7(329, 498, 1101, 1784, 3265, 7758) },
{ AOM_CDF7(335, 730, 1459, 5494, 8755, 12997) } },
......@@ -700,7 +700,7 @@ static const aom_cdf_prob
{ { AOM_CDF7(24212, 25708, 28268, 30035, 31307, 32049) },
{ AOM_CDF7(8726, 12378, 19409, 26450, 30038, 32462) } } } };
static const aom_cdf_prob
const aom_cdf_prob
av1_default_eob_multi128_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
8)] = {
{ { { AOM_CDF8(219, 482, 1140, 2091, 3680, 6028, 12586) },
......@@ -721,7 +721,7 @@ static const aom_cdf_prob
{ AOM_CDF8(9165, 13282, 21150, 30286, 31894, 32571, 32712) } } }
};
static const aom_cdf_prob
const aom_cdf_prob
av1_default_eob_multi256_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
9)] = {
{ { { AOM_CDF9(310, 584, 1887, 3589, 6168, 8611, 11352, 15652) },
......@@ -744,7 +744,7 @@ static const aom_cdf_prob
32695) } } }
};
static const aom_cdf_prob
const aom_cdf_prob
av1_default_eob_multi512_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
10)] = { { { { AOM_CDF10(641, 983, 3707, 5430, 10234, 14958, 18788,
23412, 26061) },
......@@ -779,7 +779,7 @@ static const aom_cdf_prob
{ AOM_CDF10(3277, 6554, 9830, 13107, 16384, 19661, 22938,
26214, 29491) } } } };
static const aom_cdf_prob
const aom_cdf_prob
av1_default_eob_multi1024_cdfs[TOKEN_CDF_Q_CTXS][PLANE_TYPES][2][CDF_SIZE(
11)] = { { { { AOM_CDF11(393, 421, 751, 1623, 3160, 6352, 13345, 18047,
22571, 25830) },
......@@ -814,7 +814,7 @@ static const aom_cdf_prob
{ AOM_CDF11(2979, 5958, 8937, 11916, 14895, 17873, 20852,
23831, 26810, 29789) } } } };
static const aom_cdf_prob av1_default_coeff_lps_multi_cdfs
const aom_cdf_prob av1_default_coeff_lps_multi_cdfs
[TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES][LEVEL_CONTEXTS]
[CDF_SIZE(BR_CDF_SIZE)] = {
{ { { { AOM_CDF4(14298, 20718, 24174) },
......@@ -1579,7 +1579,7 @@ static const aom_cdf_prob av1_default_coeff_lps_multi_cdfs
{ AOM_CDF4(8192, 16384, 24576) } } } }
};
static const aom_cdf_prob av1_default_coeff_base_multi_cdfs
const aom_cdf_prob av1_default_coeff_base_multi_cdfs
[TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS]
[CDF_SIZE(NUM_BASE_LEVELS + 2)] =
{ { { { { AOM_CDF4(4034, 8930, 12727) },
......@@ -3263,7 +3263,7 @@ static const aom_cdf_prob av1_default_coeff_base_multi_cdfs
{ AOM_CDF4(8192, 16384, 24576) },
{ AOM_CDF4(8192, 16384, 24576) } } } } };
static const aom_cdf_prob av1_default_coeff_base_eob_multi_cdfs
const aom_cdf_prob av1_default_coeff_base_eob_multi_cdfs
[TOKEN_CDF_Q_CTXS][TX_SIZES][PLANE_TYPES][SIG_COEF_CONTEXTS_EOB][CDF_SIZE(
NUM_BASE_LEVELS + 1)] = { { { { { AOM_CDF3(17837, 29055) },
{ AOM_CDF3(29600, 31446) },
......