Move everything into a separate futatabi/ subdir, for the upcoming merge with Nageru.

diff --git a/add_base_flow.frag b/futatabi/add_base_flow.frag
similarity index 100%
rename from add_base_flow.frag
rename to futatabi/add_base_flow.frag

diff --git a/bin2h.cpp b/futatabi/bin2h.cpp
similarity index 100%
rename from bin2h.cpp
rename to futatabi/bin2h.cpp

diff --git a/blend.frag b/futatabi/blend.frag
similarity index 100%
rename from blend.frag
rename to futatabi/blend.frag

diff --git a/chroma_subsample.frag b/futatabi/chroma_subsample.frag
similarity index 100%
rename from chroma_subsample.frag
rename to futatabi/chroma_subsample.frag

diff --git a/chroma_subsample.vert b/futatabi/chroma_subsample.vert
similarity index 100%
rename from chroma_subsample.vert
rename to futatabi/chroma_subsample.vert

diff --git a/chroma_subsampler.cpp b/futatabi/chroma_subsampler.cpp
similarity index 100%
rename from chroma_subsampler.cpp
rename to futatabi/chroma_subsampler.cpp

diff --git a/chroma_subsampler.h b/futatabi/chroma_subsampler.h
similarity index 100%
rename from chroma_subsampler.h
rename to futatabi/chroma_subsampler.h

diff --git a/clip_list.cpp b/futatabi/clip_list.cpp
similarity index 100%
rename from clip_list.cpp
rename to futatabi/clip_list.cpp

diff --git a/clip_list.h b/futatabi/clip_list.h
similarity index 100%
rename from clip_list.h
rename to futatabi/clip_list.h

diff --git a/context.cpp b/futatabi/context.cpp
similarity index 100%
rename from context.cpp
rename to futatabi/context.cpp

diff --git a/context.h b/futatabi/context.h
similarity index 100%
rename from context.h
rename to futatabi/context.h

diff --git a/db.cpp b/futatabi/db.cpp
similarity index 100%
rename from db.cpp
rename to futatabi/db.cpp

diff --git a/db.h b/futatabi/db.h
similarity index 100%
rename from db.h
rename to futatabi/db.h

diff --git a/defs.h b/futatabi/defs.h
similarity index 100%
rename from defs.h
rename to futatabi/defs.h

diff --git a/densify.frag b/futatabi/densify.frag
similarity index 100%
rename from densify.frag
rename to futatabi/densify.frag

diff --git a/densify.vert b/futatabi/densify.vert
similarity index 100%
rename from densify.vert
rename to futatabi/densify.vert

diff --git a/derivatives.frag b/futatabi/derivatives.frag
similarity index 100%
rename from derivatives.frag
rename to futatabi/derivatives.frag

diff --git a/diffusivity.frag b/futatabi/diffusivity.frag
similarity index 100%
rename from diffusivity.frag
rename to futatabi/diffusivity.frag

diff --git a/disk_space_estimator.cpp b/futatabi/disk_space_estimator.cpp
similarity index 100%
rename from disk_space_estimator.cpp
rename to futatabi/disk_space_estimator.cpp

diff --git a/disk_space_estimator.h b/futatabi/disk_space_estimator.h
similarity index 100%
rename from disk_space_estimator.h
rename to futatabi/disk_space_estimator.h

diff --git a/embedded_files.h b/futatabi/embedded_files.h
similarity index 100%
rename from embedded_files.h
rename to futatabi/embedded_files.h

diff --git a/equations.frag b/futatabi/equations.frag
similarity index 100%
rename from equations.frag
rename to futatabi/equations.frag

diff --git a/equations.vert b/futatabi/equations.vert
similarity index 100%
rename from equations.vert
rename to futatabi/equations.vert

diff --git a/eval.cpp b/futatabi/eval.cpp
similarity index 100%
rename from eval.cpp
rename to futatabi/eval.cpp

diff --git a/ffmpeg_raii.cpp b/futatabi/ffmpeg_raii.cpp
similarity index 100%
rename from ffmpeg_raii.cpp
rename to futatabi/ffmpeg_raii.cpp

diff --git a/ffmpeg_raii.h b/futatabi/ffmpeg_raii.h
similarity index 100%
rename from ffmpeg_raii.h
rename to futatabi/ffmpeg_raii.h

diff --git a/flags.cpp b/futatabi/flags.cpp
similarity index 100%
rename from flags.cpp
rename to futatabi/flags.cpp

diff --git a/flags.h b/futatabi/flags.h
similarity index 100%
rename from flags.h
rename to futatabi/flags.h

