Remove the --http-uncompressed-video flag.

[nageru] / meson.build

diff --git a/meson.build b/meson.build
index 0e1555e730e56b987263844526e2510119d58469..a7ea6ae2eb770ebc4cb266eb3d00cc79da495868 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -27,6 +27,7 @@ qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtension
 sdl2_imagedep = dependency('SDL2_image', required: false)
 sdl2dep = dependency('sdl2', required: false)
 srtdep = dependency('srt', required: false)
+svtav1dep = dependency('SvtAv1Enc', required: false, version: '>=1.0.0')
 sqlite3dep = dependency('sqlite3')
 threaddep = dependency('threads')
 vadrmdep = dependency('libva-drm')
@@ -63,6 +64,9 @@ if srtdep.found()
        # or gnutls libsrt, so we cannot check license compatibility here.
        add_project_arguments('-DHAVE_SRT=1', language: 'cpp')
 endif
+if svtav1dep.found()
+       add_project_arguments('-DHAVE_AV1=1', language: 'cpp')
+endif
 
 top_include = include_directories('.')
 
@@ -73,7 +77,7 @@ subdir('shared')
 nageru_srcs = []
 nageru_deps = [shareddep, qt5deps, libjpegdep, movitdep, protobufdep,
        vax11dep, vadrmdep, x11dep, libavformatdep, libswresampledep, libavcodecdep, libavutildep,
-       libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
+       libswscaledep, libusbdep, luajitdep, dldep, x264dep, svtav1dep, alsadep, zitaresamplerdep,
        qcustomplotdep, threaddep, eigendep, srtdep, libdrmdep]
 nageru_include_dirs = [include_directories('nageru')]
 nageru_link_with = []
@@ -128,12 +132,12 @@ if have_cef
        endif
 
        cef_libs = ['libEGL.so', 'libGLESv2.so', 'snapshot_blob.bin', 'v8_context_snapshot.bin']
-       cef_resources = ['cef.pak', 'cef_100_percent.pak', 'cef_200_percent.pak', 'cef_extensions.pak', 'devtools_resources.pak']
+       cef_resources = ['resources.pak', 'chrome_100_percent.pak', 'chrome_200_percent.pak']
        if not get_option('cef_no_icudtl')
                cef_resources += ['icudtl.dat']
        endif
        if cef_build_type != 'system'
-               cef_libs += ['libcef.so']
+               cef_libs += ['libcef.so', 'libEGL.so', 'libGLESv2.so', 'libvk_swiftshader.so', 'libvulkan.so.1', 'vk_swiftshader_icd.json']
        endif
 
        # Symlink the files into the build directory, so that running nageru without ninja install works.
@@ -212,10 +216,14 @@ nageru_srcs += ['nageru/chroma_subsampler.cpp', 'nageru/v210_converter.cpp', 'na
        'nageru/timecode_renderer.cpp', 'nageru/tweaked_inputs.cpp', 'nageru/mjpeg_encoder.cpp']
 
 # Streaming and encoding objects (largely the set that is shared between Nageru and Kaeru).
-stream_srcs = ['nageru/quicksync_encoder.cpp', 'nageru/x264_encoder.cpp', 'nageru/x264_dynamic.cpp', 'nageru/x264_speed_control.cpp', 'nageru/video_encoder.cpp',
+stream_srcs = ['nageru/quicksync_encoder.cpp', 'nageru/video_encoder.cpp',
+       'nageru/x264_encoder.cpp', 'nageru/x264_dynamic.cpp', 'nageru/x264_speed_control.cpp',
        'nageru/audio_encoder.cpp', 'nageru/ffmpeg_util.cpp', 'nageru/ffmpeg_capture.cpp',
        'nageru/print_latency.cpp', 'nageru/basic_stats.cpp', 'nageru/ref_counted_frame.cpp',
        'nageru/v4l_output.cpp']
+if svtav1dep.found()
+       stream_srcs += 'nageru/av1_encoder.cpp'
+endif
 stream = static_library('stream', stream_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 nageru_link_with += stream