Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
72e0f783
Commit
72e0f783
authored
Sep 13, 2017
by
Nathan E. Egge
Committed by
Nathan Egge
Sep 15, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable daala_dct64 if tx64x64 is not enabled.
Change-Id: Ib19d9431124b2416abe4a217138ec8bdb029f73c
parent
71b0513b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
build/cmake/aom_configure.cmake
build/cmake/aom_configure.cmake
+3
-4
configure
configure
+3
-2
No files found.
build/cmake/aom_configure.cmake
View file @
72e0f783
...
...
@@ -164,10 +164,9 @@ if (CONFIG_VAR_TX_NO_TX_MODE AND NOT CONFIG_VAR_TX)
change_config_and_warn
(
CONFIG_VAR_TX 1 CONFIG_VAR_TX_NO_TX_MODE
)
endif
()
if
(
CONFIG_DAALA_DCT64
)
if
(
NOT CONFIG_TX64X64
)
change_config_and_warn
(
CONFIG_TX64X64 1 CONFIG_DAALA_DCT64
)
endif
()
if
(
CONFIG_DAALA_DCT64 AND NOT CONFIG_TX64X64
)
message
(
WARNING
"--- CONFIG_DAALA_DCT64 requires CONFIG_TX64X64, disabling."
)
set
(
CONFIG_DAALA_DCT64 0
)
endif
()
if
(
CONFIG_DAALA_DCT4 OR CONFIG_DAALA_DCT8 OR CONFIG_DAALA_DCT16 OR
...
...
configure
View file @
72e0f783
...
...
@@ -568,8 +568,9 @@ post_process_cmdline() {
log_echo
"rawbits requires not ans, so disabling rawbits"
disable_feature rawbits
fi
if
enabled daala_dct64
;
then
enable_feature tx64x64
if
enabled daala_dct64
&&
!
enabled tx64x64
;
then
log_echo
"daala_dct64 requires tx64x64, so disabling daala_dct64"
disable_feature daala_dct64
fi
if
enabled daala_dct4
||
enabled daala_dct8
||
...
...
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