Commit 10240a06 authored by Thomas Daede's avatar Thomas Daede Committed by Thomas Daede

Changes to allow rav1e to link.

Change-Id: I2704df39e88402bf5f78b2018ca4c4f8ad821407
parent 2ec2a6f1
...@@ -646,7 +646,7 @@ static INLINE void highbd_v_predictor(uint16_t *dst, ptrdiff_t stride, int bw, ...@@ -646,7 +646,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;
...@@ -867,7 +867,7 @@ static INLINE void highbd_dc_128_predictor(uint16_t *dst, ptrdiff_t stride, ...@@ -867,7 +867,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) {
...@@ -884,7 +884,7 @@ static INLINE void highbd_dc_left_predictor(uint16_t *dst, ptrdiff_t stride, ...@@ -884,7 +884,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) {
...@@ -901,7 +901,7 @@ static INLINE void highbd_dc_top_predictor(uint16_t *dst, ptrdiff_t stride, ...@@ -901,7 +901,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;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -2451,7 +2451,7 @@ static const aom_cdf_prob ...@@ -2451,7 +2451,7 @@ static const aom_cdf_prob
#endif // CONFIG_VAR_TX #endif // CONFIG_VAR_TX
#if CONFIG_NEW_MULTISYMBOL #if CONFIG_NEW_MULTISYMBOL
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_ICDF(24576), AOM_ICDF(32768), 0 }, { AOM_ICDF(24576), AOM_ICDF(32768), 0 },
{ AOM_ICDF(16384), AOM_ICDF(32768), 0 }, { AOM_ICDF(16384), AOM_ICDF(32768), 0 },
{ AOM_ICDF(8192), AOM_ICDF(32768), 0 } { AOM_ICDF(8192), AOM_ICDF(32768), 0 }
...@@ -2783,7 +2783,7 @@ static const aom_cdf_prob ...@@ -2783,7 +2783,7 @@ static const aom_cdf_prob
}, },
}; };
static const aom_cdf_prob const aom_cdf_prob
default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)] = { default_uv_mode_cdf[INTRA_MODES][CDF_SIZE(UV_INTRA_MODES)] = {
{ {
AOM_ICDF(25472), AOM_ICDF(27697), AOM_ICDF(30693), AOM_ICDF(30916), AOM_ICDF(25472), AOM_ICDF(27697), AOM_ICDF(30693), AOM_ICDF(30916),
...@@ -2911,7 +2911,7 @@ static const aom_cdf_prob ...@@ -2911,7 +2911,7 @@ static const aom_cdf_prob
#endif #endif
}; };
#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_ICDF(25472), AOM_ICDF(28949), AOM_ICDF(31052), AOM_ICDF(32768), 0 }, { AOM_ICDF(25472), AOM_ICDF(28949), AOM_ICDF(31052), AOM_ICDF(32768), 0 },
{ AOM_ICDF(18816), AOM_ICDF(22250), AOM_ICDF(28783), AOM_ICDF(32768), 0 }, { AOM_ICDF(18816), AOM_ICDF(22250), AOM_ICDF(28783), AOM_ICDF(32768), 0 },
...@@ -2939,7 +2939,7 @@ static const aom_cdf_prob ...@@ -2939,7 +2939,7 @@ static const aom_cdf_prob
#endif #endif
#if CONFIG_EXT_TX #if CONFIG_EXT_TX
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
...@@ -6667,7 +6667,6 @@ void av1_setup_past_independence(AV1_COMMON *cm) { ...@@ -6667,7 +6667,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" {
......
...@@ -120,7 +120,7 @@ tran_low_t av1_dequant_coeff_nuq(int v, int q, const tran_low_t *dq) { ...@@ -120,7 +120,7 @@ tran_low_t av1_dequant_coeff_nuq(int v, int q, const tran_low_t *dq) {
} }
#endif // CONFIG_NEW_QUANT #endif // CONFIG_NEW_QUANT
static const int16_t dc_qlookup[QINDEX_RANGE] = { const int16_t dc_qlookup[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,
...@@ -194,7 +194,7 @@ static const int16_t dc_qlookup_12[QINDEX_RANGE] = { ...@@ -194,7 +194,7 @@ static const int16_t dc_qlookup_12[QINDEX_RANGE] = {
}; };
#endif #endif
static const int16_t ac_qlookup[QINDEX_RANGE] = { const int16_t ac_qlookup[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,
}; };
...@@ -1812,7 +1812,7 @@ DECLARE_ALIGNED(16, static const int16_t, default_scan_64x64[4096]) = { ...@@ -1812,7 +1812,7 @@ DECLARE_ALIGNED(16, static const int16_t, default_scan_64x64[4096]) = {
// 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