Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 23:39:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

ipa: raspberrypi: Remove MdParserRPi

Browse source 
With the recent change to pass a ControlList to the IPA with exposure
and gain values used for a frame, RPiController::MdParserRPi is not
needed any more. Remove all traces of it.

The derived CamHelper objects now pass nullptr values for the parser to
the base CamHelper class when sensors do not use metadata.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Tested-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2021-03-02 15:11:09 +00:00 • committed by Laurent Pinchart
parent cd07b604ba
commit 9d4431d621
6 changed files with 6 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ipa/raspberrypi/cam_helper.cpp
View file

@ -88,8 +88,10 @@ uint32_t CamHelper::GetVBlanking(double &exposure, double minFrameDuration,
void CamHelper::SetCameraMode(const CameraMode &mode)
{
mode_ = mode;
if (parser_) {
parser_->SetBitsPerPixel(mode.bitdepth);
parser_->SetLineLengthBytes(0); /* We use SetBufferSize. */
}
initialized_ = true;
}

4
src/ipa/raspberrypi/cam_helper_imx219.cpp
View file

@ -19,8 +19,6 @@
#include "cam_helper.hpp"
#if ENABLE_EMBEDDED_DATA
#include "md_parser.hpp"
#else
#include "md_parser_rpi.hpp"
#endif
using namespace RPiController;
@ -62,7 +60,7 @@ CamHelperImx219::CamHelperImx219()
#if ENABLE_EMBEDDED_DATA
: CamHelper(new MdParserImx219(), frameIntegrationDiff)
#else
: CamHelper(new MdParserRPi(), frameIntegrationDiff)
: CamHelper(nullptr, frameIntegrationDiff)
#endif
{
}

3
src/ipa/raspberrypi/cam_helper_ov5647.cpp
View file

@ -8,7 +8,6 @@
#include <assert.h>
#include "cam_helper.hpp"
#include "md_parser_rpi.hpp"
using namespace RPiController;
@ -38,7 +37,7 @@ private:
*/
CamHelperOv5647::CamHelperOv5647()
: CamHelper(new MdParserRPi(), frameIntegrationDiff)
: CamHelper(nullptr, frameIntegrationDiff)
{
}

37
src/ipa/raspberrypi/md_parser_rpi.cpp
View file

@ -1,37 +0,0 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2020, Raspberry Pi (Trading) Limited
*
* md_parser_rpi.cpp - Metadata parser for generic Raspberry Pi metadata
*/
#include <string.h>
#include "md_parser_rpi.hpp"
using namespace RPiController;
MdParserRPi::MdParserRPi()
{
}
MdParser::Status MdParserRPi::Parse(void *data)
{
if (buffer_size_bytes_ < sizeof(rpiMetadata))
return ERROR;
memcpy(&metadata, data, sizeof(rpiMetadata));
return OK;
}
MdParser::Status MdParserRPi::GetExposureLines(unsigned int &lines)
{
lines = metadata.exposure;
return OK;
}
MdParser::Status MdParserRPi::GetGainCode(unsigned int &gain_code)
{
gain_code = metadata.gain;
return OK;
}

32
src/ipa/raspberrypi/md_parser_rpi.hpp
View file

@ -1,32 +0,0 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright (C) 2019, Raspberry Pi (Trading) Limited
*
* md_parser_rpi.hpp - Raspberry Pi metadata parser interface
*/
#pragma once
#include "md_parser.hpp"
namespace RPiController {
class MdParserRPi : public MdParser
{
public:
MdParserRPi();
Status Parse(void *data) override;
Status GetExposureLines(unsigned int &lines) override;
Status GetGainCode(unsigned int &gain_code) override;
private:
// This must be the same struct that is filled into the metadata buffer
// in the pipeline handler.
struct rpiMetadata
{
uint32_t exposure;
uint32_t gain;
};
rpiMetadata metadata;
};
}

1
src/ipa/raspberrypi/meson.build
View file

@ -17,7 +17,6 @@ rpi_ipa_includes = [
rpi_ipa_sources = files([
'raspberrypi.cpp',
'md_parser.cpp',
'md_parser_rpi.cpp',
'cam_helper.cpp',
'cam_helper_ov5647.cpp',
'cam_helper_imx219.cpp',