Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
42b903f6
Commit
42b903f6
authored
May 16, 2017
by
hui su
Committed by
Hui Su
May 19, 2017
Browse files
Filter-intra: make filter tap arrays static
Change-Id: Id6078c5e3c82bc382af7b576133beb9026797a9b
parent
f288951c
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/common/reconintra.c
View file @
42b903f6
...
...
@@ -1207,7 +1207,7 @@ static void highbd_dr_predictor(uint16_t *dst, ptrdiff_t stride, int bs,
#if CONFIG_FILTER_INTRA
#if USE_3TAP_INTRA_FILTER
int
av1_
filter_intra_taps_3
[
TX_SIZES
][
FILTER_INTRA_MODES
][
3
]
=
{
static
int
filter_intra_taps_3
[
TX_SIZES
][
FILTER_INTRA_MODES
][
3
]
=
{
#if CONFIG_CB4X4
{
{
697
,
836
,
-
509
},
...
...
@@ -1286,7 +1286,7 @@ int av1_filter_intra_taps_3[TX_SIZES][FILTER_INTRA_MODES][3] = {
#endif // CONFIG_TX64X64
};
#else
int
av1_
filter_intra_taps_4
[
TX_SIZES
][
FILTER_INTRA_MODES
][
4
]
=
{
static
int
filter_intra_taps_4
[
TX_SIZES
][
FILTER_INTRA_MODES
][
4
]
=
{
#if CONFIG_CB4X4
{
{
735
,
881
,
-
537
,
-
54
},
...
...
@@ -1391,9 +1391,9 @@ static void filter_intra_predictors_3tap(uint8_t *dst, ptrdiff_t stride, int bs,
int
buffer
[
33
][
33
];
#endif // CONFIG_TX64X64
const
TX_SIZE
tx_size
=
get_txsize_from_blocklen
(
bs
);
const
int
c0
=
av1_
filter_intra_taps_3
[
tx_size
][
mode
][
0
];
const
int
c1
=
av1_
filter_intra_taps_3
[
tx_size
][
mode
][
1
];
const
int
c2
=
av1_
filter_intra_taps_3
[
tx_size
][
mode
][
2
];
const
int
c0
=
filter_intra_taps_3
[
tx_size
][
mode
][
0
];
const
int
c1
=
filter_intra_taps_3
[
tx_size
][
mode
][
1
];
const
int
c2
=
filter_intra_taps_3
[
tx_size
][
mode
][
2
];
k
=
0
;
mean
=
0
;
...
...
@@ -1433,10 +1433,10 @@ static void filter_intra_predictors_4tap(uint8_t *dst, ptrdiff_t stride, int bs,
int
buffer
[
33
][
65
];
#endif // CONFIG_TX64X64
const
TX_SIZE
tx_size
=
get_txsize_from_blocklen
(
bs
);
const
int
c0
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
0
];
const
int
c1
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
1
];
const
int
c2
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
2
];
const
int
c3
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
3
];
const
int
c0
=
filter_intra_taps_4
[
tx_size
][
mode
][
0
];
const
int
c1
=
filter_intra_taps_4
[
tx_size
][
mode
][
1
];
const
int
c2
=
filter_intra_taps_4
[
tx_size
][
mode
][
2
];
const
int
c3
=
filter_intra_taps_4
[
tx_size
][
mode
][
3
];
k
=
0
;
mean
=
0
;
...
...
@@ -1607,9 +1607,9 @@ static void highbd_filter_intra_predictors_3tap(uint16_t *dst, ptrdiff_t stride,
int
preds
[
33
][
33
];
#endif // CONFIG_TX64X64
const
TX_SIZE
tx_size
=
get_txsize_from_blocklen
(
bs
);
const
int
c0
=
av1_
filter_intra_taps_3
[
tx_size
][
mode
][
0
];
const
int
c1
=
av1_
filter_intra_taps_3
[
tx_size
][
mode
][
1
];
const
int
c2
=
av1_
filter_intra_taps_3
[
tx_size
][
mode
][
2
];
const
int
c0
=
filter_intra_taps_3
[
tx_size
][
mode
][
0
];
const
int
c1
=
filter_intra_taps_3
[
tx_size
][
mode
][
1
];
const
int
c2
=
filter_intra_taps_3
[
tx_size
][
mode
][
2
];
k
=
0
;
mean
=
0
;
...
...
@@ -1651,10 +1651,10 @@ static void highbd_filter_intra_predictors_4tap(uint16_t *dst, ptrdiff_t stride,
int
preds
[
33
][
65
];
#endif // CONFIG_TX64X64
const
TX_SIZE
tx_size
=
get_txsize_from_blocklen
(
bs
);
const
int
c0
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
0
];
const
int
c1
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
1
];
const
int
c2
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
2
];
const
int
c3
=
av1_
filter_intra_taps_4
[
tx_size
][
mode
][
3
];
const
int
c0
=
filter_intra_taps_4
[
tx_size
][
mode
][
0
];
const
int
c1
=
filter_intra_taps_4
[
tx_size
][
mode
][
1
];
const
int
c2
=
filter_intra_taps_4
[
tx_size
][
mode
][
2
];
const
int
c3
=
filter_intra_taps_4
[
tx_size
][
mode
][
3
];
k
=
0
;
mean
=
0
;
...
...
av1/common/reconintra.h
View file @
42b903f6
...
...
@@ -57,7 +57,6 @@ static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
#if CONFIG_FILTER_INTRA
#define FILTER_INTRA_PREC_BITS 10
extern
int
av1_filter_intra_taps_4
[
TX_SIZES
][
FILTER_INTRA_MODES
][
4
];
#endif // CONFIG_FILTER_INTRA
#if CONFIG_EXT_INTRA
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment