Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
f621a4fe
Commit
f621a4fe
authored
Dec 08, 2017
by
Nathan E. Egge
Committed by
Nathan Egge
Dec 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
daala_tx: Add CONFIG_DAALA_TX_DST32 build flag.
Change-Id: Iaf0dd93c4612968db258e78dda0e69cbb152047a
parent
e40617aa
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
2 deletions
+23
-2
av1/common/blockd.h
av1/common/blockd.h
+2
-2
av1/common/daala_tx.c
av1/common/daala_tx.c
+6
-0
build/cmake/aom_config_defaults.cmake
build/cmake/aom_config_defaults.cmake
+1
-0
build/cmake/aom_experiment_deps.cmake
build/cmake/aom_experiment_deps.cmake
+8
-0
configure
configure
+6
-0
No files found.
av1/common/blockd.h
View file @
f621a4fe
...
...
@@ -846,7 +846,7 @@ static INLINE TxSetType get_ext_tx_set_type(TX_SIZE tx_size, BLOCK_SIZE bs,
#endif // USE_TXTYPE_SEARCH_FOR_SUB8X8_IN_CB4X4
if
(
use_reduced_set
)
return
is_inter
?
EXT_TX_SET_DCT_IDTX
:
EXT_TX_SET_DTT4_IDTX
;
#if CONFIG_DAALA_TX32
#if CONFIG_DAALA_TX
_DST
32
if
(
tx_size_sqr_up
>
TX_32X32
)
return
is_inter
?
EXT_TX_SET_DCT_IDTX
:
EXT_TX_SET_DCTONLY
;
if
(
is_inter
)
...
...
@@ -1082,7 +1082,7 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
return
get_default_tx_type
(
plane_type
,
xd
,
block_raster_idx
,
tx_size
);
#endif // FIXED_TX_TYPE
#if CONFIG_DAALA_TX32
#if CONFIG_DAALA_TX
_DST
32
if
(
xd
->
lossless
[
mbmi
->
segment_id
]
||
txsize_sqr_map
[
tx_size
]
>
TX_32X32
)
#else
if
(
xd
->
lossless
[
mbmi
->
segment_id
]
||
txsize_sqr_map
[
tx_size
]
>
TX_32X32
||
...
...
av1/common/daala_tx.c
View file @
f621a4fe
...
...
@@ -6584,6 +6584,9 @@ void od_bin_fdst32(od_coeff y[32], const od_coeff *x, int xstride) {
od_coeff
tt
;
od_coeff
tu
;
od_coeff
tv
;
#if !CONFIG_DAALA_TX_DST32
assert
(
0
&&
"od_bin_fdst32() called when !CONFIG_DAALA_TX_DST32"
);
#endif
t0
=
x
[
0
*
xstride
];
t1
=
x
[
1
*
xstride
];
t2
=
x
[
2
*
xstride
];
...
...
@@ -6685,6 +6688,9 @@ void od_bin_idst32(od_coeff *x, int xstride, const od_coeff y[32]) {
od_coeff
tt
;
od_coeff
tu
;
od_coeff
tv
;
#if !CONFIG_DAALA_TX_DST32
assert
(
0
&&
"od_bin_idst32() called when !CONFIG_DAALA_TX_DST32"
);
#endif
t0
=
y
[
0
];
tg
=
y
[
1
];
t8
=
y
[
2
];
...
...
build/cmake/aom_config_defaults.cmake
View file @
f621a4fe
...
...
@@ -120,6 +120,7 @@ set(CONFIG_DAALA_TX32 0 CACHE NUMBER "AV1 experiment flag.")
set
(
CONFIG_DAALA_TX4 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_DAALA_TX64 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_DAALA_TX8 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_DAALA_TX_DST32 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_DAALA_TX_DST8 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_DCT_ONLY 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_DEBLOCK_13TAP 1 CACHE NUMBER
"AV1 experiment flag."
)
...
...
build/cmake/aom_experiment_deps.cmake
View file @
f621a4fe
...
...
@@ -51,6 +51,7 @@ macro (fix_experiment_configs)
set
(
CONFIG_DAALA_TX16 1
)
set
(
CONFIG_DAALA_TX32 1
)
set
(
CONFIG_DAALA_TX64 1
)
set
(
CONFIG_DAALA_TX_DST32 1
)
endif
()
if
(
CONFIG_DAALA_TX_DST8
)
...
...
@@ -60,6 +61,13 @@ macro (fix_experiment_configs)
endif
()
endif
()
if
(
CONFIG_DAALA_TX_DST32
)
if
(
NOT CONFIG_DAALA_TX32
)
set
(
CONFIG_DAALA_TX_DST32 0
)
message
(
"--- DAALA_TX_DST32 requires DAALA_TX32: disabled DAALA_TX_DST32"
)
endif
()
endif
()
if
(
CONFIG_DAALA_TX64
)
if
(
NOT CONFIG_TX64X64
)
set
(
CONFIG_DAALA_TX64 0
)
...
...
configure
View file @
f621a4fe
...
...
@@ -280,6 +280,7 @@ EXPERIMENT_LIST="
daala_tx32
daala_tx64
daala_tx_dst8
daala_tx_dst32
frame_size
ext_delta_q
adapt_scan
...
...
@@ -560,6 +561,7 @@ post_process_cmdline() {
enable_feature daala_tx16
enable_feature daala_tx32
enable_feature daala_tx64
!
disabled daala_tx_dst32
&&
enable_feature daala_tx_dst32
fi
if
enabled daala_tx64
&&
!
enabled tx64x64
;
then
log_echo
"daala_tx64 requires tx64x64, so disabling daala_tx64"
...
...
@@ -569,6 +571,10 @@ post_process_cmdline() {
log_echo
"daala_tx_dst8 requires daala_tx8, so disabling daala_tx_dst8"
disable_feature daala_tx_dst8
fi
if
enabled daala_tx_dst32
&&
!
enabled daala_tx32
;
then
log_echo
"daala_tx_dst32 requires daala_tx32, so disabling daala_tx_dst32"
disable_feature daala_tx_dst32
fi
if
enabled daala_tx4
||
enabled daala_tx8
||
enabled daala_tx16
||
enabled daala_tx32
||
enabled daala_tx64
;
then
disable_feature txmg
...
...
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