From a8113fb3a89984cc65d51436480cee45b60543e8 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 20 Oct 2022 01:25:45 +0300 Subject: apps: Share common source between applications Multiple source files in the src/apps/cam/ directory are used by cam, qcam and lc-compliance. They are compiled separately for each application. Move them to a new src/apps/common/ directory and compile them in a static library to decrease the number of compilation operations. Signed-off-by: Laurent Pinchart Reviewed-by: Umang Jain Reviewed-by: Kieran Bingham --- src/apps/cam/camera_session.cpp | 5 +- src/apps/cam/camera_session.h | 2 +- src/apps/cam/dng_writer.cpp | 653 ------------------ src/apps/cam/dng_writer.h | 27 - src/apps/cam/drm.cpp | 2 +- src/apps/cam/event_loop.cpp | 150 ---- src/apps/cam/event_loop.h | 68 -- src/apps/cam/file_sink.cpp | 5 +- src/apps/cam/image.cpp | 109 --- src/apps/cam/image.h | 50 -- src/apps/cam/main.cpp | 7 +- src/apps/cam/meson.build | 14 +- src/apps/cam/options.cpp | 1141 ------------------------------- src/apps/cam/options.h | 157 ----- src/apps/cam/sdl_sink.cpp | 5 +- src/apps/cam/sdl_texture.h | 2 +- src/apps/cam/stream_options.cpp | 134 ---- src/apps/cam/stream_options.h | 28 - src/apps/common/dng_writer.cpp | 653 ++++++++++++++++++ src/apps/common/dng_writer.h | 27 + src/apps/common/event_loop.cpp | 150 ++++ src/apps/common/event_loop.h | 68 ++ src/apps/common/image.cpp | 109 +++ src/apps/common/image.h | 50 ++ src/apps/common/meson.build | 26 + src/apps/common/options.cpp | 1141 +++++++++++++++++++++++++++++++ src/apps/common/options.h | 157 +++++ src/apps/common/stream_options.cpp | 134 ++++ src/apps/common/stream_options.h | 28 + src/apps/lc-compliance/main.cpp | 3 +- src/apps/lc-compliance/meson.build | 3 +- src/apps/lc-compliance/simple_capture.h | 2 +- src/apps/meson.build | 2 + src/apps/qcam/format_converter.cpp | 2 +- src/apps/qcam/main.cpp | 5 +- src/apps/qcam/main_window.cpp | 4 +- src/apps/qcam/main_window.h | 2 +- src/apps/qcam/meson.build | 13 +- src/apps/qcam/viewfinder_gl.cpp | 2 +- src/apps/qcam/viewfinder_qt.cpp | 2 +- 40 files changed, 2578 insertions(+), 2564 deletions(-) delete mode 100644 src/apps/cam/dng_writer.cpp delete mode 100644 src/apps/cam/dng_writer.h delete mode 100644 src/apps/cam/event_loop.cpp delete mode 100644 src/apps/cam/event_loop.h delete mode 100644 src/apps/cam/image.cpp delete mode 100644 src/apps/cam/image.h delete mode 100644 src/apps/cam/options.cpp delete mode 100644 src/apps/cam/options.h delete mode 100644 src/apps/cam/stream_options.cpp delete mode 100644 src/apps/cam/stream_options.h create mode 100644 src/apps/common/dng_writer.cpp create mode 100644 src/apps/common/dng_writer.h create mode 100644 src/apps/common/event_loop.cpp create mode 100644 src/apps/common/event_loop.h create mode 100644 src/apps/common/image.cpp create mode 100644 src/apps/common/image.h create mode 100644 src/apps/common/meson.build create mode 100644 src/apps/common/options.cpp create mode 100644 src/apps/common/options.h create mode 100644 src/apps/common/stream_options.cpp create mode 100644 src/apps/common/stream_options.h (limited to 'src/apps') diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp index 6b409c98..8fcec630 100644 --- a/src/apps/cam/camera_session.cpp +++ b/src/apps/cam/camera_session.cpp @@ -13,9 +13,11 @@ #include #include +#include "../common/event_loop.h" +#include "../common/stream_options.h" + #include "camera_session.h" #include "capture_script.h" -#include "event_loop.h" #include "file_sink.h" #ifdef HAVE_KMS #include "kms_sink.h" @@ -24,7 +26,6 @@ #ifdef HAVE_SDL #include "sdl_sink.h" #endif -#include "stream_options.h" using namespace libcamera; diff --git a/src/apps/cam/camera_session.h b/src/apps/cam/camera_session.h index d562caae..0bab519f 100644 --- a/src/apps/cam/camera_session.h +++ b/src/apps/cam/camera_session.h @@ -21,7 +21,7 @@ #include #include -#include "options.h" +#include "../common/options.h" class CaptureScript; class FrameSink; diff --git a/src/apps/cam/dng_writer.cpp b/src/apps/cam/dng_writer.cpp deleted file mode 100644 index c945edce..00000000 --- a/src/apps/cam/dng_writer.cpp +++ /dev/null @@ -1,653 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2020, Raspberry Pi Ltd - * - * dng_writer.cpp - DNG writer - */ - -#include "dng_writer.h" - -#include -#include -#include - -#include - -#include -#include -#include - -using namespace libcamera; - -enum CFAPatternColour : uint8_t { - CFAPatternRed = 0, - CFAPatternGreen = 1, - CFAPatternBlue = 2, -}; - -struct FormatInfo { - uint8_t bitsPerSample; - CFAPatternColour pattern[4]; - void (*packScanline)(void *output, const void *input, - unsigned int width); - void (*thumbScanline)(const FormatInfo &info, void *output, - const void *input, unsigned int width, - unsigned int stride); -}; - -struct Matrix3d { - Matrix3d() - { - } - - Matrix3d(float m0, float m1, float m2, - float m3, float m4, float m5, - float m6, float m7, float m8) - { - m[0] = m0, m[1] = m1, m[2] = m2; - m[3] = m3, m[4] = m4, m[5] = m5; - m[6] = m6, m[7] = m7, m[8] = m8; - } - - Matrix3d(const Span &span) - : Matrix3d(span[0], span[1], span[2], - span[3], span[4], span[5], - span[6], span[7], span[8]) - { - } - - static Matrix3d diag(float diag0, float diag1, float diag2) - { - return Matrix3d(diag0, 0, 0, 0, diag1, 0, 0, 0, diag2); - } - - static Matrix3d identity() - { - return Matrix3d(1, 0, 0, 0, 1, 0, 0, 0, 1); - } - - Matrix3d transpose() const - { - return { m[0], m[3], m[6], m[1], m[4], m[7], m[2], m[5], m[8] }; - } - - Matrix3d cofactors() const - { - return { m[4] * m[8] - m[5] * m[7], - -(m[3] * m[8] - m[5] * m[6]), - m[3] * m[7] - m[4] * m[6], - -(m[1] * m[8] - m[2] * m[7]), - m[0] * m[8] - m[2] * m[6], - -(m[0] * m[7] - m[1] * m[6]), - m[1] * m[5] - m[2] * m[4], - -(m[0] * m[5] - m[2] * m[3]), - m[0] * m[4] - m[1] * m[3] }; - } - - Matrix3d adjugate() const - { - return cofactors().transpose(); - } - - float determinant() const - { - return m[0] * (m[4] * m[8] - m[5] * m[7]) - - m[1] * (m[3] * m[8] - m[5] * m[6]) + - m[2] * (m[3] * m[7] - m[4] * m[6]); - } - - Matrix3d inverse() const - { - return adjugate() * (1.0 / determinant()); - } - - Matrix3d operator*(const Matrix3d &other) const - { - Matrix3d result; - for (unsigned int i = 0; i < 3; i++) { - for (unsigned int j = 0; j < 3; j++) { - result.m[i * 3 + j] = - m[i * 3 + 0] * other.m[0 + j] + - m[i * 3 + 1] * other.m[3 + j] + - m[i * 3 + 2] * other.m[6 + j]; - } - } - return result; - } - - Matrix3d operator*(float f) const - { - Matrix3d result; - for (unsigned int i = 0; i < 9; i++) - result.m[i] = m[i] * f; - return result; - } - - float m[9]; -}; - -void packScanlineSBGGR8(void *output, const void *input, unsigned int width) -{ - const uint8_t *in = static_cast(input); - uint8_t *out = static_cast(output); - - std::copy(in, in + width, out); -} - -void packScanlineSBGGR10P(void *output, const void *input, unsigned int width) -{ - const uint8_t *in = static_cast(input); - uint8_t *out = static_cast(output); - - /* \todo Can this be made more efficient? */ - for (unsigned int x = 0; x < width; x += 4) { - *out++ = in[0]; - *out++ = (in[4] & 0x03) << 6 | in[1] >> 2; - *out++ = (in[1] & 0x03) << 6 | (in[4] & 0x0c) << 2 | in[2] >> 4; - *out++ = (in[2] & 0x0f) << 4 | (in[4] & 0x30) >> 2 | in[3] >> 6; - *out++ = (in[3] & 0x3f) << 2 | (in[4] & 0xc0) >> 6; - in += 5; - } -} - -void packScanlineSBGGR12P(void *output, const void *input, unsigned int width) -{ - const uint8_t *in = static_cast(input); - uint8_t *out = static_cast(output); - - /* \todo Can this be made more efficient? */ - for (unsigned int i = 0; i < width; i += 2) { - *out++ = in[0]; - *out++ = (in[2] & 0x0f) << 4 | in[1] >> 4; - *out++ = (in[1] & 0x0f) << 4 | in[2] >> 4; - in += 3; - } -} - -void thumbScanlineSBGGRxxP(const FormatInfo &info, void *output, - const void *input, unsigned int width, - unsigned int stride) -{ - const uint8_t *in = static_cast(input); - uint8_t *out = static_cast(output); - - /* Number of bytes corresponding to 16 pixels. */ - unsigned int skip = info.bitsPerSample * 16 / 8; - - for (unsigned int x = 0; x < width; x++) { - uint8_t value = (in[0] + in[1] + in[stride] + in[stride + 1]) >> 2; - *out++ = value; - *out++ = value; - *out++ = value; - in += skip; - } -} - -void packScanlineIPU3(void *output, const void *input, unsigned int width) -{ - const uint8_t *in = static_cast(input); - uint16_t *out = static_cast(output); - - /* - * Upscale the 10-bit format to 16-bit as it's not trivial to pack it - * as 10-bit without gaps. - * - * \todo Improve packing to keep the 10-bit sample size. - */ - unsigned int x = 0; - while (true) { - for (unsigned int i = 0; i < 6; i++) { - *out++ = (in[1] & 0x03) << 14 | (in[0] & 0xff) << 6; - if (++x >= width) - return; - - *out++ = (in[2] & 0x0f) << 12 | (in[1] & 0xfc) << 4; - if (++x >= width) - return; - - *out++ = (in[3] & 0x3f) << 10 | (in[2] & 0xf0) << 2; - if (++x >= width) - return; - - *out++ = (in[4] & 0xff) << 8 | (in[3] & 0xc0) << 0; - if (++x >= width) - return; - - in += 5; - } - - *out++ = (in[1] & 0x03) << 14 | (in[0] & 0xff) << 6; - if (++x >= width) - return; - - in += 2; - } -} - -void thumbScanlineIPU3([[maybe_unused]] const FormatInfo &info, void *output, - const void *input, unsigned int width, - unsigned int stride) -{ - uint8_t *out = static_cast(output); - - for (unsigned int x = 0; x < width; x++) { - unsigned int pixel = x * 16; - unsigned int block = pixel / 25; - unsigned int pixelInBlock = pixel - block * 25; - - /* - * If the pixel is the last in the block cheat a little and - * move one pixel backward to avoid reading between two blocks - * and having to deal with the padding bits. - */ - if (pixelInBlock == 24) - pixelInBlock--; - - const uint8_t *in = static_cast(input) - + block * 32 + (pixelInBlock / 4) * 5; - - uint16_t val1, val2, val3, val4; - switch (pixelInBlock % 4) { - case 0: - val1 = (in[1] & 0x03) << 14 | (in[0] & 0xff) << 6; - val2 = (in[2] & 0x0f) << 12 | (in[1] & 0xfc) << 4; - val3 = (in[stride + 1] & 0x03) << 14 | (in[stride + 0] & 0xff) << 6; - val4 = (in[stride + 2] & 0x0f) << 12 | (in[stride + 1] & 0xfc) << 4; - break; - case 1: - val1 = (in[2] & 0x0f) << 12 | (in[1] & 0xfc) << 4; - val2 = (in[3] & 0x3f) << 10 | (in[2] & 0xf0) << 2; - val3 = (in[stride + 2] & 0x0f) << 12 | (in[stride + 1] & 0xfc) << 4; - val4 = (in[stride + 3] & 0x3f) << 10 | (in[stride + 2] & 0xf0) << 2; - break; - case 2: - val1 = (in[3] & 0x3f) << 10 | (in[2] & 0xf0) << 2; - val2 = (in[4] & 0xff) << 8 | (in[3] & 0xc0) << 0; - val3 = (in[stride + 3] & 0x3f) << 10 | (in[stride + 2] & 0xf0) << 2; - val4 = (in[stride + 4] & 0xff) << 8 | (in[stride + 3] & 0xc0) << 0; - break; - case 3: - val1 = (in[4] & 0xff) << 8 | (in[3] & 0xc0) << 0; - val2 = (in[6] & 0x03) << 14 | (in[5] & 0xff) << 6; - val3 = (in[stride + 4] & 0xff) << 8 | (in[stride + 3] & 0xc0) << 0; - val4 = (in[stride + 6] & 0x03) << 14 | (in[stride + 5] & 0xff) << 6; - break; - } - - uint8_t value = (val1 + val2 + val3 + val4) >> 10; - *out++ = value; - *out++ = value; - *out++ = value; - } -} - -static const std::map formatInfo = { - { formats::SBGGR8, { - .bitsPerSample = 8, - .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, - .packScanline = packScanlineSBGGR8, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SGBRG8, { - .bitsPerSample = 8, - .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, - .packScanline = packScanlineSBGGR8, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SGRBG8, { - .bitsPerSample = 8, - .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, - .packScanline = packScanlineSBGGR8, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SRGGB8, { - .bitsPerSample = 8, - .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, - .packScanline = packScanlineSBGGR8, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SBGGR10_CSI2P, { - .bitsPerSample = 10, - .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, - .packScanline = packScanlineSBGGR10P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SGBRG10_CSI2P, { - .bitsPerSample = 10, - .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, - .packScanline = packScanlineSBGGR10P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SGRBG10_CSI2P, { - .bitsPerSample = 10, - .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, - .packScanline = packScanlineSBGGR10P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SRGGB10_CSI2P, { - .bitsPerSample = 10, - .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, - .packScanline = packScanlineSBGGR10P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SBGGR12_CSI2P, { - .bitsPerSample = 12, - .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, - .packScanline = packScanlineSBGGR12P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SGBRG12_CSI2P, { - .bitsPerSample = 12, - .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, - .packScanline = packScanlineSBGGR12P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SGRBG12_CSI2P, { - .bitsPerSample = 12, - .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, - .packScanline = packScanlineSBGGR12P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SRGGB12_CSI2P, { - .bitsPerSample = 12, - .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, - .packScanline = packScanlineSBGGR12P, - .thumbScanline = thumbScanlineSBGGRxxP, - } }, - { formats::SBGGR10_IPU3, { - .bitsPerSample = 16, - .pattern = { CFAPatternBlue, CFAPatternGreen, CFAPatternGreen, CFAPatternRed }, - .packScanline = packScanlineIPU3, - .thumbScanline = thumbScanlineIPU3, - } }, - { formats::SGBRG10_IPU3, { - .bitsPerSample = 16, - .pattern = { CFAPatternGreen, CFAPatternBlue, CFAPatternRed, CFAPatternGreen }, - .packScanline = packScanlineIPU3, - .thumbScanline = thumbScanlineIPU3, - } }, - { formats::SGRBG10_IPU3, { - .bitsPerSample = 16, - .pattern = { CFAPatternGreen, CFAPatternRed, CFAPatternBlue, CFAPatternGreen }, - .packScanline = packScanlineIPU3, - .thumbScanline = thumbScanlineIPU3, - } }, - { formats::SRGGB10_IPU3, { - .bitsPerSample = 16, - .pattern = { CFAPatternRed, CFAPatternGreen, CFAPatternGreen, CFAPatternBlue }, - .packScanline = packScanlineIPU3, - .thumbScanline = thumbScanlineIPU3, - } }, -}; - -int DNGWriter::write(const char *filename, const Camera *camera, - const StreamConfiguration &config, - const ControlList &metadata, - [[maybe_unused]] const FrameBuffer *buffer, - const void *data) -{ - const ControlList &cameraProperties = camera->properties(); - - const auto it = formatInfo.find(config.pixelFormat); - if (it == formatInfo.cend()) { - std::cerr << "Unsupported pixel format" << std::endl; - return -EINVAL; - } - const FormatInfo *info = &it->second; - - TIFF *tif = TIFFOpen(filename, "w"); - if (!tif) { - std::cerr << "Failed to open tiff file" << std::endl; - return -EINVAL; - } - - /* - * Scanline buffer, has to be large enough to store both a RAW scanline - * or a thumbnail scanline. The latter will always be much smaller than - * the former as we downscale by 16 in both directions. - */ - uint8_t scanline[(config.size.width * info->bitsPerSample + 7) / 8]; - - toff_t rawIFDOffset = 0; - toff_t exifIFDOffset = 0; - - /* - * Start with a thumbnail in IFD 0 for compatibility with TIFF baseline - * readers, as required by the TIFF/EP specification. Tags that apply to - * the whole file are stored here. - */ - const uint8_t version[] = { 1, 2, 0, 0 }; - - TIFFSetField(tif, TIFFTAG_DNGVERSION, version); - TIFFSetField(tif, TIFFTAG_DNGBACKWARDVERSION, version); - TIFFSetField(tif, TIFFTAG_FILLORDER, FILLORDER_MSB2LSB); - TIFFSetField(tif, TIFFTAG_MAKE, "libcamera"); - - const auto &model = cameraProperties.get(properties::Model); - if (model) { - TIFFSetField(tif, TIFFTAG_MODEL, model->c_str()); - /* \todo set TIFFTAG_UNIQUECAMERAMODEL. */ - } - - TIFFSetField(tif, TIFFTAG_SOFTWARE, "qcam"); - TIFFSetField(tif, TIFFTAG_ORIENTATION, ORIENTATION_TOPLEFT); - - /* - * Thumbnail-specific tags. The thumbnail is stored as an RGB image - * with 1/16 of the raw image resolution. Greyscale would save space, - * but doesn't seem well supported by RawTherapee. - */ - TIFFSetField(tif, TIFFTAG_SUBFILETYPE, FILETYPE_REDUCEDIMAGE); - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, config.size.width / 16); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, config.size.height / 16); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, 8); - TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB); - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 3); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); - - /* - * Fill in some reasonable colour information in the DNG. We supply - * the "neutral" colour values which determine the white balance, and the - * "ColorMatrix1" which converts XYZ to (un-white-balanced) camera RGB. - * Note that this is not a "proper" colour calibration for the DNG, - * nonetheless, many tools should be able to render the colours better. - */ - float neutral[3] = { 1, 1, 1 }; - Matrix3d wbGain = Matrix3d::identity(); - /* From http://www.brucelindbloom.com/index.html?Eqn_RGB_XYZ_Matrix.html */ - const Matrix3d rgb2xyz(0.4124564, 0.3575761, 0.1804375, - 0.2126729, 0.7151522, 0.0721750, - 0.0193339, 0.1191920, 0.9503041); - Matrix3d ccm = Matrix3d::identity(); - /* - * Pick a reasonable number eps to protect against singularities. It - * should be comfortably larger than the point at which we run into - * numerical trouble, yet smaller than any plausible gain that we might - * apply to a colour, either explicitly or as part of the colour matrix. - */ - const double eps = 1e-2; - - const auto &colourGains = metadata.get(controls::ColourGains); - if (colourGains) { - if ((*colourGains)[0] > eps && (*colourGains)[1] > eps) { - wbGain = Matrix3d::diag((*colourGains)[0], 1, (*colourGains)[1]); - neutral[0] = 1.0 / (*colourGains)[0]; /* red */ - neutral[2] = 1.0 / (*colourGains)[1]; /* blue */ - } - } - - const auto &ccmControl = metadata.get(controls::ColourCorrectionMatrix); - if (ccmControl) { - Matrix3d ccmSupplied(*ccmControl); - if (ccmSupplied.determinant() > eps) - ccm = ccmSupplied; - } - - /* - * rgb2xyz is known to be invertible, and we've ensured above that both - * the ccm and wbGain matrices are non-singular, so the product of all - * three is guaranteed to be invertible too. - */ - Matrix3d colorMatrix1 = (rgb2xyz * ccm * wbGain).inverse(); - - TIFFSetField(tif, TIFFTAG_COLORMATRIX1, 9, colorMatrix1.m); - TIFFSetField(tif, TIFFTAG_ASSHOTNEUTRAL, 3, neutral); - - /* - * Reserve space for the SubIFD and ExifIFD tags, pointing to the IFD - * for the raw image and EXIF data respectively. The real offsets will - * be set later. - */ - TIFFSetField(tif, TIFFTAG_SUBIFD, 1, &rawIFDOffset); - TIFFSetField(tif, TIFFTAG_EXIFIFD, exifIFDOffset); - - /* Write the thumbnail. */ - const uint8_t *row = static_cast(data); - for (unsigned int y = 0; y < config.size.height / 16; y++) { - info->thumbScanline(*info, &scanline, row, - config.size.width / 16, config.stride); - - if (TIFFWriteScanline(tif, &scanline, y, 0) != 1) { - std::cerr << "Failed to write thumbnail scanline" - << std::endl; - TIFFClose(tif); - return -EINVAL; - } - - row += config.stride * 16; - } - - TIFFWriteDirectory(tif); - - /* Create a new IFD for the RAW image. */ - const uint16_t cfaRepeatPatternDim[] = { 2, 2 }; - const uint8_t cfaPlaneColor[] = { - CFAPatternRed, - CFAPatternGreen, - CFAPatternBlue - }; - - TIFFSetField(tif, TIFFTAG_SUBFILETYPE, 0); - TIFFSetField(tif, TIFFTAG_IMAGEWIDTH, config.size.width); - TIFFSetField(tif, TIFFTAG_IMAGELENGTH, config.size.height); - TIFFSetField(tif, TIFFTAG_BITSPERSAMPLE, info->bitsPerSample); - TIFFSetField(tif, TIFFTAG_COMPRESSION, COMPRESSION_NONE); - TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_CFA); - TIFFSetField(tif, TIFFTAG_SAMPLESPERPIXEL, 1); - TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField(tif, TIFFTAG_SAMPLEFORMAT, SAMPLEFORMAT_UINT); - TIFFSetField(tif, TIFFTAG_CFAREPEATPATTERNDIM, cfaRepeatPatternDim); - if (TIFFLIB_VERSION < 20201219) - TIFFSetField(tif, TIFFTAG_CFAPATTERN, info->pattern); - else - TIFFSetField(tif, TIFFTAG_CFAPATTERN, 4, info->pattern); - TIFFSetField(tif, TIFFTAG_CFAPLANECOLOR, 3, cfaPlaneColor); - TIFFSetField(tif, TIFFTAG_CFALAYOUT, 1); - - const uint16_t blackLevelRepeatDim[] = { 2, 2 }; - float blackLevel[] = { 0.0f, 0.0f, 0.0f, 0.0f }; - uint32_t whiteLevel = (1 << info->bitsPerSample) - 1; - - const auto &blackLevels = metadata.get(controls::SensorBlackLevels); - if (blackLevels) { - Span levels = *blackLevels; - - /* - * The black levels control is specified in R, Gr, Gb, B order. - * Map it to the TIFF tag that is specified in CFA pattern - * order. - */ - unsigned int green = (info->pattern[0] == CFAPatternRed || - info->pattern[1] == CFAPatternRed) - ? 0 : 1; - - for (unsigned int i = 0; i < 4; ++i) { - unsigned int level; - - switch (info->pattern[i]) { - case CFAPatternRed: - level = levels[0]; - break; - case CFAPatternGreen: - level = levels[green + 1]; - green = (green + 1) % 2; - break; - case CFAPatternBlue: - default: - level = levels[3]; - break; - } - - /* Map the 16-bit value to the bits per sample range. */ - blackLevel[i] = level >> (16 - info->bitsPerSample); - } - } - - TIFFSetField(tif, TIFFTAG_BLACKLEVELREPEATDIM, &blackLevelRepeatDim); - TIFFSetField(tif, TIFFTAG_BLACKLEVEL, 4, &blackLevel); - TIFFSetField(tif, TIFFTAG_WHITELEVEL, 1, &whiteLevel); - - /* Write RAW content. */ - row = static_cast(data); - for (unsigned int y = 0; y < config.size.height; y++) { - info->packScanline(&scanline, row, config.size.width); - - if (TIFFWriteScanline(tif, &scanline, y, 0) != 1) { - std::cerr << "Failed to write RAW scanline" - << std::endl; - TIFFClose(tif); - return -EINVAL; - } - - row += config.stride; - } - - /* Checkpoint the IFD to retrieve its offset, and write it out. */ - TIFFCheckpointDirectory(tif); - rawIFDOffset = TIFFCurrentDirOffset(tif); - TIFFWriteDirectory(tif); - - /* Create a new IFD for the EXIF data and fill it. */ - TIFFCreateEXIFDirectory(tif); - - /* Store creation time. */ - time_t rawtime; - struct tm *timeinfo; - char strTime[20]; - - time(&rawtime); - timeinfo = localtime(&rawtime); - strftime(strTime, 20, "%Y:%m:%d %H:%M:%S", timeinfo); - - /* - * \todo Handle timezone information by setting OffsetTimeOriginal and - * OffsetTimeDigitized once libtiff catches up to the specification and - * has EXIFTAG_ defines to handle them. - */ - TIFFSetField(tif, EXIFTAG_DATETIMEORIGINAL, strTime); - TIFFSetField(tif, EXIFTAG_DATETIMEDIGITIZED, strTime); - - const auto &analogGain = metadata.get(controls::AnalogueGain); - if (analogGain) { - uint16_t iso = std::min(std::max(*analogGain * 100, 0.0f), 65535.0f); - TIFFSetField(tif, EXIFTAG_ISOSPEEDRATINGS, 1, &iso); - } - - const auto &exposureTime = metadata.get(controls::ExposureTime); - if (exposureTime) - TIFFSetField(tif, EXIFTAG_EXPOSURETIME, *exposureTime / 1e6); - - TIFFWriteCustomDirectory(tif, &exifIFDOffset); - - /* Update the IFD offsets and close the file. */ - TIFFSetDirectory(tif, 0); - TIFFSetField(tif, TIFFTAG_SUBIFD, 1, &rawIFDOffset); - TIFFSetField(tif, TIFFTAG_EXIFIFD, exifIFDOffset); - TIFFWriteDirectory(tif); - - TIFFClose(tif); - - return 0; -} diff --git a/src/apps/cam/dng_writer.h b/src/apps/cam/dng_writer.h deleted file mode 100644 index 38f38f62..00000000 --- a/src/apps/cam/dng_writer.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2020, Raspberry Pi Ltd - * - * dng_writer.h - DNG writer - */ - -#pragma once - -#ifdef HAVE_TIFF -#define HAVE_DNG - -#include -#include -#include -#include - -class DNGWriter -{ -public: - static int write(const char *filename, const libcamera::Camera *camera, - const libcamera::StreamConfiguration &config, - const libcamera::ControlList &metadata, - const libcamera::FrameBuffer *buffer, const void *data); -}; - -#endif /* HAVE_TIFF */ diff --git a/src/apps/cam/drm.cpp b/src/apps/cam/drm.cpp index 2e4d7985..8779a713 100644 --- a/src/apps/cam/drm.cpp +++ b/src/apps/cam/drm.cpp @@ -24,7 +24,7 @@ #include -#include "event_loop.h" +#include "../common/event_loop.h" namespace DRM { diff --git a/src/apps/cam/event_loop.cpp b/src/apps/cam/event_loop.cpp deleted file mode 100644 index cb83845c..00000000 --- a/src/apps/cam/event_loop.cpp +++ /dev/null @@ -1,150 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_loop.cpp - cam - Event loop - */ - -#include "event_loop.h" - -#include -#include -#include -#include - -EventLoop *EventLoop::instance_ = nullptr; - -EventLoop::EventLoop() -{ - assert(!instance_); - - evthread_use_pthreads(); - base_ = event_base_new(); - instance_ = this; -} - -EventLoop::~EventLoop() -{ - instance_ = nullptr; - - events_.clear(); - event_base_free(base_); - libevent_global_shutdown(); -} - -EventLoop *EventLoop::instance() -{ - return instance_; -} - -int EventLoop::exec() -{ - exitCode_ = -1; - event_base_loop(base_, EVLOOP_NO_EXIT_ON_EMPTY); - return exitCode_; -} - -void EventLoop::exit(int code) -{ - exitCode_ = code; - event_base_loopbreak(base_); -} - -void EventLoop::callLater(const std::function &func) -{ - { - std::unique_lock locker(lock_); - calls_.push_back(func); - } - - event_base_once(base_, -1, EV_TIMEOUT, dispatchCallback, this, nullptr); -} - -void EventLoop::addFdEvent(int fd, EventType type, - const std::function &callback) -{ - std::unique_ptr event = std::make_unique(callback); - short events = (type & Read ? EV_READ : 0) - | (type & Write ? EV_WRITE : 0) - | EV_PERSIST; - - event->event_ = event_new(base_, fd, events, &EventLoop::Event::dispatch, - event.get()); - if (!event->event_) { - std::cerr << "Failed to create event for fd " << fd << std::endl; - return; - } - - int ret = event_add(event->event_, nullptr); - if (ret < 0) { - std::cerr << "Failed to add event for fd " << fd << std::endl; - return; - } - - events_.push_back(std::move(event)); -} - -void EventLoop::addTimerEvent(const std::chrono::microseconds period, - const std::function &callback) -{ - std::unique_ptr event = std::make_unique(callback); - event->event_ = event_new(base_, -1, EV_PERSIST, &EventLoop::Event::dispatch, - event.get()); - if (!event->event_) { - std::cerr << "Failed to create timer event" << std::endl; - return; - } - - struct timeval tv; - tv.tv_sec = period.count() / 1000000ULL; - tv.tv_usec = period.count() % 1000000ULL; - - int ret = event_add(event->event_, &tv); - if (ret < 0) { - std::cerr << "Failed to add timer event" << std::endl; - return; - } - - events_.push_back(std::move(event)); -} - -void EventLoop::dispatchCallback([[maybe_unused]] evutil_socket_t fd, - [[maybe_unused]] short flags, void *param) -{ - EventLoop *loop = static_cast(param); - loop->dispatchCall(); -} - -void EventLoop::dispatchCall() -{ - std::function call; - - { - std::unique_lock locker(lock_); - if (calls_.empty()) - return; - - call = calls_.front(); - calls_.pop_front(); - } - - call(); -} - -EventLoop::Event::Event(const std::function &callback) - : callback_(callback), event_(nullptr) -{ -} - -EventLoop::Event::~Event() -{ - event_del(event_); - event_free(event_); -} - -void EventLoop::Event::dispatch([[maybe_unused]] int fd, - [[maybe_unused]] short events, void *arg) -{ - Event *event = static_cast(arg); - event->callback_(); -} diff --git a/src/apps/cam/event_loop.h b/src/apps/cam/event_loop.h deleted file mode 100644 index ef79e8e5..00000000 --- a/src/apps/cam/event_loop.h +++ /dev/null @@ -1,68 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * event_loop.h - cam - Event loop - */ - -#pragma once - -#include -#include -#include -#include -#include - -#include - -struct event_base; - -class EventLoop -{ -public: - enum EventType { - Read = 1, - Write = 2, - }; - - EventLoop(); - ~EventLoop(); - - static EventLoop *instance(); - - int exec(); - void exit(int code = 0); - - void callLater(const std::function &func); - - void addFdEvent(int fd, EventType type, - const std::function &handler); - - using duration = std::chrono::steady_clock::duration; - void addTimerEvent(const std::chrono::microseconds period, - const std::function &handler); - -private: - struct Event { - Event(const std::function &callback); - ~Event(); - - static void dispatch(int fd, short events, void *arg); - - std::function callback_; - struct event *event_; - }; - - static EventLoop *instance_; - - struct event_base *base_; - int exitCode_; - - std::list> calls_; - std::list> events_; - std::mutex lock_; - - static void dispatchCallback(evutil_socket_t fd, short flags, - void *param); - void dispatchCall(); -}; diff --git a/src/apps/cam/file_sink.cpp b/src/apps/cam/file_sink.cpp index 4dfacc10..b32aad24 100644 --- a/src/apps/cam/file_sink.cpp +++ b/src/apps/cam/file_sink.cpp @@ -15,9 +15,10 @@ #include -#include "dng_writer.h" +#include "../common/dng_writer.h" +#include "../common/image.h" + #include "file_sink.h" -#include "image.h" using namespace libcamera; diff --git a/src/apps/cam/image.cpp b/src/apps/cam/image.cpp deleted file mode 100644 index fe2cc6da..00000000 --- a/src/apps/cam/image.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2021, Ideas on Board Oy - * - * image.cpp - Multi-planar image with access to pixel data - */ - -#include "image.h" - -#include -#include -#include -#include -#include -#include -#include - -using namespace libcamera; - -std::unique_ptr Image::fromFrameBuffer(const FrameBuffer *buffer, MapMode mode) -{ - std::unique_ptr image{ new Image() }; - - assert(!buffer->planes().empty()); - - int mmapFlags = 0; - - if (mode & MapMode::ReadOnly) - mmapFlags |= PROT_READ; - - if (mode & MapMode::WriteOnly) - mmapFlags |= PROT_WRITE; - - struct MappedBufferInfo { - uint8_t *address = nullptr; - size_t mapLength = 0; - size_t dmabufLength = 0; - }; - std::map mappedBuffers; - - for (const FrameBuffer::Plane &plane : buffer->planes()) { - const int fd = plane.fd.get(); - if (mappedBuffers.find(fd) == mappedBuffers.end()) { - const size_t length = lseek(fd, 0, SEEK_END); - mappedBuffers[fd] = MappedBufferInfo{ nullptr, 0, length }; - } - - const size_t length = mappedBuffers[fd].dmabufLength; - - if (plane.offset > length || - plane.offset + plane.length > length) { - std::cerr << "plane is out of buffer: buffer length=" - << length << ", plane offset=" << plane.offset - << ", plane length=" << plane.length - << std::endl; - return nullptr; - } - size_t &mapLength = mappedBuffers[fd].mapLength; - mapLength = std::max(mapLength, - static_cast(plane.offset + plane.length)); - } - - for (const FrameBuffer::Plane &plane : buffer->planes()) { - const int fd = plane.fd.get(); - auto &info = mappedBuffers[fd]; - if (!info.address) { - void *address = mmap(nullptr, info.mapLength, mmapFlags, - MAP_SHARED, fd, 0); - if (address == MAP_FAILED) { - int error = -errno; - std::cerr << "Failed to mmap plane: " - << strerror(-error) << std::endl; - return nullptr; - } - - info.address = static_cast(address); - image->maps_.emplace_back(info.address, info.mapLength); - } - - image->planes_.emplace_back(info.address + plane.offset, plane.length); - } - - return image; -} - -Image::Image() = default; - -Image::~Image() -{ - for (Span &map : maps_) - munmap(map.data(), map.size()); -} - -unsigned int Image::numPlanes() const -{ - return planes_.size(); -} - -Span Image::data(unsigned int plane) -{ - assert(plane <= planes_.size()); - return planes_[plane]; -} - -Span Image::data(unsigned int plane) const -{ - assert(plane <= planes_.size()); - return planes_[plane]; -} diff --git a/src/apps/cam/image.h b/src/apps/cam/image.h deleted file mode 100644 index 7953b177..00000000 --- a/src/apps/cam/image.h +++ /dev/null @@ -1,50 +0,0 @@ -/* SPDX-License-Identifier: LGPL-2.1-or-later */ -/* - * Copyright (C) 2021, Ideas on Board Oy - * - * image.h - Multi-planar image with access to pixel data - */ - -#pragma once - -#include -#include -#include - -#include -#include -#include - -#include - -class Image -{ -public: - enum class MapMode { - ReadOnly = 1 << 0, - WriteOnly = 1 << 1, - ReadWrite = ReadOnly | WriteOnly, - }; - - static std::unique_ptr fromFrameBuffer(const libcamera::FrameBuffer *buffer, - MapMode mode); - - ~Image(); - - unsigned int numPlanes() const; - - libcamera::Span data(unsigned int plane); - libcamera::Span data(unsigned int plane) const; - -private: - LIBCAMERA_DISABLE_COPY(Image) - - Image(); - - std::vector> maps_; - std::vector> planes_; -}; - -namespace libcamera { -LIBCAMERA_FLAGS_ENABLE_OPERATORS(Image::MapMode) -} diff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp index d70130e2..5d8a57bc 100644 --- a/src/apps/cam/main.cpp +++ b/src/apps/cam/main.cpp @@ -14,11 +14,12 @@ #include #include +#include "../common/event_loop.h" +#include "../common/options.h" +#include "../common/stream_options.h" + #include "camera_session.h" -#include "event_loop.h" #include "main.h" -#include "options.h" -#include "stream_options.h" using namespace libcamera; diff --git a/src/apps/cam/meson.build b/src/apps/cam/meson.build index 297de64f..48c834ac 100644 --- a/src/apps/cam/meson.build +++ b/src/apps/cam/meson.build @@ -10,16 +10,12 @@ cam_enabled = true cam_sources = files([ 'camera_session.cpp', 'capture_script.cpp', - 'event_loop.cpp', 'file_sink.cpp', 'frame_sink.cpp', - 'image.cpp', 'main.cpp', - 'options.cpp', - 'stream_options.cpp', ]) -cam_cpp_args = [] +cam_cpp_args = [apps_cpp_args] libdrm = dependency('libdrm', required : false) libjpeg = dependency('libjpeg', required : false) @@ -49,14 +45,8 @@ if libsdl2.found() endif endif -if libtiff.found() - cam_cpp_args += ['-DHAVE_TIFF'] - cam_sources += files([ - 'dng_writer.cpp', - ]) -endif - cam = executable('cam', cam_sources, + link_with : apps_lib, dependencies : [ libatomic, libcamera_public, diff --git a/src/apps/cam/options.cpp b/src/apps/cam/options.cpp deleted file mode 100644 index 4f7e8691..00000000 --- a/src/apps/cam/options.cpp +++ /dev/null @@ -1,1141 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2019, Google Inc. - * - * options.cpp - cam - Options parsing - */ - -#include -#include -#include -#include -#include - -#include "options.h" - -/** - * \enum OptionArgument - * \brief Indicate if an option takes an argument - * - * \var OptionArgument::ArgumentNone - * \brief The option doesn't accept any argument - * - * \var OptionArgument::ArgumentRequired - * \brief The option requires an argument - * - * \var OptionArgument::ArgumentOptional - * \brief The option accepts an optional argument - */ - -/** - * \enum OptionType - * \brief The type of argument for an option - * - * \var OptionType::OptionNone - * \brief No argument type, used for options that take no argument - * - * \var OptionType::OptionInteger - * \brief Integer argument type, with an optional base prefix (`0` for base 8, - * `0x` for base 16, none for base 10) - * - * \var OptionType::OptionString - * \brief String argument - * - * \var OptionType::OptionKeyValue - * \brief key=value list argument - */ - -/* ----------------------------------------------------------------------------- - * Option - */ - -/** - * \struct Option - * \brief Store metadata about an option - * - * \var Option::opt - * \brief The option identifier - * - * \var Option::type - * \brief The type of the option argument - * - * \var Option::name - * \brief The option name - * - * \var Option::argument - * \brief Whether the option accepts an optional argument, a mandatory - * argument, or no argument at all - * - * \var Option::argumentName - * \brief The argument name used in the help text - * - * \var Option::help - * \brief The help text (may be a multi-line string) - * - * \var Option::keyValueParser - * \brief For options of type OptionType::OptionKeyValue, the key-value parser - * to parse the argument - * - * \var Option::isArray - * \brief Whether the option can appear once or multiple times - * - * \var Option::parent - * \brief The parent option - * - * \var Option::children - * \brief List of child options, storing all options whose parent is this option - * - * \fn Option::hasShortOption() - * \brief Tell if the option has a short option specifier (e.g. `-f`) - * \return True if the option has a short option specifier, false otherwise - * - * \fn Option::hasLongOption() - * \brief Tell if the option has a long option specifier (e.g. `--foo`) - * \return True if the option has a long option specifier, false otherwise - */ -struct Option { - int opt; - OptionType type; - const char *name; - OptionArgument argument; - const char *argumentName; - const char *help; - KeyValueParser *keyValueParser; - bool isArray; - Option *parent; - std::list