From e994934e244f8d31dd3238293e6d7f4fed23f5a1 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Mon, 20 Feb 2023 17:16:23 +0100 Subject: [PATCH] Link ffmpeg with dav1d to enable AV1 support. The patched meson.build for dav1d just changes the include_directories from 'include/dav1d' to 'include' and, while we're at it, removes the pkg_config stuff to avoid a deprecation warning. AV1 decoding is pretty broken in upstream ffms2, so point the wrap to a fork that has some hack patches for it. BestSource works fine out of the box, though. --- .gitignore | 1 + subprojects/dav1d.wrap | 8 + subprojects/ffms2.wrap | 2 +- .../packagefiles/dav1d/src/meson.build | 366 ++++++++++++++++++ subprojects/packagefiles/ffmpeg/meson.build | 3 +- subprojects/packagefiles/ffms2/meson.build | 12 +- 6 files changed, 385 insertions(+), 7 deletions(-) create mode 100644 subprojects/dav1d.wrap create mode 100644 subprojects/packagefiles/dav1d/src/meson.build diff --git a/.gitignore b/.gitignore index a2d7c9b86..f762ae280 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ tools/repack-thes-dict.dSYM build*/ subprojects/boost*/ subprojects/cairo* +subprojects/dav1d subprojects/ffmpeg subprojects/ffms2 subprojects/fontconfig* diff --git a/subprojects/dav1d.wrap b/subprojects/dav1d.wrap new file mode 100644 index 000000000..49251c463 --- /dev/null +++ b/subprojects/dav1d.wrap @@ -0,0 +1,8 @@ +[wrap-git] +directory = dav1d +url = https://github.com/videolan/dav1d.git +revision = 0.9.2 +patch_directory = dav1d + +[provide] +dav1d = dav1d_dep diff --git a/subprojects/ffms2.wrap b/subprojects/ffms2.wrap index b5e945a06..b65e713c8 100644 --- a/subprojects/ffms2.wrap +++ b/subprojects/ffms2.wrap @@ -1,5 +1,5 @@ [wrap-git] -url = https://github.com/FFMS/ffms2.git +url = https://github.com/arch1t3cht/ffms2.git revision = head patch_directory = ffms2 diff --git a/subprojects/packagefiles/dav1d/src/meson.build b/subprojects/packagefiles/dav1d/src/meson.build new file mode 100644 index 000000000..6886c775f --- /dev/null +++ b/subprojects/packagefiles/dav1d/src/meson.build @@ -0,0 +1,366 @@ +# Copyright © 2018-2019, VideoLAN and dav1d authors +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, this +# list of conditions and the following disclaimer. +# +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the documentation +# and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# +# Build definition for the dav1d library +# + +# libdav1d source files +libdav1d_sources = files( + 'cdf.c', + 'cpu.c', + 'data.c', + 'decode.c', + 'dequant_tables.c', + 'getbits.c', + 'intra_edge.c', + 'itx_1d.c', + 'lf_mask.c', + 'log.c', + 'mem.c', + 'msac.c', + 'obu.c', + 'picture.c', + 'qm.c', + 'ref.c', + 'refmvs.c', + 'scan.c', + 'tables.c', + 'warpmv.c', + 'wedge.c', +) + +# libdav1d bitdepth source files +# These files are compiled for each bitdepth with +# `BITDEPTH` defined to the currently built bitdepth. +libdav1d_tmpl_sources = files( + 'cdef_apply_tmpl.c', + 'cdef_tmpl.c', + 'fg_apply_tmpl.c', + 'film_grain_tmpl.c', + 'ipred_prepare_tmpl.c', + 'ipred_tmpl.c', + 'itx_tmpl.c', + 'lf_apply_tmpl.c', + 'loopfilter_tmpl.c', + 'looprestoration_tmpl.c', + 'lr_apply_tmpl.c', + 'mc_tmpl.c', + 'recon_tmpl.c', +) + +libdav1d_arch_tmpl_sources = [] + +libdav1d_bitdepth_objs = [] + +# libdav1d entrypoint source files +# These source files contain library entry points and are +# built with the stack-realign flag set, where necessary. +libdav1d_entrypoints_sources = files( + 'lib.c', + 'thread_task.c' +) + +# ASM specific sources +libdav1d_asm_objs = [] +# Arch-specific flags +arch_flags = [] +if is_asm_enabled + if (host_machine.cpu_family() == 'aarch64' or + host_machine.cpu_family().startswith('arm')) + + libdav1d_sources += files( + 'arm/cpu.c', + 'arm/refmvs_init.c', + ) + libdav1d_tmpl_sources += files( + 'arm/cdef_init_tmpl.c', + 'arm/film_grain_init_tmpl.c', + 'arm/ipred_init_tmpl.c', + 'arm/itx_init_tmpl.c', + 'arm/loopfilter_init_tmpl.c', + 'arm/looprestoration_init_tmpl.c', + 'arm/mc_init_tmpl.c', + ) + if (host_machine.cpu_family() == 'aarch64' or + host_machine.cpu() == 'arm64') + libdav1d_sources_asm = files( + # itx.S is used for both 8 and 16 bpc. + 'arm/64/itx.S', + 'arm/64/looprestoration_common.S', + 'arm/64/msac.S', + 'arm/64/refmvs.S', + ) + + if dav1d_bitdepths.contains('8') + libdav1d_sources_asm += files( + 'arm/64/cdef.S', + 'arm/64/film_grain.S', + 'arm/64/ipred.S', + 'arm/64/loopfilter.S', + 'arm/64/looprestoration.S', + 'arm/64/mc.S', + ) + endif + + if dav1d_bitdepths.contains('16') + libdav1d_sources_asm += files( + 'arm/64/cdef16.S', + 'arm/64/film_grain16.S', + 'arm/64/ipred16.S', + 'arm/64/itx16.S', + 'arm/64/loopfilter16.S', + 'arm/64/looprestoration16.S', + 'arm/64/mc16.S', + ) + endif + elif host_machine.cpu_family().startswith('arm') + libdav1d_sources_asm = files( + # itx.S is used for both 8 and 16 bpc. + 'arm/32/itx.S', + 'arm/32/looprestoration_common.S', + 'arm/32/msac.S', + 'arm/32/refmvs.S', + ) + + if dav1d_bitdepths.contains('8') + libdav1d_sources_asm += files( + 'arm/32/cdef.S', + 'arm/32/film_grain.S', + 'arm/32/ipred.S', + 'arm/32/loopfilter.S', + 'arm/32/looprestoration.S', + 'arm/32/mc.S', + ) + endif + + if dav1d_bitdepths.contains('16') + libdav1d_sources_asm += files( + 'arm/32/cdef16.S', + 'arm/32/film_grain16.S', + 'arm/32/ipred16.S', + 'arm/32/itx16.S', + 'arm/32/loopfilter16.S', + 'arm/32/looprestoration16.S', + 'arm/32/mc16.S', + ) + endif + endif + + if use_gaspp + libdav1d_asm_objs = gaspp_gen.process(libdav1d_sources_asm) + else + libdav1d_sources += libdav1d_sources_asm + endif + elif host_machine.cpu_family().startswith('x86') + + libdav1d_sources += files( + 'x86/cpu.c', + 'x86/msac_init.c', + 'x86/refmvs_init.c', + ) + + libdav1d_tmpl_sources += files( + 'x86/cdef_init_tmpl.c', + 'x86/film_grain_init_tmpl.c', + 'x86/ipred_init_tmpl.c', + 'x86/itx_init_tmpl.c', + 'x86/loopfilter_init_tmpl.c', + 'x86/looprestoration_init_tmpl.c', + 'x86/mc_init_tmpl.c', + ) + + # NASM source files + libdav1d_sources_asm = files( + 'x86/cpuid.asm', + 'x86/msac.asm', + 'x86/refmvs.asm', + 'x86/cdef_avx2.asm', + 'x86/itx_avx2.asm', + 'x86/looprestoration_avx2.asm', + 'x86/cdef_sse.asm', + 'x86/itx_sse.asm', + ) + + if dav1d_bitdepths.contains('8') + libdav1d_sources_asm += files( + 'x86/cdef_avx512.asm', + 'x86/mc_avx512.asm', + 'x86/mc_avx2.asm', + 'x86/film_grain_avx2.asm', + 'x86/ipred_avx2.asm', + 'x86/loopfilter_avx2.asm', + 'x86/film_grain_sse.asm', + 'x86/ipred_sse.asm', + 'x86/loopfilter_sse.asm', + 'x86/looprestoration_sse.asm', + 'x86/mc_sse.asm', + ) + endif + + if dav1d_bitdepths.contains('16') + libdav1d_sources_asm += files( + 'x86/cdef16_avx2.asm', + 'x86/film_grain16_avx2.asm', + 'x86/ipred16_avx2.asm', + 'x86/itx16_avx2.asm', + 'x86/loopfilter16_avx2.asm', + 'x86/looprestoration16_avx2.asm', + 'x86/mc16_avx2.asm', + 'x86/cdef16_sse.asm', + 'x86/film_grain16_sse.asm', + 'x86/ipred16_sse.asm', + 'x86/itx16_sse.asm', + 'x86/loopfilter16_sse.asm', + 'x86/looprestoration16_sse.asm', + 'x86/mc16_sse.asm', + ) + endif + + # Compile the ASM sources with NASM + libdav1d_asm_objs = nasm_gen.process(libdav1d_sources_asm) + elif host_machine.cpu() == 'ppc64le' + arch_flags = ['-maltivec', '-mvsx'] + libdav1d_sources += files( + 'ppc/cpu.c', + ) + libdav1d_arch_tmpl_sources += files( + 'ppc/cdef_init_tmpl.c', + 'ppc/looprestoration_init_tmpl.c', + ) + endif +endif + + + +api_export_flags = [] + +# +# Windows .rc file and API export flags +# + +if host_machine.system() == 'windows' and get_option('default_library') != 'static' + rc_file = configure_file( + input : 'dav1d.rc.in', + output : 'dav1d.rc', + configuration : rc_data + ) + + libdav1d_rc_obj = winmod.compile_resources(rc_file) + + api_export_flags = ['-DDAV1D_BUILDING_DLL'] +else + libdav1d_rc_obj = [] +endif + + + + +# +# Library definitions +# + +# Helper library for dav1d entrypoints +libdav1d_entrypoints_objs = static_library('dav1d_entrypoint', + libdav1d_entrypoints_sources, + rev_target, config_h_target, + + include_directories : dav1d_inc_dirs, + dependencies: [stdatomic_dependencies], + c_args : [stackalign_flag, stackrealign_flag, api_export_flags], + install : false, + build_by_default : false, +).extract_all_objects(recursive: true) + +# Helper library for each bitdepth +libdav1d_bitdepth_objs = [] +foreach bitdepth : dav1d_bitdepths + libdav1d_bitdepth_objs += static_library( + 'dav1d_bitdepth_@0@'.format(bitdepth), + libdav1d_tmpl_sources, config_h_target, + include_directories: dav1d_inc_dirs, + dependencies : [stdatomic_dependencies], + c_args : ['-DBITDEPTH=@0@'.format(bitdepth)] + stackalign_flag, + install : false, + build_by_default : false, + ).extract_all_objects(recursive: true) +endforeach + +# Helper library for each bitdepth and architecture-specific flags +foreach bitdepth : dav1d_bitdepths + libdav1d_bitdepth_objs += static_library( + 'dav1d_arch_bitdepth_@0@'.format(bitdepth), + libdav1d_arch_tmpl_sources, config_h_target, + include_directories: dav1d_inc_dirs, + dependencies : [stdatomic_dependencies], + c_args : ['-DBITDEPTH=@0@'.format(bitdepth)] + stackalign_flag + arch_flags, + install : false, + build_by_default : false, + ).extract_all_objects(recursive: true) +endforeach + +# The final dav1d library +if host_machine.system() == 'windows' + dav1d_soversion = '' +else + dav1d_soversion = dav1d_api_version_major +endif + +libdav1d = library('dav1d', + libdav1d_sources, + libdav1d_asm_objs, + libdav1d_rc_obj, + + objects : [ + libdav1d_bitdepth_objs, + libdav1d_entrypoints_objs + ], + + include_directories : dav1d_inc_dirs, + dependencies : [ + stdatomic_dependencies, + thread_dependency, + thread_compat_dep, + libdl_dependency, + ], + c_args : [stackalign_flag, api_export_flags], + version : dav1d_soname_version, + soversion : dav1d_soversion, + install : true, +) + +dav1d_dep = declare_dependency(link_with: libdav1d, + include_directories : include_directories('../include') +) + +# +# Generate pkg-config .pc file +# +# pkg_mod = import('pkgconfig') +# pkg_mod.generate(libraries: libdav1d, +# version: meson.project_version(), +# name: 'libdav1d', +# filebase: 'dav1d', +# description: 'AV1 decoding library' +# ) diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index b960f4ce4..1db65b5a8 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -1750,7 +1750,8 @@ foreach check : all_checks else dep = dependency(pkg_name, required : req) endif - found = dep.found() and dep.type_name() != 'internal' + found = dep.found() + skipchecks = dep.type_name() == 'internal' # same here, trust the meson dependency extra_deps += dep endif endif diff --git a/subprojects/packagefiles/ffms2/meson.build b/subprojects/packagefiles/ffms2/meson.build index 8c6a07851..91d649f68 100644 --- a/subprojects/packagefiles/ffms2/meson.build +++ b/subprojects/packagefiles/ffms2/meson.build @@ -2,12 +2,14 @@ project('ffms2', 'cpp', version: '2.40.0') deps = [] +opts = ['tests=disabled', 'libdav1d=enabled'] + deps += dependency('zlib') -deps += dependency('libavformat', default_options: ['tests=disabled']) -deps += dependency('libavcodec', default_options: ['tests=disabled']) -deps += dependency('libswscale', default_options: ['tests=disabled']) -deps += dependency('libavutil', default_options: ['tests=disabled']) -deps += dependency('libswresample', default_options: ['tests=disabled']) +deps += dependency('libavformat', default_options: opts) +deps += dependency('libavcodec', default_options: opts) +deps += dependency('libswscale', default_options: opts) +deps += dependency('libavutil', default_options: opts) +deps += dependency('libswresample', default_options: opts) args = ['-D_FILE_OFFSET_BITNS=64', '-DFFMS_EXPORTS', '-D__STDC_CONSTANT_MACROS'] usage_args = []