From 12350a90e8f4b0ca7bffa654f12fefd3ed525611 Mon Sep 17 00:00:00 2001 From: Naushir Patuck Date: Mon, 14 Jun 2021 10:53:37 +0100 Subject: ipa: raspberrypi: Rename md_parser.cpp to md_parser_smia.cpp The file implements the MdParserSmia class, so change the file name to reflect this. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/ipa/raspberrypi/md_parser.cpp | 102 --------------------------------- src/ipa/raspberrypi/md_parser_smia.cpp | 102 +++++++++++++++++++++++++++++++++ src/ipa/raspberrypi/meson.build | 2 +- 3 files changed, 103 insertions(+), 103 deletions(-) delete mode 100644 src/ipa/raspberrypi/md_parser.cpp create mode 100644 src/ipa/raspberrypi/md_parser_smia.cpp (limited to 'src') diff --git a/src/ipa/raspberrypi/md_parser.cpp b/src/ipa/raspberrypi/md_parser.cpp deleted file mode 100644 index 852a1d34..00000000 --- a/src/ipa/raspberrypi/md_parser.cpp +++ /dev/null @@ -1,102 +0,0 @@ -/* SPDX-License-Identifier: BSD-2-Clause */ -/* - * Copyright (C) 2019, Raspberry Pi (Trading) Limited - * - * md_parser.cpp - image sensor metadata parsers - */ - -#include -#include -#include - -#include "md_parser.hpp" - -using namespace RPiController; - -// This function goes through the embedded data to find the offsets (not -// values!), in the data block, where the values of the given registers can -// subsequently be found. - -// Embedded data tag bytes, from Sony IMX219 datasheet but general to all SMIA -// sensors, I think. - -#define LINE_START 0x0a -#define LINE_END_TAG 0x07 -#define REG_HI_BITS 0xaa -#define REG_LOW_BITS 0xa5 -#define REG_VALUE 0x5a -#define REG_SKIP 0x55 - -MdParserSmia::ParseStatus MdParserSmia::findRegs(libcamera::Span buffer, - uint32_t regs[], int offsets[], - unsigned int num_regs) -{ - assert(num_regs > 0); - - if (buffer[0] != LINE_START) - return NO_LINE_START; - - unsigned int current_offset = 1; // after the LINE_START - unsigned int current_line_start = 0, current_line = 0; - unsigned int reg_num = 0, first_reg = 0; - ParseStatus retcode = PARSE_OK; - while (1) { - int tag = buffer[current_offset++]; - if ((bits_per_pixel_ == 10 && - (current_offset + 1 - current_line_start) % 5 == 0) || - (bits_per_pixel_ == 12 && - (current_offset + 1 - current_line_start) % 3 == 0)) { - if (buffer[current_offset++] != REG_SKIP) - return BAD_DUMMY; - } - int data_byte = buffer[current_offset++]; - //printf("Offset %u, tag 0x%02x data_byte 0x%02x\n", current_offset-1, tag, data_byte); - if (tag == LINE_END_TAG) { - if (data_byte != LINE_END_TAG) - return BAD_LINE_END; - if (num_lines_ && ++current_line == num_lines_) - return MISSING_REGS; - if (line_length_bytes_) { - current_offset = - current_line_start + line_length_bytes_; - // Require whole line to be in the buffer (if buffer size set). - if (buffer.size() && - current_offset + line_length_bytes_ > - buffer.size()) - return MISSING_REGS; - if (buffer[current_offset] != LINE_START) - return NO_LINE_START; - } else { - // allow a zero line length to mean "hunt for the next line" - while (buffer[current_offset] != LINE_START && - current_offset < buffer.size()) - current_offset++; - if (current_offset == buffer.size()) - return NO_LINE_START; - } - // inc current_offset to after LINE_START - current_line_start = - current_offset++; - } else { - if (tag == REG_HI_BITS) - reg_num = (reg_num & 0xff) | (data_byte << 8); - else if (tag == REG_LOW_BITS) - reg_num = (reg_num & 0xff00) | data_byte; - else if (tag == REG_SKIP) - reg_num++; - else if (tag == REG_VALUE) { - while (reg_num >= - // assumes registers are in order... - regs[first_reg]) { - if (reg_num == regs[first_reg]) - offsets[first_reg] = - current_offset - 1; - if (++first_reg == num_regs) - return retcode; - } - reg_num++; - } else - return ILLEGAL_TAG; - } - } -} diff --git a/src/ipa/raspberrypi/md_parser_smia.cpp b/src/ipa/raspberrypi/md_parser_smia.cpp new file mode 100644 index 00000000..852a1d34 --- /dev/null +++ b/src/ipa/raspberrypi/md_parser_smia.cpp @@ -0,0 +1,102 @@ +/* SPDX-License-Identifier: BSD-2-Clause */ +/* + * Copyright (C) 2019, Raspberry Pi (Trading) Limited + * + * md_parser.cpp - image sensor metadata parsers + */ + +#include +#include +#include + +#include "md_parser.hpp" + +using namespace RPiController; + +// This function goes through the embedded data to find the offsets (not +// values!), in the data block, where the values of the given registers can +// subsequently be found. + +// Embedded data tag bytes, from Sony IMX219 datasheet but general to all SMIA +// sensors, I think. + +#define LINE_START 0x0a +#define LINE_END_TAG 0x07 +#define REG_HI_BITS 0xaa +#define REG_LOW_BITS 0xa5 +#define REG_VALUE 0x5a +#define REG_SKIP 0x55 + +MdParserSmia::ParseStatus MdParserSmia::findRegs(libcamera::Span buffer, + uint32_t regs[], int offsets[], + unsigned int num_regs) +{ + assert(num_regs > 0); + + if (buffer[0] != LINE_START) + return NO_LINE_START; + + unsigned int current_offset = 1; // after the LINE_START + unsigned int current_line_start = 0, current_line = 0; + unsigned int reg_num = 0, first_reg = 0; + ParseStatus retcode = PARSE_OK; + while (1) { + int tag = buffer[current_offset++]; + if ((bits_per_pixel_ == 10 && + (current_offset + 1 - current_line_start) % 5 == 0) || + (bits_per_pixel_ == 12 && + (current_offset + 1 - current_line_start) % 3 == 0)) { + if (buffer[current_offset++] != REG_SKIP) + return BAD_DUMMY; + } + int data_byte = buffer[current_offset++]; + //printf("Offset %u, tag 0x%02x data_byte 0x%02x\n", current_offset-1, tag, data_byte); + if (tag == LINE_END_TAG) { + if (data_byte != LINE_END_TAG) + return BAD_LINE_END; + if (num_lines_ && ++current_line == num_lines_) + return MISSING_REGS; + if (line_length_bytes_) { + current_offset = + current_line_start + line_length_bytes_; + // Require whole line to be in the buffer (if buffer size set). + if (buffer.size() && + current_offset + line_length_bytes_ > + buffer.size()) + return MISSING_REGS; + if (buffer[current_offset] != LINE_START) + return NO_LINE_START; + } else { + // allow a zero line length to mean "hunt for the next line" + while (buffer[current_offset] != LINE_START && + current_offset < buffer.size()) + current_offset++; + if (current_offset == buffer.size()) + return NO_LINE_START; + } + // inc current_offset to after LINE_START + current_line_start = + current_offset++; + } else { + if (tag == REG_HI_BITS) + reg_num = (reg_num & 0xff) | (data_byte << 8); + else if (tag == REG_LOW_BITS) + reg_num = (reg_num & 0xff00) | data_byte; + else if (tag == REG_SKIP) + reg_num++; + else if (tag == REG_VALUE) { + while (reg_num >= + // assumes registers are in order... + regs[first_reg]) { + if (reg_num == regs[first_reg]) + offsets[first_reg] = + current_offset - 1; + if (++first_reg == num_regs) + return retcode; + } + reg_num++; + } else + return ILLEGAL_TAG; + } + } +} diff --git a/src/ipa/raspberrypi/meson.build b/src/ipa/raspberrypi/meson.build index d1397a32..230356d3 100644 --- a/src/ipa/raspberrypi/meson.build +++ b/src/ipa/raspberrypi/meson.build @@ -16,7 +16,7 @@ rpi_ipa_includes = [ rpi_ipa_sources = files([ 'raspberrypi.cpp', - 'md_parser.cpp', + 'md_parser_smia.cpp', 'cam_helper.cpp', 'cam_helper_ov5647.cpp', 'cam_helper_imx219.cpp', -- cgit v1.2.1