summaryrefslogtreecommitdiff
path: root/chromium/third_party/dav1d/libdav1d/src/meson.build
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/third_party/dav1d/libdav1d/src/meson.build
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-c30a6232df03e1efbd9f3b226777b07e087a1122.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/dav1d/libdav1d/src/meson.build')
-rw-r--r--chromium/third_party/dav1d/libdav1d/src/meson.build15
1 files changed, 7 insertions, 8 deletions
diff --git a/chromium/third_party/dav1d/libdav1d/src/meson.build b/chromium/third_party/dav1d/libdav1d/src/meson.build
index 1a7114a870e..fd8ad0269c1 100644
--- a/chromium/third_party/dav1d/libdav1d/src/meson.build
+++ b/chromium/third_party/dav1d/libdav1d/src/meson.build
@@ -102,6 +102,8 @@ if is_asm_enabled
)
if host_machine.cpu_family() == 'aarch64'
libdav1d_sources += files(
+ # itx.S is used for both 8 and 16 bpc.
+ 'arm/64/itx.S',
'arm/64/looprestoration_common.S',
'arm/64/msac.S',
)
@@ -110,7 +112,6 @@ if is_asm_enabled
libdav1d_sources += files(
'arm/64/cdef.S',
'arm/64/ipred.S',
- 'arm/64/itx.S',
'arm/64/loopfilter.S',
'arm/64/looprestoration.S',
'arm/64/mc.S',
@@ -121,6 +122,7 @@ if is_asm_enabled
libdav1d_sources += files(
'arm/64/cdef16.S',
'arm/64/ipred16.S',
+ 'arm/64/itx16.S',
'arm/64/loopfilter16.S',
'arm/64/looprestoration16.S',
'arm/64/mc16.S',
@@ -128,12 +130,14 @@ if is_asm_enabled
endif
elif host_machine.cpu_family().startswith('arm')
libdav1d_sources += files(
+ 'arm/32/msac.S',
)
if dav1d_bitdepths.contains('8')
libdav1d_sources += files(
'arm/32/cdef.S',
'arm/32/ipred.S',
+ 'arm/32/itx.S',
'arm/32/loopfilter.S',
'arm/32/looprestoration.S',
'arm/32/mc.S',
@@ -149,14 +153,9 @@ if is_asm_enabled
libdav1d_sources += files(
'x86/cpu.c',
+ 'x86/msac_init.c',
)
- if host_machine.cpu_family() == 'x86_64'
- libdav1d_sources += files(
- 'x86/msac_init.c',
- )
- endif
-
libdav1d_tmpl_sources += files(
'x86/cdef_init_tmpl.c',
'x86/film_grain_init_tmpl.c',
@@ -189,7 +188,7 @@ if is_asm_enabled
'x86/itx_ssse3.asm',
'x86/loopfilter_ssse3.asm',
'x86/looprestoration_ssse3.asm',
- 'x86/mc_ssse3.asm',
+ 'x86/mc_sse.asm',
)
endif