Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
3e509e3f
Commit
3e509e3f
authored
Jan 29, 2018
by
Hui Su
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove the EXT_TX_16X16_SET macro
Change-Id: I4d80b78ff99806876db3a2ee601f04a783cd77b7
parent
7c71cc03
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
144 deletions
+9
-144
av1/common/blockd.h
av1/common/blockd.h
+7
-32
av1/common/entropymode.c
av1/common/entropymode.c
+0
-85
av1/common/entropymode.h
av1/common/entropymode.h
+0
-13
av1/encoder/rd.c
av1/encoder/rd.c
+2
-14
No files found.
av1/common/blockd.h
View file @
3e509e3f
...
...
@@ -767,49 +767,24 @@ static INLINE TxSetType get_ext_tx_set_type(TX_SIZE tx_size, BLOCK_SIZE bs,
return
is_inter
?
EXT_TX_SET_DCT_IDTX
:
EXT_TX_SET_DTT4_IDTX
;
if
(
tx_size_sqr_up
==
TX_32X32
)
return
is_inter
?
EXT_TX_SET_DCT_IDTX
:
EXT_TX_SET_DCTONLY
;
if
(
is_inter
)
return
(
tx_size_sqr
==
TX_16X16
?
#if EXT_TX_16X16_SET == 0
EXT_TX_SET_ALL16_16X16
#elif EXT_TX_16X16_SET == 1
EXT_TX_SET_DTT9_IDTX_1DDCT
#else
EXT_TX_SET_DTT9_IDTX
#endif // EXT_TX_16X16_SET
if
(
is_inter
)
{
return
(
tx_size_sqr
==
TX_16X16
?
EXT_TX_SET_DTT9_IDTX_1DDCT
:
EXT_TX_SET_ALL16
);
else
return
(
tx_size_sqr
==
TX_16X16
?
#if EXT_TX_16X16_SET == 0
EXT_TX_SET_DTT4_IDTX_1DDCT_16X16
#else
EXT_TX_SET_DTT4_IDTX
#endif // EXT_TX_16X16_SET
}
else
{
return
(
tx_size_sqr
==
TX_16X16
?
EXT_TX_SET_DTT4_IDTX
:
EXT_TX_SET_DTT4_IDTX_1DDCT
);
}
}
// Maps tx set types to the indices.
static
const
int
ext_tx_set_index
[
2
][
EXT_TX_SET_TYPES
]
=
{
{
// Intra
0
,
-
1
,
#if EXT_TX_16X16_SET == 0
-
1
,
2
,
#else
2
,
-
1
,
#endif // EXT_TX_16X16_SET
1
,
-
1
,
-
1
,
-
1
,
-
1
,
0
,
-
1
,
2
,
-
1
,
1
,
-
1
,
-
1
,
-
1
,
-
1
,
},
{
// Inter
0
,
3
,
-
1
,
-
1
,
-
1
,
#if EXT_TX_16X16_SET == 0
-
1
,
-
1
,
2
,
#elif EXT_TX_16X16_SET == 1
-
1
,
2
,
-
1
,
#else
2
,
-
1
,
-
1
,
#endif // EXT_TX_16X16_SET
1
,
0
,
3
,
-
1
,
-
1
,
-
1
,
-
1
,
2
,
-
1
,
1
,
},
};
...
...
av1/common/entropymode.c
View file @
3e509e3f
...
...
@@ -1889,70 +1889,6 @@ static const aom_cdf_prob default_intra_ext_tx_cdf
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
},
},
#if EXT_TX_16X16_SET == 0
{
{
{
AOM_CDF7
(
1024
,
28800
,
29048
,
29296
,
30164
,
31466
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1152
,
25852
,
26284
,
26717
,
28230
,
30499
)
},
{
AOM_CDF7
(
1024
,
2016
,
3938
,
5860
,
29404
,
31086
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
},
{
{
AOM_CDF7
(
1024
,
28800
,
29048
,
29296
,
30164
,
31466
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1152
,
25852
,
26284
,
26717
,
28230
,
30499
)
},
{
AOM_CDF7
(
1024
,
2016
,
3938
,
5860
,
29404
,
31086
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
},
{
{
AOM_CDF7
(
1024
,
28800
,
29048
,
29296
,
30164
,
31466
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1152
,
25852
,
26284
,
26717
,
28230
,
30499
)
},
{
AOM_CDF7
(
1024
,
2016
,
3938
,
5860
,
29404
,
31086
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
},
{
{
AOM_CDF7
(
1024
,
28800
,
29048
,
29296
,
30164
,
31466
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1152
,
25852
,
26284
,
26717
,
28230
,
30499
)
},
{
AOM_CDF7
(
1024
,
2016
,
3938
,
5860
,
29404
,
31086
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
27118
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
4109
,
5900
,
7691
,
15528
,
27380
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
{
AOM_CDF7
(
1280
,
5216
,
6938
,
8660
,
10167
,
15817
)
},
},
},
#else
{
{
{
AOM_CDF5
(
1024
,
28800
,
29792
,
31280
)
},
...
...
@@ -2015,7 +1951,6 @@ static const aom_cdf_prob default_intra_ext_tx_cdf
{
AOM_CDF5
(
1280
,
5216
,
6938
,
13396
)
},
},
},
#endif // EXT_TX_16X16_SET == 0
};
static
const
aom_cdf_prob
default_inter_ext_tx_cdf
[
EXT_TX_SETS_INTER
][
EXT_TX_SIZES
][
CDF_SIZE
(
...
...
@@ -2029,16 +1964,6 @@ static const aom_cdf_prob
21733
,
24241
,
26749
,
28253
,
29758
,
31263
)
},
{
AOM_CDF16
(
1280
,
1453
,
1626
,
2277
,
2929
,
3580
,
4232
,
16717
,
19225
,
21733
,
24241
,
26749
,
28253
,
29758
,
31263
)
}
},
#if EXT_TX_16X16_SET == 0
{
{
AOM_CDF16
(
1280
,
1453
,
1626
,
2277
,
2929
,
3580
,
4232
,
16717
,
19225
,
21733
,
24241
,
26749
,
28253
,
29758
,
31263
)
},
{
AOM_CDF16
(
1280
,
1453
,
1626
,
2277
,
2929
,
3580
,
4232
,
16717
,
19225
,
21733
,
24241
,
26749
,
28253
,
29758
,
31263
)
},
{
AOM_CDF16
(
1280
,
1453
,
1626
,
2277
,
2929
,
3580
,
4232
,
16717
,
19225
,
21733
,
24241
,
26749
,
28253
,
29758
,
31263
)
},
{
AOM_CDF16
(
1280
,
1453
,
1626
,
2277
,
2929
,
3580
,
4232
,
16717
,
19225
,
21733
,
24241
,
26749
,
28253
,
29758
,
31263
)
}
},
#elif EXT_TX_16X16_SET == 1
{
{
AOM_CDF12
(
1280
,
3125
,
4970
,
17132
,
19575
,
22018
,
24461
,
26904
,
28370
,
29836
,
31302
)
},
{
AOM_CDF12
(
1280
,
3125
,
4970
,
17132
,
19575
,
22018
,
24461
,
26904
,
28370
,
...
...
@@ -2047,16 +1972,6 @@ static const aom_cdf_prob
29836
,
31302
)
},
{
AOM_CDF12
(
1280
,
3125
,
4970
,
17132
,
19575
,
22018
,
24461
,
26904
,
28370
,
29836
,
31302
)
}
},
#else
{
{
AOM_CDF10
(
1280
,
3125
,
4970
,
17132
,
19575
,
22018
,
24461
,
26904
,
28370
)
},
{
AOM_CDF10
(
1280
,
3125
,
4970
,
17132
,
19575
,
22018
,
24461
,
26904
,
28370
)
},
{
AOM_CDF10
(
1280
,
3125
,
4970
,
17132
,
19575
,
22018
,
24461
,
26904
,
28370
)
},
{
AOM_CDF10
(
1280
,
3125
,
4970
,
17132
,
19575
,
22018
,
24461
,
26904
,
28370
)
}
},
#endif // EXT_TX_16X16_SET
{
{
AOM_CDF2
(
1536
)
},
{
AOM_CDF2
(
1536
)
},
{
AOM_CDF2
(
1536
)
},
...
...
av1/common/entropymode.h
View file @
3e509e3f
...
...
@@ -317,19 +317,6 @@ extern const aom_cdf_prob default_kf_y_mode_cdf[KF_MODE_CONTEXTS]
[
KF_MODE_CONTEXTS
]
[
CDF_SIZE
(
INTRA_MODES
)];
// Decides what set to assign to 16x16 transforms.
// Set 0:
// Inter: All 16 txfms
// Intra: Discrete Trig transforms w/0 flip (4) + Identity (1) +
// 1D Hor/vert DCT (2)
// Set 1:
// Inter: Discrete Trig transforms w/ flip (9) + Identity (1) +
// 1D Hor/Ver DCT (2)
// Intra: Discrete Trig transforms w/0 flip (4) + Identity (1)
// Set 2:
// Inter: Discrete Trig transforms w/ flip (9) + Identity (1)
// Intra: Discrete Trig transforms w/0 flip (4) + Identity (1)
#define EXT_TX_16X16_SET 1
static
const
int
av1_ext_tx_ind
[
EXT_TX_SET_TYPES
][
TX_TYPES
]
=
{
{
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
0
,
...
...
av1/encoder/rd.c
View file @
3e509e3f
...
...
@@ -83,23 +83,11 @@ static const int av1_ext_tx_set_idx_to_type[2][AOMMAX(EXT_TX_SETS_INTRA,
EXT_TX_SETS_INTER
)]
=
{
{
// Intra
EXT_TX_SET_DCTONLY
,
EXT_TX_SET_DTT4_IDTX_1DDCT
,
#if EXT_TX_16X16_SET == 0
EXT_TX_SET_DTT4_IDTX_1DDCT_16X16
,
#else
EXT_TX_SET_DTT4_IDTX
,
#endif // EXT_TX_16X16_SET
EXT_TX_SET_DCTONLY
,
EXT_TX_SET_DTT4_IDTX_1DDCT
,
EXT_TX_SET_DTT4_IDTX
,
},
{
// Inter
EXT_TX_SET_DCTONLY
,
EXT_TX_SET_ALL16
,
#if EXT_TX_16X16_SET == 0
EXT_TX_SET_ALL16_16X16
,
#elif EXT_TX_16X16_SET == 1
EXT_TX_SET_DTT9_IDTX_1DDCT
,
#else
EXT_TX_SET_DTT9_IDTX
,
#endif // EXT_TX_16X16_SET
EXT_TX_SET_DCTONLY
,
EXT_TX_SET_ALL16
,
EXT_TX_SET_DTT9_IDTX_1DDCT
,
EXT_TX_SET_DCT_IDTX
,
},
};
...
...
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