pipeline: ipa: raspberrypi: Refactor and move the Raspberry Pi code
Split the Raspberry Pi pipeline handler and IPA source code into common
and VC4/BCM2835 specific file structures.
For the pipeline handler, the common code files now live in
src/libcamera/pipeline/rpi/common/
and the VC4-specific files in src/libcamera/pipeline/rpi/vc4/.
For the IPA, the common code files now live in
src/ipa/rpi/{cam_helper,controller}/
and the vc4 specific files in src/ipa/rpi/vc4/. With this change, the
camera tuning files are now installed under share/libcamera/ipa/rpi/vc4/.
To build the pipeline and IPA, the meson configuration options have now
changed from "raspberrypi" to "rpi/vc4":
meson setup build -Dipas=rpi/vc4 -Dpipelines=rpi/vc4
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
committed by
Laurent Pinchart
parent
46aefed208
commit
726e9274ea
6
src/libcamera/pipeline/rpi/common/meson.build
Normal file
6
src/libcamera/pipeline/rpi/common/meson.build
Normal file
@@ -0,0 +1,6 @@
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
libcamera_sources += files([
|
||||
'delayed_controls.cpp',
|
||||
'rpi_stream.cpp',
|
||||
])
|
||||
12
src/libcamera/pipeline/rpi/meson.build
Normal file
12
src/libcamera/pipeline/rpi/meson.build
Normal file
@@ -0,0 +1,12 @@
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
subdir('common')
|
||||
|
||||
foreach pipeline : pipelines
|
||||
pipeline = pipeline.split('/')
|
||||
if pipeline.length() < 2 or pipeline[0] != 'rpi'
|
||||
continue
|
||||
endif
|
||||
|
||||
subdir(pipeline[1])
|
||||
endforeach
|
||||
@@ -5,4 +5,4 @@ conf_files = files([
|
||||
])
|
||||
|
||||
install_data(conf_files,
|
||||
install_dir : pipeline_data_dir / 'raspberrypi')
|
||||
install_dir : pipeline_data_dir / 'rpi' / 'vc4')
|
||||
@@ -1,10 +1,8 @@
|
||||
# SPDX-License-Identifier: CC0-1.0
|
||||
|
||||
libcamera_sources += files([
|
||||
'delayed_controls.cpp',
|
||||
'dma_heaps.cpp',
|
||||
'raspberrypi.cpp',
|
||||
'rpi_stream.cpp',
|
||||
])
|
||||
|
||||
subdir('data')
|
||||
@@ -2,7 +2,7 @@
|
||||
/*
|
||||
* Copyright (C) 2019-2021, Raspberry Pi Ltd
|
||||
*
|
||||
* raspberrypi.cpp - Pipeline handler for Raspberry Pi devices
|
||||
* raspberrypi.cpp - Pipeline handler for VC4-based Raspberry Pi devices
|
||||
*/
|
||||
#include <algorithm>
|
||||
#include <assert.h>
|
||||
@@ -43,9 +43,9 @@
|
||||
#include "libcamera/internal/v4l2_videodevice.h"
|
||||
#include "libcamera/internal/yaml_parser.h"
|
||||
|
||||
#include "delayed_controls.h"
|
||||
#include "../common/delayed_controls.h"
|
||||
#include "../common/rpi_stream.h"
|
||||
#include "dma_heaps.h"
|
||||
#include "rpi_stream.h"
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
Reference in New Issue
Block a user