corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1559213 Allow to use system av1 libs instead of bundled r=glandium,media-playback-reviewers,aosmond,stransky,alwu

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D34921
This commit is contained in:
Landry Breuil
2025-01-13 11:34:33 +00:00
parent c1270191c5
commit 5b7226bb03
25 changed files with 93 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/external/moz.build vendored
View File

@@ -39,7 +39,7 @@ if CONFIG["MOZ_VORBIS"]:
if not CONFIG["MOZ_SYSTEM_LIBVPX"]:
external_dirs += ["media/libvpx"]
if CONFIG["MOZ_AV1"]:
if not CONFIG["MOZ_SYSTEM_AV1"]:
external_dirs += ["media/libaom"]
external_dirs += ["media/libdav1d"]

5
config/system-headers.mozbuild
View File

@@ -1307,6 +1307,11 @@ if CONFIG["MOZ_ENABLE_LIBPROXY"]:
"proxy.h",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
system_headers += [
"dav1d/dav1d.h",
]
if CONFIG["MOZ_SYSTEM_ICU"]:
system_headers += [
"unicode/calendar.h",

3
dom/media/ipc/moz.build
View File

@@ -98,6 +98,9 @@ LOCAL_INCLUDES += [
"/xpcom/base",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
# Add libFuzzer configuration directives

3
dom/media/moz.build
View File

@@ -402,6 +402,9 @@ if CONFIG["ENABLE_TESTS"]:
"test/rdd_process_xpcom",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]

3
dom/media/mp4/moz.build
View File

@@ -36,6 +36,9 @@ UNIFIED_SOURCES += [
FINAL_LIBRARY = "xul"
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
# Suppress warnings for now.
CXXFLAGS += [
"-Wno-sign-compare",

3
dom/media/platforms/agnostic/eme/moz.build
View File

@@ -17,6 +17,9 @@ UNIFIED_SOURCES += [
"SamplesWaitingForKey.cpp",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul"

3
dom/media/platforms/agnostic/gmp/moz.build
View File

@@ -22,6 +22,9 @@ UNIFIED_SOURCES += [
"GMPVideoEncoder.cpp",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
# GMPVideoEncodedFrameImpl.h needs IPC
include("/ipc/chromium/chromium-config.mozbuild")

3
dom/media/platforms/ffmpeg/ffmpeg57/moz.build
View File

@@ -30,6 +30,9 @@ if CONFIG['CC_TYPE'] == 'gcc':
'-Wno-attributes',
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += [

3
dom/media/platforms/ffmpeg/ffmpeg58/moz.build
View File

@@ -38,6 +38,9 @@ if CONFIG['MOZ_ENABLE_VAAPI'] or CONFIG['MOZ_ENABLE_V4L2']:
USE_LIBS += ['mozva']
DEFINES['MOZ_USE_HWDECODE'] = 1
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += [

3
dom/media/platforms/ffmpeg/ffmpeg59/moz.build
View File

@@ -38,6 +38,9 @@ if CONFIG["MOZ_ENABLE_VAAPI"] or CONFIG["MOZ_ENABLE_V4L2"]:
USE_LIBS += ["mozva"]
DEFINES["MOZ_USE_HWDECODE"] = 1
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += [

3
dom/media/platforms/ffmpeg/ffmpeg60/moz.build
View File

@@ -38,6 +38,9 @@ if CONFIG["MOZ_ENABLE_VAAPI"] or CONFIG["MOZ_ENABLE_V4L2"]:
USE_LIBS += ["mozva"]
DEFINES["MOZ_USE_HWDECODE"] = 1
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += [

3
dom/media/platforms/ffmpeg/ffmpeg61/moz.build
View File

@@ -38,6 +38,9 @@ if CONFIG["MOZ_ENABLE_VAAPI"] or CONFIG["MOZ_ENABLE_V4L2"]:
USE_LIBS += ["mozva"]
DEFINES["MOZ_USE_HWDECODE"] = 1
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += [

3
dom/media/platforms/ffmpeg/libav53/moz.build
View File

@@ -26,6 +26,9 @@ if CONFIG['CC_TYPE'] == 'clang':
'-Wno-unknown-attributes',
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += [

3
dom/media/platforms/ffmpeg/libav54/moz.build
View File

@@ -26,6 +26,9 @@ if CONFIG['CC_TYPE'] == 'clang':
'-Wno-unknown-attributes',
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
LOCAL_INCLUDES += [

3
dom/media/platforms/ffmpeg/libav55/moz.build
View File

@@ -30,6 +30,9 @@ if CONFIG['CC_TYPE'] == 'gcc':
'-Wno-attributes',
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = 'xul'

3
dom/media/platforms/ffmpeg/moz.build
View File

@@ -28,6 +28,9 @@ LOCAL_INCLUDES += [
"/media/libyuv/libyuv/include",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
LOCAL_INCLUDES += [
"/gfx/thebes",

3
dom/media/platforms/moz.build
View File

@@ -71,6 +71,9 @@ if CONFIG["MOZ_AV1"]:
"agnostic/AOMDecoder.cpp",
"agnostic/DAV1DDecoder.cpp",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBDAV1D_CFLAGS"]
if CONFIG["MOZ_OMX"]:
EXPORTS += [

3
dom/media/systemservices/moz.build
View File

@@ -107,6 +107,9 @@ IPDL_SOURCES += [
"PMediaSystemResourceManager.ipdl",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul"

3
dom/media/webaudio/moz.build
View File

@@ -145,6 +145,9 @@ if CONFIG["INTEL_ARCHITECTURE"]:
CONFIG["SSE4_2_FLAGS"] + CONFIG["FMA_FLAGS"]
)
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul"

3
dom/media/webm/moz.build
View File

@@ -22,6 +22,9 @@ UNIFIED_SOURCES += [
CXXFLAGS += CONFIG["MOZ_LIBVPX_CFLAGS"]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
FINAL_LIBRARY = "xul"
# Add libFuzzer configuration directives

3
image/decoders/moz.build
View File

@@ -36,6 +36,9 @@ if CONFIG["MOZ_AV1"]:
"nsAVIFDecoder.cpp",
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
if CONFIG["MOZ_JXL"]:
UNIFIED_SOURCES += [
"nsJXLDecoder.cpp",

3
image/moz.build
View File

@@ -139,5 +139,8 @@ LOCAL_INCLUDES += [
LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]
if CONFIG["MOZ_SYSTEM_AV1"]:
CXXFLAGS += CONFIG["MOZ_SYSTEM_LIBAOM_CFLAGS"]
# Add libFuzzer configuration directives
include("/tools/fuzzing/libfuzzer-config.mozbuild")

14
media/ffvpx/libavcodec/moz.build
View File

@@ -119,10 +119,16 @@ if not CONFIG['MOZ_FFVPX_AUDIOONLY']:
'vp9recon.c',
'vpx_rac.c',
]
USE_LIBS += [
'dav1d',
'media_libdav1d_asm',
]
if CONFIG["MOZ_SYSTEM_AV1"]:
CFLAGS += CONFIG['MOZ_SYSTEM_LIBDAV1D_CFLAGS']
OS_LIBS += CONFIG['MOZ_SYSTEM_LIBDAV1D_LIBS']
else:
USE_LIBS += [
'dav1d',
'media_libdav1d_asm',
]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
LOCAL_INCLUDES += ['/media/mozva']
SOURCES += [

4
toolkit/library/moz.build
View File

@@ -304,6 +304,10 @@ if CONFIG["MOZ_SYSTEM_LIBEVENT"]:
if CONFIG["MOZ_SYSTEM_LIBVPX"]:
OS_LIBS += CONFIG["MOZ_LIBVPX_LIBS"]
if CONFIG["MOZ_SYSTEM_AV1"]:
OS_LIBS += CONFIG["MOZ_SYSTEM_LIBAOM_LIBS"]
OS_LIBS += CONFIG["MOZ_SYSTEM_LIBDAV1D_LIBS"]
if not CONFIG["MOZ_TREE_PIXMAN"]:
OS_LIBS += CONFIG["MOZ_PIXMAN_LIBS"]

19
toolkit/moz.configure
View File

@@ -847,15 +847,21 @@ def av1(value):
return True
@depends(target, when=av1 & compile_environment)
def dav1d_asm(target):
if target.cpu in ("arm", "aarch64", "x86", "x86_64"):
option("--with-system-av1", help="Use system av1 (located with pkg-config)")
pkg_check_modules("MOZ_SYSTEM_LIBAOM", "aom >= 3.0.0", when="--with-system-av1")
pkg_check_modules("MOZ_SYSTEM_LIBDAV1D", "dav1d >= 1.2.1", when="--with-system-av1")
@depends(target, "--with-system-av1", when=av1 & compile_environment)
def dav1d_asm(target, system_av1):
if not system_av1 and target.cpu in ("arm", "aarch64", "x86", "x86_64"):
return True
@depends(target, when=av1 & compile_environment)
def dav1d_nasm(target):
if target.cpu in ("x86", "x86_64"):
@depends(target, "--with-system-av1", when=av1 & compile_environment)
def dav1d_nasm(target, system_av1):
if not system_av1 and target.cpu in ("x86", "x86_64"):
return namespace(version="2.14", what="AV1")
@@ -863,6 +869,7 @@ set_config("MOZ_DAV1D_ASM", dav1d_asm)
set_define("MOZ_DAV1D_ASM", dav1d_asm)
set_config("MOZ_AV1", av1)
set_define("MOZ_AV1", av1)
set_config("MOZ_SYSTEM_AV1", True, when="--with-system-av1")
# JXL Image Codec Support
# ==============================================================