From 457a3cc1a04e45e31370d9083186436b0d12ab1d Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 27 Jan 2025 21:56:39 -0500 Subject: Refactor threaded waits - Move seek to handler thread. - Cleanup and comment some stuff. Signed-off-by: Andrew Opalach --- subprojects/packagefiles/ffmpeg/meson.build | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'subprojects') diff --git a/subprojects/packagefiles/ffmpeg/meson.build b/subprojects/packagefiles/ffmpeg/meson.build index 435ee90..33dbd30 100644 --- a/subprojects/packagefiles/ffmpeg/meson.build +++ b/subprojects/packagefiles/ffmpeg/meson.build @@ -9,6 +9,7 @@ is_minsize = get_option('buildtype') == 'minsize' is_windows = host_machine.system() == 'windows' is_msvc = compiler.get_id() == 'msvc' or compiler.get_id() == 'clang-cl' is_mingw = is_windows and not is_msvc +is_android = host_machine.system() == 'android' extra_options = [] @@ -35,6 +36,8 @@ if is_windows extra_options += ['--toolchain=msvc'] endif extra_options += ['--enable-w32threads'] +elif is_android + extra_options += ['--target-os=android'] endif #'--extra-ldflags=-Lbuild/subprojects/libalabaster -l:libalabaster.a', @@ -52,7 +55,6 @@ demuxers = 'flac,mp3,aac,wav,image2,mjpeg,image2pipe,image_jpeg_pipe,gif,matrosk parsers = 'aac,opus,mjpeg,jpeg2000,gif,h264,hevc,av1,vp9,vp8' #parsers += ',mpegaudio,mpegvideo,dvd_nav' -#extra_options += ['--enable-zlib', '--enable-libsoxr'] extra_options += ['--enable-zlib'] decoders += ',png,apng' demuxers += ',image_png_pipe' @@ -61,18 +63,24 @@ parsers += ',png' bsfs = 'extract_extradata,mp3_header_decompress' hwaccels = '' -if is_windows +if is_windows and get_option('sink-use-vulkan') extra_options += ['--enable-vulkan'] hwaccels += 'h264_vulkan,hevc_vulkan,av1_vulkan' #extra_options += ['--enable-d3d11va', '--enable-d3d12va', '--enable-dxva2'] #hwaccels += 'h264_dxva2,' +elif is_android + extra_options += ['--enable-jni', '--enable-mediacodec'] + decoders += ',h264_mediacodec,hevc_mediacodec,av1_mediacodec' else - extra_options += ['--disable-vulkan'] + extra_options += ['--disable-vulkan', '--disable-vdpau', '--disable-vaapi'] endif -extra_options += ['--disable-vdpau', '--disable-vaapi'] protocols = 'file,cache' +if not is_android + extra_options += ['--enable-libsoxr'] +endif + ext_proj = import('unstable-external_project') proj = ext_proj.add_project('configure', -- cgit v1.2.3-101-g0448