Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
dfcb5c88
Commit
dfcb5c88
authored
Oct 21, 2017
by
Debargha Mukherjee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove CONFIG_CB4X4 config options
Change-Id: I6902e642021a8473f1603d7751c63edca702b199
parent
8a42dd72
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
8 deletions
+2
-8
build/cmake/aom_config_defaults.cmake
build/cmake/aom_config_defaults.cmake
+0
-1
build/cmake/aom_configure.cmake
build/cmake/aom_configure.cmake
+2
-3
configure
configure
+0
-4
No files found.
build/cmake/aom_config_defaults.cmake
View file @
dfcb5c88
...
...
@@ -110,7 +110,6 @@ set(CONFIG_AMVR 0 CACHE NUMBER "AV1 experiment flag.")
set
(
CONFIG_ANS 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_AOM_QM 1 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_BGSPRITE 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_CB4X4 1 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_CDEF 1 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_CDEF_SINGLEPASS 0 CACHE NUMBER
"AV1 experiment flag."
)
set
(
CONFIG_CFL 0 CACHE NUMBER
"AV1 experiment flag."
)
...
...
build/cmake/aom_configure.cmake
View file @
dfcb5c88
...
...
@@ -56,10 +56,9 @@ if (NOT ENABLE_ADOPTED_EXPERIMENTS)
unset
(
var_helpstring
)
get_property
(
var_helpstring CACHE
${
var
}
PROPERTY HELPSTRING
)
if
(
"
${
var_helpstring
}
"
STREQUAL
"AV1 experiment flag."
)
if
(
"
${
var
}
"
MATCHES
"CONFIG_CB4X4\|CONFIG_TXMG"
)
# CB4X4 is required and can not be disabled.
if
(
"
${
var
}
"
MATCHES
"CONFIG_TXMG"
)
# TXMG is required for configure compatibility.
else
()
else
()
set
(
${
var
}
0
)
endif
()
endif
()
...
...
configure
View file @
dfcb5c88
...
...
@@ -292,7 +292,6 @@ EXPERIMENT_LIST="
daala_tx16
daala_tx32
daala_tx64
cb4x4
chroma_sub8x8
frame_size
ext_delta_q
...
...
@@ -502,8 +501,6 @@ post_process_cmdline() {
enabled
${
c
}
&&
enable_feature
${
c
##*_
}
s
done
enable_feature cb4x4
# Enable adopted experiments by default
soft_enable adopted_experiments
if
enabled adopted_experiments
;
then
...
...
@@ -560,7 +557,6 @@ post_process_cmdline() {
enabled ctx1d
&&
soft_enable ext_tx
enabled compound_round
&&
soft_enable convolve_round
enabled intra_edge
&&
enable_feature ext_intra
enabled chroma_sub8x8
&&
enable_feature cb4x4
enabled ncobmc_adapt_weight
&&
enable_feature motion_var
enabled bgsprite
&&
enable_feature global_motion
enabled ext_comp_refs
&&
enable_feature one_sided_compound
...
...
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