Skip to content
Snippets Groups Projects
Commit 7e42505a authored by James Zern's avatar James Zern Committed by Automerger Merge Worker
Browse files

Merge changes I4be84675,Ia8527232 into main am: db4f1772 

Original change: https://android-review.googlesource.com/c/platform/external/libaom/+/3096432



Change-Id: I23393404c689f8d8a90097e9e5527529b8501c3b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8e7b5a92 db4f1772
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Android.bp
+ 54
− 52
View file @ 7e42505a
......@@ -714,13 +714,63 @@ license {
],
}
cc_defaults {
name: "libaom_defaults",
cflags: [
"-O3",
],
min_sdk_version: "29",
apex_available: [
"//apex_available:platform",
"com.android.media.swcodec",
],
arch: {
arm64: {
local_include_dirs: [
"config/",
"config/arm64/",
],
},
// configured to require the neon unit
arm: {
local_include_dirs: [
"config/",
"config/arm/",
],
},
x86_64: {
local_include_dirs: [
"config/",
"config/x86_64/",
],
},
x86: {
local_include_dirs: [
"config/",
"config/x86/",
],
},
riscv64: {
local_include_dirs: [
"config/",
"config/riscv64/",
],
},
},
}
cc_library_static {
name: "libaom",
defaults: ["libaom_defaults"],
host_supported: true,
vendor_available: true,
cflags: [
"-O3",
],
export_include_dirs: [
".",
......@@ -734,10 +784,6 @@ cc_library_static {
arch: {
arm64: {
local_include_dirs: [
"config/",
"config/arm64/",
],
srcs: aom_av1_common_sources +
aom_av1_decoder_sources +
aom_dsp_common_sources +
......@@ -758,10 +804,6 @@ cc_library_static {
// configured to require the neon unit
arm: {
local_include_dirs: [
"config/",
"config/arm/",
],
srcs: aom_av1_common_sources +
aom_av1_decoder_sources +
aom_dsp_common_sources +
......@@ -781,10 +823,6 @@ cc_library_static {
},
x86_64: {
local_include_dirs: [
"config/",
"config/x86_64/",
],
cflags: [
"-mssse3",
],
......@@ -885,47 +923,11 @@ cc_library_static {
cc_fuzz {
name: "av1_dec_fuzzer",
defaults: ["libaom_defaults"],
host_supported: true,
srcs: [
"examples/av1_dec_fuzzer.cc",
],
arch: {
arm: {
local_include_dirs: [
"config/",
"config/arm/",
],
},
arm64: {
local_include_dirs: [
"config/",
"config/arm64/",
],
},
x86: {
local_include_dirs: [
"config/",
"config/x86/",
],
},
x86_64: {
local_include_dirs: [
"config/",
"config/x86_64/",
],
},
riscv64: {
local_include_dirs: [
"config/",
"config/riscv64/",
],
},
},
static_libs: [
"libaom",
],
......
Android.bp.in
+ 54
− 52
View file @ 7e42505a
......@@ -35,13 +35,63 @@ license {
],
}
cc_defaults {
name: "libaom_defaults",
cflags: [
"-O3",
],
min_sdk_version: "29",
apex_available: [
"//apex_available:platform",
"com.android.media.swcodec",
],
arch: {
arm64: {
local_include_dirs: [
"config/",
"config/arm64/",
],
},
// configured to require the neon unit
arm: {
local_include_dirs: [
"config/",
"config/arm/",
],
},
x86_64: {
local_include_dirs: [
"config/",
"config/x86_64/",
],
},
x86: {
local_include_dirs: [
"config/",
"config/x86/",
],
},
riscv64: {
local_include_dirs: [
"config/",
"config/riscv64/",
],
},
},
}
cc_library_static {
name: "libaom",
defaults: [ "libaom_defaults" ],
host_supported: true,
vendor_available: true,
cflags: [
"-O3",
],
export_include_dirs: [
".",
......@@ -55,10 +105,6 @@ cc_library_static {
arch: {
arm64: {
local_include_dirs: [
"config/",
"config/arm64/",
],
srcs: aom_av1_common_sources +
aom_av1_decoder_sources +
aom_dsp_common_sources +
......@@ -79,10 +125,6 @@ cc_library_static {
// configured to require the neon unit
arm: {
local_include_dirs: [
"config/",
"config/arm/",
],
srcs: aom_av1_common_sources +
aom_av1_decoder_sources +
aom_dsp_common_sources +
......@@ -102,10 +144,6 @@ cc_library_static {
},
x86_64: {
local_include_dirs: [
"config/",
"config/x86_64/",
],
cflags: [
"-mssse3",
],
......@@ -206,47 +244,11 @@ cc_library_static {
cc_fuzz {
name: "av1_dec_fuzzer",
defaults: [ "libaom_defaults" ],
host_supported: true,
srcs: [
"examples/av1_dec_fuzzer.cc",
],
arch: {
arm: {
local_include_dirs: [
"config/",
"config/arm/",
],
},
arm64: {
local_include_dirs: [
"config/",
"config/arm64/",
],
},
x86: {
local_include_dirs: [
"config/",
"config/x86/",
],
},
x86_64: {
local_include_dirs: [
"config/",
"config/x86_64/",
],
},
riscv64: {
local_include_dirs: [
"config/",
"config/riscv64/",
],
},
},
static_libs: [
"libaom",
],
......
config/arm64/config/aom_config.asm
+ 1
− 1
View file @ 7e42505a
......@@ -58,7 +58,7 @@ CONFIG_RD_COMMAND equ 0
CONFIG_RD_DEBUG equ 0
CONFIG_REALTIME_ONLY equ 0
CONFIG_RT_ML_PARTITIONING equ 0
CONFIG_RUNTIME_CPU_DETECT equ 0
CONFIG_RUNTIME_CPU_DETECT equ 1
CONFIG_SALIENCY_MAP equ 0
CONFIG_SHARED equ 0
CONFIG_SIZE_LIMIT equ 1
......
config/arm64/config/aom_config.c
+ 1
− 1
View file @ 7e42505a
......@@ -9,5 +9,5 @@
* PATENTS file, you can obtain it at www.aomedia.org/license/patent.
*/
#include "aom/aom_codec.h"
static const char* const cfg = "cmake ../libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../libaom/build/cmake/toolchains/arm64-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_AV1_HIGHBITDEPTH=1 -DCONFIG_RUNTIME_CPU_DETECT=0 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DENABLE_ARM_CRC32=0 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 -DENABLE_SSE4_1=0";
static const char* const cfg = "cmake ../libaom -G \"Unix Makefiles\" -DCMAKE_TOOLCHAIN_FILE=\"../libaom/build/cmake/toolchains/arm64-linux-gcc.cmake\" -DCONFIG_AV1_ENCODER=1 -DCONFIG_AV1_HIGHBITDEPTH=1 -DCONFIG_RUNTIME_CPU_DETECT=1 -DCONFIG_MAX_DECODE_PROFILE=0 -DCONFIG_NORMAL_TILE_MODE=1 -DCONFIG_SIZE_LIMIT=1 -DDECODE_HEIGHT_LIMIT=16384 -DDECODE_WIDTH_LIMIT=16384 -DENABLE_ARM_CRC32=0 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0 -DENABLE_SSE4_1=0";
const char *aom_codec_build_config(void) {return cfg;}
config/arm64/config/aom_config.h
+ 1
− 1
View file @ 7e42505a
......@@ -60,7 +60,7 @@
#define CONFIG_RD_DEBUG 0
#define CONFIG_REALTIME_ONLY 0
#define CONFIG_RT_ML_PARTITIONING 0
#define CONFIG_RUNTIME_CPU_DETECT 0
#define CONFIG_RUNTIME_CPU_DETECT 1
#define CONFIG_SALIENCY_MAP 0
#define CONFIG_SHARED 0
#define CONFIG_SIZE_LIMIT 1
......
generate_config.sh
+ 1
− 0
View file @ 7e42505a
......@@ -124,6 +124,7 @@ gen_config_files arm "${toolchain}/armv7-linux-gcc.cmake ${all_platforms}"
reset_dirs arm64
gen_config_files arm64 "${toolchain}/arm64-linux-gcc.cmake ${all_platforms} \
-DCONFIG_RUNTIME_CPU_DETECT=1 \
-DENABLE_ARM_CRC32=0 -DENABLE_NEON_DOTPROD=0 -DENABLE_NEON_I8MM=0"
reset_dirs riscv64
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment