From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Sat, 1 Dec 2018 23:11:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'futatabi/master'
X-Git-Tag: 1.8.0~76
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9b7d691b4cc5db7dbfc18c82e86c1207fcac4722;p=nageru

Merge remote-tracking branch 'futatabi/master'

This merges Nageru and Futatabi, since they are fairly closely related
and also share a fair amount of code.
---

9b7d691b4cc5db7dbfc18c82e86c1207fcac4722
diff --cc .gitignore
index 2416a67,51f813a..c0b5588
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,10 +1,2 @@@
 -*.mp4
 -*.png
 -*.flo
 -*.pgm
 -*.ppm
 -*.sw*
 -.ycm_extra_conf.py
  obj/
 -frames/
 -futatabi.db
++.ycm_extra_conf.py
diff --cc futatabi/meson.build
index 0000000,a9c95b4..fdcc446
mode 000000,100644..100644
--- a/futatabi/meson.build
+++ b/futatabi/meson.build
@@@ -1,0 -1,70 +1,63 @@@
+ qt5 = import('qt5')
+ protoc = find_program('protoc')
+ 
+ epoxydep = dependency('epoxy')
+ libavcodecdep = dependency('libavcodec')
+ libavformatdep = dependency('libavformat')
+ libavutildep = dependency('libavutil')
+ libjpegdep = dependency('libjpeg')
+ libmicrohttpddep = dependency('libmicrohttpd')
+ libswscaledep = dependency('libswscale')
+ movitdep = dependency('movit')
+ protobufdep = dependency('protobuf')
+ qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'PrintSupport'])
+ sdl2_imagedep = dependency('SDL2_image')
+ sdl2dep = dependency('sdl2')
+ sqlite3dep = dependency('sqlite3')
+ vadrmdep = dependency('libva-drm')
+ vax11dep = dependency('libva-x11')
+ x11dep = dependency('x11')
+ 
 -# Add the right MOVIT_SHADER_DIR definition.
 -r = run_command('pkg-config', '--variable=shaderdir', 'movit')
 -if r.returncode() != 0
 -  error('Movit pkg-config installation is broken.')
 -endif
 -add_global_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
 -