diff --git a/flow.cpp b/futatabi/flow.cpp
similarity index 100%
rename from flow.cpp
rename to futatabi/flow.cpp

diff --git a/flow.h b/futatabi/flow.h
similarity index 100%
rename from flow.h
rename to futatabi/flow.h

diff --git a/flow_main.cpp b/futatabi/flow_main.cpp
similarity index 100%
rename from flow_main.cpp
rename to futatabi/flow_main.cpp

diff --git a/frame.proto b/futatabi/frame.proto
similarity index 100%
rename from frame.proto
rename to futatabi/frame.proto

diff --git a/frame_on_disk.cpp b/futatabi/frame_on_disk.cpp
similarity index 100%
rename from frame_on_disk.cpp
rename to futatabi/frame_on_disk.cpp

diff --git a/frame_on_disk.h b/futatabi/frame_on_disk.h
similarity index 100%
rename from frame_on_disk.h
rename to futatabi/frame_on_disk.h

diff --git a/gpu_timers.cpp b/futatabi/gpu_timers.cpp
similarity index 100%
rename from gpu_timers.cpp
rename to futatabi/gpu_timers.cpp

diff --git a/gpu_timers.h b/futatabi/gpu_timers.h
similarity index 100%
rename from gpu_timers.h
rename to futatabi/gpu_timers.h

diff --git a/gray.frag b/futatabi/gray.frag
similarity index 100%
rename from gray.frag
rename to futatabi/gray.frag

diff --git a/hole_blend.frag b/futatabi/hole_blend.frag
similarity index 100%
rename from hole_blend.frag
rename to futatabi/hole_blend.frag

diff --git a/hole_fill.frag b/futatabi/hole_fill.frag
similarity index 100%
rename from hole_fill.frag
rename to futatabi/hole_fill.frag

diff --git a/hole_fill.vert b/futatabi/hole_fill.vert
similarity index 100%
rename from hole_fill.vert
rename to futatabi/hole_fill.vert

diff --git a/httpd.cpp b/futatabi/httpd.cpp
similarity index 100%
rename from httpd.cpp
rename to futatabi/httpd.cpp

diff --git a/httpd.h b/futatabi/httpd.h
similarity index 100%
rename from httpd.h
rename to futatabi/httpd.h

diff --git a/jpeg_destroyer.h b/futatabi/jpeg_destroyer.h
similarity index 100%
rename from jpeg_destroyer.h
rename to futatabi/jpeg_destroyer.h

diff --git a/jpeg_frame.h b/futatabi/jpeg_frame.h
similarity index 100%
rename from jpeg_frame.h
rename to futatabi/jpeg_frame.h

diff --git a/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
similarity index 100%
rename from jpeg_frame_view.cpp
rename to futatabi/jpeg_frame_view.cpp

diff --git a/jpeg_frame_view.h b/futatabi/jpeg_frame_view.h
similarity index 100%
rename from jpeg_frame_view.h
rename to futatabi/jpeg_frame_view.h

diff --git a/main.cpp b/futatabi/main.cpp
similarity index 100%
rename from main.cpp
rename to futatabi/main.cpp

diff --git a/mainwindow.cpp b/futatabi/mainwindow.cpp
similarity index 100%
rename from mainwindow.cpp
rename to futatabi/mainwindow.cpp

diff --git a/mainwindow.h b/futatabi/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to futatabi/mainwindow.h

diff --git a/mainwindow.ui b/futatabi/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to futatabi/mainwindow.ui

diff --git a/memcpy_interleaved.cpp b/futatabi/memcpy_interleaved.cpp
similarity index 100%
rename from memcpy_interleaved.cpp
rename to futatabi/memcpy_interleaved.cpp

diff --git a/memcpy_interleaved.h b/futatabi/memcpy_interleaved.h
similarity index 100%
rename from memcpy_interleaved.h
rename to futatabi/memcpy_interleaved.h

diff --git a/futatabi/meson.build b/futatabi/meson.build
new file mode 100644 (file)
index 0000000..a9c95b4
--- /dev/null
+++ b/futatabi/meson.build
@@ -0,0 +1,70 @@
+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 --git a/metacube2.cpp b/futatabi/metacube2.cpp
similarity index 100%
rename from metacube2.cpp
rename to futatabi/metacube2.cpp

diff --git a/metacube2.h b/futatabi/metacube2.h
similarity index 100%
rename from metacube2.h
rename to futatabi/metacube2.h

diff --git a/motion_search.frag b/futatabi/motion_search.frag
similarity index 100%
rename from motion_search.frag
rename to futatabi/motion_search.frag

