From 5e8933eeebcedda55d4c4e84db9b4983eecefe1b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 25 Mar 2020 09:36:35 +0200 Subject: [PATCH] libcamera: pipeline: Move uvcvideo and vimc to subdirectories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Give a subdirectory to all pipeline handlers to make the structure of the source tree more consistent. This will also simplify the implementation of pipeline handlers selection at build time. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/meson.build | 7 ++----- src/libcamera/pipeline/uvcvideo/meson.build | 3 +++ src/libcamera/pipeline/{ => uvcvideo}/uvcvideo.cpp | 0 src/libcamera/pipeline/vimc/meson.build | 3 +++ src/libcamera/pipeline/{ => vimc}/vimc.cpp | 0 5 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 src/libcamera/pipeline/uvcvideo/meson.build rename src/libcamera/pipeline/{ => uvcvideo}/uvcvideo.cpp (100%) create mode 100644 src/libcamera/pipeline/vimc/meson.build rename src/libcamera/pipeline/{ => vimc}/vimc.cpp (100%) diff --git a/src/libcamera/pipeline/meson.build b/src/libcamera/pipeline/meson.build index 0d466225..c1a6ab04 100644 --- a/src/libcamera/pipeline/meson.build +++ b/src/libcamera/pipeline/meson.build @@ -1,7 +1,4 @@ -libcamera_sources += files([ - 'uvcvideo.cpp', - 'vimc.cpp', -]) - subdir('ipu3') subdir('rkisp1') +subdir('uvcvideo') +subdir('vimc') diff --git a/src/libcamera/pipeline/uvcvideo/meson.build b/src/libcamera/pipeline/uvcvideo/meson.build new file mode 100644 index 00000000..c19ae238 --- /dev/null +++ b/src/libcamera/pipeline/uvcvideo/meson.build @@ -0,0 +1,3 @@ +libcamera_sources += files([ + 'uvcvideo.cpp', +]) diff --git a/src/libcamera/pipeline/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp similarity index 100% rename from src/libcamera/pipeline/uvcvideo.cpp rename to src/libcamera/pipeline/uvcvideo/uvcvideo.cpp diff --git a/src/libcamera/pipeline/vimc/meson.build b/src/libcamera/pipeline/vimc/meson.build new file mode 100644 index 00000000..615ecd20 --- /dev/null +++ b/src/libcamera/pipeline/vimc/meson.build @@ -0,0 +1,3 @@ +libcamera_sources += files([ + 'vimc.cpp', +]) diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp similarity index 100% rename from src/libcamera/pipeline/vimc.cpp rename to src/libcamera/pipeline/vimc/vimc.cpp