Commit 44699ef4 authored by Thomas Daede's avatar Thomas Daede Committed by Thomas Daede

Changes to allow rav1e to link.

Change-Id: I2704df39e88402bf5f78b2018ca4c4f8ad821407
parent a8b45c37
...@@ -739,7 +739,7 @@ static INLINE void highbd_v_predictor(uint16_t *dst, ptrdiff_t stride, int bw, ...@@ -739,7 +739,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, int bh, const uint16_t *above,
const uint16_t *left, int bd) { const uint16_t *left, int bd) {
int r; int r;
...@@ -958,7 +958,7 @@ static INLINE void highbd_dc_128_predictor(uint16_t *dst, ptrdiff_t stride, ...@@ -958,7 +958,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, int bw, int bh,
const uint16_t *above, const uint16_t *above,
const uint16_t *left, int bd) { const uint16_t *left, int bd) {
...@@ -975,7 +975,7 @@ static INLINE void highbd_dc_left_predictor(uint16_t *dst, ptrdiff_t stride, ...@@ -975,7 +975,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, int bw, int bh,
const uint16_t *above, const uint16_t *above,
const uint16_t *left, int bd) { const uint16_t *left, int bd) {
...@@ -992,7 +992,7 @@ static INLINE void highbd_dc_top_predictor(uint16_t *dst, ptrdiff_t stride, ...@@ -992,7 +992,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, int bh, const uint16_t *above,
const uint16_t *left, int bd) { const uint16_t *left, int bd) {
int i, r, expected_dc, sum = 0; int i, r, expected_dc, sum = 0;
......
...@@ -1462,13 +1462,13 @@ static const aom_cdf_prob ...@@ -1462,13 +1462,13 @@ static const aom_cdf_prob
}; };
#if CONFIG_EXT_SKIP #if CONFIG_EXT_SKIP
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(31609) }, { AOM_CDF2(20107) }, { AOM_CDF2(10296) } }; 2)] = { { AOM_CDF2(31609) }, { AOM_CDF2(20107) }, { AOM_CDF2(10296) } };
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(30224) }, { AOM_CDF2(16244) }, { AOM_CDF2(4835) } { AOM_CDF2(30224) }, { AOM_CDF2(16244) }, { AOM_CDF2(4835) }
}; };
#else #else
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(24576) }, { AOM_CDF2(16384) }, { AOM_CDF2(8192) } { AOM_CDF2(24576) }, { AOM_CDF2(16384) }, { AOM_CDF2(8192) }
}; };
#endif // CONFIG_EXT_SKIP #endif // CONFIG_EXT_SKIP
...@@ -1745,7 +1745,7 @@ static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE( ...@@ -1745,7 +1745,7 @@ static const aom_cdf_prob default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(
#endif // CONFIG_EXT_PARTITION #endif // CONFIG_EXT_PARTITION
}; };
#else #else
static const aom_cdf_prob const aom_cdf_prob
default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(PARTITION_TYPES)] = { default_partition_cdf[PARTITION_CONTEXTS][CDF_SIZE(PARTITION_TYPES)] = {
{ AOM_CDF4(25472, 28949, 31052) }, { AOM_CDF4(18816, 22250, 28783) }, { AOM_CDF4(25472, 28949, 31052) }, { AOM_CDF4(18816, 22250, 28783) },
{ AOM_CDF4(18944, 26126, 29188) }, { AOM_CDF4(15488, 22508, 27077) }, { AOM_CDF4(18944, 26126, 29188) }, { AOM_CDF4(15488, 22508, 27077) },
...@@ -1762,7 +1762,7 @@ static const aom_cdf_prob ...@@ -1762,7 +1762,7 @@ static const aom_cdf_prob
}; };
#endif #endif
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)] = { [EXT_TX_SETS_INTRA][EXT_TX_SIZES][INTRA_MODES][CDF_SIZE(TX_TYPES)] = {
{ {
// FIXME: unused zero positions, from uncoded trivial transform set // FIXME: unused zero positions, from uncoded trivial transform set
...@@ -3100,7 +3100,6 @@ void av1_setup_past_independence(AV1_COMMON *cm) { ...@@ -3100,7 +3100,6 @@ void av1_setup_past_independence(AV1_COMMON *cm) {
// To force update of the sharpness // To force update of the sharpness
lf->last_sharpness_level = -1; lf->last_sharpness_level = -1;
av1_default_coef_probs(cm); av1_default_coef_probs(cm);
init_mode_probs(cm->fc); init_mode_probs(cm->fc);
av1_init_mv_probs(cm); av1_init_mv_probs(cm);
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include "aom/aom_integer.h" #include "aom/aom_integer.h"
#include "aom_dsp/aom_dsp_common.h" #include "aom_dsp/aom_dsp_common.h"
#include "aom_ports/bitops.h" #include "aom_ports/bitops.h"
#include "av1/common/enums.h" //#include "av1/common/enums.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -265,7 +265,7 @@ tran_low_t av1_dequant_coeff_nuq(int v, int q, ...@@ -265,7 +265,7 @@ tran_low_t av1_dequant_coeff_nuq(int v, int q,
} }
#endif // CONFIG_NEW_QUANT #endif // CONFIG_NEW_QUANT
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, 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, 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, 31, 32, 32, 33, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42,
...@@ -337,7 +337,7 @@ static const int16_t dc_qlookup_12_Q3[QINDEX_RANGE] = { ...@@ -337,7 +337,7 @@ static const int16_t dc_qlookup_12_Q3[QINDEX_RANGE] = {
19718, 20521, 21387, 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, 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, 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, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include "av1/common/common_data.h" #include "av1/common/common_data.h"
#include "av1/common/scan.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, 4, 1, 5, 8, 2, 12, 9, 3, 6, 13, 10, 7, 14, 11, 15, 0, 4, 1, 5, 8, 2, 12, 9, 3, 6, 13, 10, 7, 14, 11, 15,
}; };
...@@ -915,7 +915,7 @@ DECLARE_ALIGNED(16, static const int16_t, default_scan_32x32[1024]) = { ...@@ -915,7 +915,7 @@ DECLARE_ALIGNED(16, static const int16_t, default_scan_32x32[1024]) = {
// Neighborhood 2-tuples for various scans and blocksizes, // Neighborhood 2-tuples for various scans and blocksizes,
// in {top, left} order for each position in corresponding scan order. // in {top, left} order for each position in corresponding scan order.
DECLARE_ALIGNED(16, static const int16_t, DECLARE_ALIGNED(16, const int16_t,
default_scan_4x4_neighbors[17 * MAX_NEIGHBORS]) = { default_scan_4x4_neighbors[17 * MAX_NEIGHBORS]) = {
0, 0, 0, 0, 4, 0, 1, 4, 4, 5, 5, 1, 8, 8, 5, 8, 2, 0, 0, 0, 0, 4, 0, 1, 4, 4, 5, 5, 1, 8, 8, 5, 8, 2,
2, 2, 5, 9, 12, 6, 9, 3, 6, 10, 13, 7, 10, 11, 14, 0, 0, 2, 2, 5, 9, 12, 6, 9, 3, 6, 10, 13, 7, 10, 11, 14, 0, 0,
......
Markdown is supported
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