+ # Protobuf compilation.
+ gen = generator(protoc, \
+   output    : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
+   arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
+ proto_generated = gen.process('state.proto', 'frame.proto')
+ 
+ # Preprocess Qt as needed.
+ moc_files = qt5.preprocess(
+   moc_headers: ['mainwindow.h', 'jpeg_frame_view.h', 'clip_list.h'],
+   ui_files: ['mainwindow.ui'],
+   dependencies: qt5deps)
+ 
+ # Flow objects.
+ srcs = ['flow.cpp', 'gpu_timers.cpp']
+ 
+ # All the other files.
+ srcs += ['ffmpeg_raii.cpp', 'main.cpp', 'player.cpp', 'httpd.cpp', 'mux.cpp', 'metacube2.cpp', 'video_stream.cpp', 'context.cpp', 'chroma_subsampler.cpp']
+ srcs += ['vaapi_jpeg_decoder.cpp', 'memcpy_interleaved.cpp', 'db.cpp', 'disk_space_estimator.cpp', 'ycbcr_converter.cpp', 'flags.cpp']
+ srcs += ['mainwindow.cpp', 'jpeg_frame_view.cpp', 'clip_list.cpp', 'frame_on_disk.cpp']
+ srcs += moc_files
+ srcs += proto_generated
+ 
+ # Shaders needed at runtime.
+ shaders = ['chroma_subsample.vert', 'densify.vert', 'equations.vert', 'hole_fill.vert', 'motion_search.vert', 'sor.vert', 'splat.vert', 'vs.vert']
+ shaders += ['add_base_flow.frag', 'blend.frag', 'chroma_subsample.frag', 'densify.frag', 'derivatives.frag', 'diffusivity.frag',
+   'equations.frag', 'gray.frag', 'hole_blend.frag', 'hole_fill.frag', 'motion_search.frag', 'prewarp.frag', 'resize_flow.frag',
+   'sobel.frag', 'sor.frag', 'splat.frag']
+ 
+ foreach shader : shaders
+   run_command('ln', '-s', join_paths(meson.current_source_dir(), shader), meson.current_build_dir())
+ endforeach
+ 
+ bin2h = executable('bin2h', 'bin2h.cpp')
+ bin2h_gen = generator(bin2h, \
+   output    : ['@PLAINNAME@.cpp'],
+   arguments : ['@INPUT@', '@PLAINNAME@', '@OUTPUT@'])
+ shader_srcs = bin2h_gen.process(shaders)
+ srcs += shader_srcs
+ 
+ executable('futatabi', srcs, dependencies: [qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep, sqlite3dep, vax11dep, vadrmdep, x11dep, libavformatdep, libavcodecdep, libavutildep, libswscaledep])
+ executable('flow', 'flow_main.cpp', 'flow.cpp', 'gpu_timers.cpp', shader_srcs, dependencies: [epoxydep, sdl2dep, sdl2_imagedep])
+ executable('eval', 'eval.cpp', 'util.cpp')
+ executable('vis', 'vis.cpp', 'util.cpp')
diff --cc meson.build
index 15184b8,6c13d8c..8357005
--- a/meson.build
+++ b/meson.build
@@@ -1,3 -1,2 +1,11 @@@
 -project('futatabi', 'cpp')
 +project('nageru', 'cpp', default_options: ['buildtype=debugoptimized'])
- subdir('nageru')
 +
++# Add the right MOVIT_SHADER_DIR definition.
++r = run_command('pkg-config', '--variable=shaderdir', 'movit')
++if r.returncode() != 0
++	error('Movit pkg-config installation is broken.')
++endif
++add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
++
++subdir('nageru')
+ subdir('futatabi')
diff --cc nageru/meson.build
index bc93a28,0000000..70d5ab7
mode 100644,000000..100644
--- a/nageru/meson.build
+++ b/nageru/meson.build
@@@ -1,251 -1,0 +1,244 @@@
 +qt5 = import('qt5')
 +protoc = find_program('protoc')
 +cxx = meson.get_compiler('cpp')
 +
 +# Use lld if we can; it links a lot faster than ld.bfd or gold.
 +nageru_link_args = []
 +code = '''#include <stdio.h>
 +int main() { printf("Hello, world!\n"); return 0; }
 +'''
 +if cxx.links(code, args: '-fuse-ld=lld', name: 'check for LLD')
 +	nageru_link_args += '-fuse-ld=lld'
 +endif
 +
 +embedded_bmusb = get_option('embedded_bmusb')
 +
 +alsadep = dependency('alsa')
 +bmusbdep = dependency('bmusb', required: not embedded_bmusb)
 +dldep = cxx.find_library('dl')
 +epoxydep = dependency('epoxy')
 +libavcodecdep = dependency('libavcodec')
 +libavformatdep = dependency('libavformat')
 +libavresampledep = dependency('libavresample')
 +libavutildep = dependency('libavutil')
 +libjpegdep = dependency('libjpeg')
 +libmicrohttpddep = dependency('libmicrohttpd')
 +libswscaledep = dependency('libswscale')
 +libusbdep = dependency('libusb-1.0')
 +luajitdep = dependency('luajit')
 +movitdep = dependency('movit')
 +protobufdep = dependency('protobuf')
 +qcustomplotdep = cxx.find_library('qcustomplot')
 +qt5deps = dependency('qt5', modules: ['Core', 'Gui', 'Widgets', 'OpenGLExtensions', 'OpenGL', 'PrintSupport'])
 +threaddep = dependency('threads')
 +vadrmdep = dependency('libva-drm')
 +vax11dep = dependency('libva-x11')
 +x11dep = dependency('x11')
 +x264dep = dependency('x264')
 +zitaresamplerdep = cxx.find_library('zita-resampler')
 +
 +srcs = []
 +nageru_deps = [qt5deps, libjpegdep, movitdep, libmicrohttpddep, protobufdep,
 +	vax11dep, vadrmdep, x11dep, libavformatdep, libavresampledep, libavcodecdep, libavutildep,
 +	libswscaledep, libusbdep, luajitdep, dldep, x264dep, alsadep, zitaresamplerdep,
 +	qcustomplotdep, threaddep]
 +nageru_include_dirs = []
 +nageru_link_with = []
 +nageru_build_rpath = ''
 +nageru_install_rpath = ''
 +
 +kaeru_link_with = []
 +kaeru_extra_deps = []
 +
 +# DeckLink has these issues, and we include it from various places.
 +if cxx.has_argument('-Wno-non-virtual-dtor')
 +	add_project_arguments('-Wno-non-virtual-dtor', language: 'cpp')
 +endif
 +
 +# FFmpeg has a lot of deprecated APIs whose replacements are not available
 +# in Debian stable, so we suppress these warnings.
 +if cxx.has_argument('-Wno-deprecated-declarations')
 +	add_project_arguments('-Wno-deprecated-declarations', language: 'cpp')
 +endif
 +
- # Add the right MOVIT_SHADER_DIR definition.
- r = run_command('pkg-config', '--variable=shaderdir', 'movit')
- if r.returncode() != 0
- 	error('Movit pkg-config installation is broken.')
- endif
- add_project_arguments('-DMOVIT_SHADER_DIR="' + r.stdout().strip() + '"', language: 'cpp')
- 
 +# CEF.
 +exe_dir = join_paths(get_option('prefix'), 'lib/nageru')
 +cef_dir = get_option('cef_dir')
 +cef_build_type = get_option('cef_build_type')
 +have_cef = (cef_dir != '')
 +if have_cef
 +	add_project_arguments('-DHAVE_CEF=1', language: 'cpp')
 +
 +	system_cef = (cef_build_type == 'system')
 +	if system_cef
 +		cef_lib_dir = cef_dir
 +		cef_resource_dir = '/usr/share/cef/Resources'
 +	else
 +		cef_lib_dir = join_paths(cef_dir, cef_build_type)
 +		cef_resource_dir = join_paths(cef_dir, 'Resources')
 +
 +		nageru_include_dirs += include_directories(cef_dir)
 +		nageru_include_dirs += include_directories(join_paths(cef_dir, 'include'))
 +		nageru_build_rpath = cef_lib_dir
 +		nageru_install_rpath = '$ORIGIN/'
 +	endif
 +
 +	cefdep = cxx.find_library('cef')
 +	nageru_deps += cefdep
 +
 +	# CEF wrapper library; not built as part of the CEF binary distribution,
 +	# but should be if CEF is installed as a system library.
 +	if system_cef
 +		cefdlldep = cxx.find_library('cef_dll_wrapper')
 +		nageru_deps += cefdlldep
 +	else
 +		cmake = find_program('cmake')
 +		cef_compile_script = find_program('scripts/compile_cef_dll_wrapper.sh')
 +
 +		cef_dll_target = custom_target('libcef_dll_wrapper',
 +			input: join_paths(cef_dir, 'libcef_dll/CMakeLists.txt'),
 +			output: ['libcef_dll_wrapper.a', 'cef-stamp'],
 +			command: [cef_compile_script, '@BUILD_DIR@', cef_dir, cmake, '@OUTPUT@'])
 +
 +		# Putting the .a in sources seemingly hits a bug where the .a files get sorted
 +		# in the wrong order. This is a workaround; see
 +		# https://github.com/mesonbuild/meson/issues/3613#issuecomment-408276296 .
 +		cefdlldep = declare_dependency(sources: cef_dll_target[1], link_args: cef_dll_target.full_path())
 +		nageru_deps += cefdlldep
 +	endif
 +
 +	cef_libs = ['libEGL.so', 'libGLESv2.so', 'natives_blob.bin', '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']
 +	if not get_option('cef_no_icudtl')
 +		cef_resources += ['icudtl.dat']
 +	endif
 +	if cef_build_type != 'system'
 +		cef_libs += ['libcef.so']
 +	endif
 +
 +	# Symlink the files into the build directory, so that running nageru without ninja install works.
 +	run_command('mkdir', join_paths(meson.current_build_dir(), 'locales/'))
 +	foreach file : cef_libs
 +		run_command('ln', '-s', join_paths(cef_lib_dir, file), meson.current_build_dir())
 +		install_data(join_paths(cef_lib_dir, file), install_dir: exe_dir)
 +	endforeach
 +	foreach file : cef_resources
 +		run_command('ln', '-s', join_paths(cef_resource_dir, file), meson.current_build_dir())
 +		install_data(join_paths(cef_resource_dir, file), install_dir: exe_dir)
 +	endforeach
 +	run_command('ln', '-s', join_paths(cef_resource_dir, 'locales/en-US.pak'), join_paths(meson.current_build_dir(), 'locales/'))
 +	install_data(join_paths(cef_resource_dir, 'locales/en-US.pak'), install_dir: join_paths(exe_dir, 'locales'))
 +endif
 +
 +# bmusb.
 +if embedded_bmusb
 +	bmusb_dir = include_directories('bmusb')
 +	nageru_include_dirs += bmusb_dir
 +
 +	bmusb = static_library('bmusb', 'bmusb/bmusb.cpp', 'bmusb/fake_capture.cpp',
 +		dependencies: [libusbdep],
 +		include_directories: [bmusb_dir])
 +	nageru_link_with += bmusb
 +	kaeru_link_with += bmusb
 +else
 +	nageru_deps += bmusbdep
 +	kaeru_extra_deps += bmusbdep
 +endif
 +
 +# Protobuf compilation.
 +gen = generator(protoc, \
 +	output    : ['@BASENAME@.pb.cc', '@BASENAME@.pb.h'],
 +	arguments : ['--proto_path=@CURRENT_SOURCE_DIR@', '--cpp_out=@BUILD_DIR@', '@INPUT@'])
 +proto_generated = gen.process(['state.proto', 'midi_mapping.proto', 'json.proto'])
 +protobuf_lib = static_library('protobufs', proto_generated, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 +protobuf_hdrs = declare_dependency(sources: proto_generated)
 +nageru_link_with += protobuf_lib
 +
 +# Preprocess Qt as needed.
 +qt_files = qt5.preprocess(
 +	moc_headers: ['aboutdialog.h', 'analyzer.h', 'clickable_label.h', 'compression_reduction_meter.h', 'correlation_meter.h',
 +		'ellipsis_label.h', 'glwidget.h', 'input_mapping_dialog.h', 'lrameter.h', 'mainwindow.h', 'midi_mapping_dialog.h',
 +		'nonlinear_fader.h', 'vumeter.h'],
 +	ui_files: ['aboutdialog.ui', 'analyzer.ui', 'audio_expanded_view.ui', 'audio_miniview.ui', 'display.ui',
 +		'input_mapping.ui', 'mainwindow.ui', 'midi_mapping.ui'],
 +	dependencies: qt5deps)
 +
 +# Qt objects.
 +srcs += ['glwidget.cpp', 'mainwindow.cpp', 'vumeter.cpp', 'lrameter.cpp', 'compression_reduction_meter.cpp',
 +	'correlation_meter.cpp', 'aboutdialog.cpp', 'analyzer.cpp', 'input_mapping_dialog.cpp', 'midi_mapping_dialog.cpp',
 +	'nonlinear_fader.cpp', 'context_menus.cpp', 'vu_common.cpp', 'piecewise_interpolator.cpp', 'midi_mapper.cpp']
 +
 +# Auxiliary objects used for nearly everything.
 +aux_srcs = ['metrics.cpp', 'flags.cpp']
 +aux = static_library('aux', aux_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 +nageru_link_with += aux
 +
 +# Audio objects.
 +audio_mixer_srcs = ['audio_mixer.cpp', 'alsa_input.cpp', 'alsa_pool.cpp', 'ebu_r128_proc.cc', 'stereocompressor.cpp',
 +	'resampling_queue.cpp', 'flags.cpp', 'correlation_measurer.cpp', 'filter.cpp', 'input_mapping.cpp']
 +audio = static_library('audio', audio_mixer_srcs, dependencies: [nageru_deps, protobuf_hdrs], include_directories: nageru_include_dirs)
 +nageru_link_with += audio
 +
 +# Mixer objects.
 +srcs += ['chroma_subsampler.cpp', 'v210_converter.cpp', 'mixer.cpp', 'pbo_frame_allocator.cpp',
 +	'context.cpp', 'theme.cpp', 'image_input.cpp', 'alsa_output.cpp',
 +	'disk_space_estimator.cpp', 'timecode_renderer.cpp', 'tweaked_inputs.cpp']
 +
 +# Streaming and encoding objects (largely the set that is shared between Nageru and Kaeru).
 +stream_srcs = ['quicksync_encoder.cpp', 'x264_encoder.cpp', 'x264_dynamic.cpp', 'x264_speed_control.cpp', 'video_encoder.cpp',
 +	'metacube2.cpp', 'mux.cpp', 'audio_encoder.cpp', 'ffmpeg_raii.cpp', 'ffmpeg_util.cpp', 'httpd.cpp', 'ffmpeg_capture.cpp',
 +	'print_latency.cpp', 'basic_stats.cpp', 'ref_counted_frame.cpp']
 +stream = static_library('stream', stream_srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 +nageru_link_with += stream
 +
 +# DeckLink.
 +srcs += ['decklink_capture.cpp', 'decklink_util.cpp', 'decklink_output.cpp', 'memcpy_interleaved.cpp',
 +	'decklink/DeckLinkAPIDispatch.cpp']
 +decklink_dir = include_directories('decklink')
 +nageru_include_dirs += decklink_dir
 +
 +# CEF input.
 +if have_cef
 +	srcs += ['nageru_cef_app.cpp', 'cef_capture.cpp']
 +endif
 +
 +srcs += qt_files
 +srcs += proto_generated
 +
 +# Everything except main.cpp. (We do this because if you specify a .cpp file in
 +# both Nageru and Kaeru, it gets compiled twice. In the older Makefiles, Kaeru
 +# depended on a smaller set of objects.)
 +core = static_library('core', srcs, dependencies: nageru_deps, include_directories: nageru_include_dirs)
 +nageru_link_with += core
 +
 +# Nageru executable; it goes into /usr/lib/nageru since CEF files go there, too
 +# (we can't put them straight into /usr/bin).
 +executable('nageru', 'main.cpp',
 +	dependencies: nageru_deps,
 +	include_directories: nageru_include_dirs,
 +	link_with: nageru_link_with,
 +	link_args: nageru_link_args,
 +	build_rpath: nageru_build_rpath,
 +	install_rpath: nageru_install_rpath,
 +	install: true,
 +	install_dir: exe_dir
 +)
 +meson.add_install_script('scripts/setup_nageru_symlink.sh')
 +
 +# Kaeru executable.
 +executable('kaeru', 'kaeru.cpp',
 +	dependencies: [nageru_deps, kaeru_extra_deps],
 +	include_directories: nageru_include_dirs,
 +	link_with: [stream, aux, kaeru_link_with],
 +	link_args: nageru_link_args,
 +	install: true)
 +
 +# Audio mixer microbenchmark.
 +executable('benchmark_audio_mixer', 'benchmark_audio_mixer.cpp', dependencies: nageru_deps, include_directories: nageru_include_dirs, link_args: nageru_link_args, link_with: [audio, aux])
 +
 +# These are needed for a default run.
 +data_files = ['theme.lua', 'simple.lua', 'bg.jpeg', 'akai_midimix.midimapping']
 +install_data(data_files, install_dir: join_paths(get_option('prefix'), 'share/nageru'))
 +foreach file : data_files
 +	run_command('ln', '-s', join_paths(meson.current_source_dir(), file), meson.current_build_dir())
 +endforeach