diff --git a/motion_search.vert b/futatabi/motion_search.vert
similarity index 100%
rename from motion_search.vert
rename to futatabi/motion_search.vert

diff --git a/mux.cpp b/futatabi/mux.cpp
similarity index 100%
rename from mux.cpp
rename to futatabi/mux.cpp

diff --git a/mux.h b/futatabi/mux.h
similarity index 100%
rename from mux.h
rename to futatabi/mux.h

diff --git a/player.cpp b/futatabi/player.cpp
similarity index 100%
rename from player.cpp
rename to futatabi/player.cpp

diff --git a/player.h b/futatabi/player.h
similarity index 100%
rename from player.h
rename to futatabi/player.h

diff --git a/post_to_main_thread.h b/futatabi/post_to_main_thread.h
similarity index 100%
rename from post_to_main_thread.h
rename to futatabi/post_to_main_thread.h

diff --git a/prewarp.frag b/futatabi/prewarp.frag
similarity index 100%
rename from prewarp.frag
rename to futatabi/prewarp.frag

diff --git a/queue_spot_holder.h b/futatabi/queue_spot_holder.h
similarity index 100%
rename from queue_spot_holder.h
rename to futatabi/queue_spot_holder.h

diff --git a/ref_counted_gl_sync.h b/futatabi/ref_counted_gl_sync.h
similarity index 100%
rename from ref_counted_gl_sync.h
rename to futatabi/ref_counted_gl_sync.h

diff --git a/resize_flow.frag b/futatabi/resize_flow.frag
similarity index 100%
rename from resize_flow.frag
rename to futatabi/resize_flow.frag

diff --git a/sobel.frag b/futatabi/sobel.frag
similarity index 100%
rename from sobel.frag
rename to futatabi/sobel.frag

diff --git a/sor.frag b/futatabi/sor.frag
similarity index 100%
rename from sor.frag
rename to futatabi/sor.frag

diff --git a/sor.vert b/futatabi/sor.vert
similarity index 100%
rename from sor.vert
rename to futatabi/sor.vert

diff --git a/splat.frag b/futatabi/splat.frag
similarity index 100%
rename from splat.frag
rename to futatabi/splat.frag

diff --git a/splat.vert b/futatabi/splat.vert
similarity index 100%
rename from splat.vert
rename to futatabi/splat.vert

diff --git a/state.proto b/futatabi/state.proto
similarity index 100%
rename from state.proto
rename to futatabi/state.proto

diff --git a/timebase.h b/futatabi/timebase.h
similarity index 100%
rename from timebase.h
rename to futatabi/timebase.h

diff --git a/util.cpp b/futatabi/util.cpp
similarity index 100%
rename from util.cpp
rename to futatabi/util.cpp

diff --git a/util.h b/futatabi/util.h
similarity index 100%
rename from util.h
rename to futatabi/util.h

diff --git a/vaapi_jpeg_decoder.cpp b/futatabi/vaapi_jpeg_decoder.cpp
similarity index 100%
rename from vaapi_jpeg_decoder.cpp
rename to futatabi/vaapi_jpeg_decoder.cpp

diff --git a/vaapi_jpeg_decoder.h b/futatabi/vaapi_jpeg_decoder.h
similarity index 100%
rename from vaapi_jpeg_decoder.h
rename to futatabi/vaapi_jpeg_decoder.h

diff --git a/video_stream.cpp b/futatabi/video_stream.cpp
similarity index 100%
rename from video_stream.cpp
rename to futatabi/video_stream.cpp

diff --git a/video_stream.h b/futatabi/video_stream.h
similarity index 100%
rename from video_stream.h
rename to futatabi/video_stream.h

diff --git a/vis.cpp b/futatabi/vis.cpp
similarity index 100%
rename from vis.cpp
rename to futatabi/vis.cpp

diff --git a/vs.vert b/futatabi/vs.vert
similarity index 100%
rename from vs.vert
rename to futatabi/vs.vert

diff --git a/ycbcr_converter.cpp b/futatabi/ycbcr_converter.cpp
similarity index 100%
rename from ycbcr_converter.cpp
rename to futatabi/ycbcr_converter.cpp

diff --git a/ycbcr_converter.h b/futatabi/ycbcr_converter.h
similarity index 100%
rename from ycbcr_converter.h
rename to futatabi/ycbcr_converter.h

diff --git a/meson.build b/meson.build
index 410d71308d62daaf3fb371eae8727274d0c11dc7..6c13d8c28108e884da0fd0b3c16c4713e7285f15 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,71 +1,2 @@
 project('futatabi', 'cpp')
-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')
+subdir('futatabi')