[libcamera-devel] [PATCH v6 0/8] Replace boost JSON parser with libyaml in Raspberry Pi IPA

Naushir Patuck naush at raspberrypi.com
Mon Jul 18 10:15:54 CEST 2022


Hi,

A few changes in version 6 incorporating Laurent's suggestions, particularly:

- Added a "target" field in the version 2.0 format to differentiate different possible platforms
- Put the JSON parser custom encoder in ctt_pretty_print_json.py file in 6/8
- The convert_tuning.py script in 7/8 now simply imports the Encoder class from ctt_pretty_print_json.py
- A few further tweaks to the JSON formatting in 8/8.

I've left the "version" field as a double for now.  I don't have any strong
objections to making that a string if folks think it makes more sense.

Thanks,
Naush

Laurent Pinchart (4):
  test: yaml-parser: Test dictionary items ordering
  libcamera: yaml_parser: Preserve order of items in dictionary
  ipa: raspberrypi: Replace tabs with spaces in tuning data files
  ipa: raspberrypi: Use YamlParser to replace dependency on boost

Naushir Patuck (4):
  ipa: raspberrypi: Introduce version 2.0 format for the camera tuning
    file
  utils: raspberrypi: ctt: Output version 2.0 format tuning files
  utils: raspberrypi: Add tuning file conversion script
  ipa: raspberrypi: Convert existing cameara tuning files to version 2.0

 README.rst                                    |   6 -
 include/libcamera/internal/yaml_parser.h      |  37 +-
 src/ipa/raspberrypi/controller/algorithm.cpp  |   2 +-
 src/ipa/raspberrypi/controller/algorithm.hpp  |   6 +-
 src/ipa/raspberrypi/controller/controller.cpp |  60 +-
 src/ipa/raspberrypi/controller/controller.hpp |   4 +-
 src/ipa/raspberrypi/controller/pwl.cpp        |  12 +-
 src/ipa/raspberrypi/controller/pwl.hpp        |   5 +-
 src/ipa/raspberrypi/controller/rpi/agc.cpp    |  94 +-
 src/ipa/raspberrypi/controller/rpi/agc.hpp    |  10 +-
 src/ipa/raspberrypi/controller/rpi/alsc.cpp   |  94 +-
 src/ipa/raspberrypi/controller/rpi/alsc.hpp   |   2 +-
 src/ipa/raspberrypi/controller/rpi/awb.cpp    |  89 +-
 src/ipa/raspberrypi/controller/rpi/awb.hpp    |   8 +-
 .../controller/rpi/black_level.cpp            |  12 +-
 .../controller/rpi/black_level.hpp            |   2 +-
 src/ipa/raspberrypi/controller/rpi/ccm.cpp    |  28 +-
 src/ipa/raspberrypi/controller/rpi/ccm.hpp    |   4 +-
 .../raspberrypi/controller/rpi/contrast.cpp   |  18 +-
 .../raspberrypi/controller/rpi/contrast.hpp   |   2 +-
 src/ipa/raspberrypi/controller/rpi/dpc.cpp    |   4 +-
 src/ipa/raspberrypi/controller/rpi/dpc.hpp    |   2 +-
 src/ipa/raspberrypi/controller/rpi/geq.cpp    |  10 +-
 src/ipa/raspberrypi/controller/rpi/geq.hpp    |   2 +-
 src/ipa/raspberrypi/controller/rpi/lux.cpp    |  12 +-
 src/ipa/raspberrypi/controller/rpi/lux.hpp    |   2 +-
 src/ipa/raspberrypi/controller/rpi/noise.cpp  |   6 +-
 src/ipa/raspberrypi/controller/rpi/noise.hpp  |   2 +-
 src/ipa/raspberrypi/controller/rpi/sdn.cpp    |   6 +-
 src/ipa/raspberrypi/controller/rpi/sdn.hpp    |   2 +-
 .../raspberrypi/controller/rpi/sharpen.cpp    |   8 +-
 .../raspberrypi/controller/rpi/sharpen.hpp    |   2 +-
 src/ipa/raspberrypi/data/imx219.json          | 824 ++++++++--------
 src/ipa/raspberrypi/data/imx219_noir.json     | 686 +++++++-------
 src/ipa/raspberrypi/data/imx290.json          | 326 ++++---
 src/ipa/raspberrypi/data/imx296.json          | 369 ++++----
 src/ipa/raspberrypi/data/imx378.json          | 677 ++++++++------
 src/ipa/raspberrypi/data/imx477.json          | 881 ++++++++++--------
 src/ipa/raspberrypi/data/imx477_noir.json     | 734 ++++++++-------
 src/ipa/raspberrypi/data/imx519.json          | 677 ++++++++------
 src/ipa/raspberrypi/data/ov5647.json          | 824 ++++++++--------
 src/ipa/raspberrypi/data/ov5647_noir.json     | 686 +++++++-------
 src/ipa/raspberrypi/data/ov9281.json          | 195 ++--
 src/ipa/raspberrypi/data/se327m12.json        | 683 ++++++++------
 src/ipa/raspberrypi/data/uncalibrated.json    | 180 ++--
 src/ipa/raspberrypi/meson.build               |   1 -
 src/ipa/raspberrypi/raspberrypi.cpp           |   1 +
 src/libcamera/yaml_parser.cpp                 |  35 +-
 test/yaml-parser.cpp                          |  17 +-
 utils/raspberrypi/ctt/convert_tuning.py       |  46 +
 utils/raspberrypi/ctt/ctt.py                  |  18 +-
 .../raspberrypi/ctt/ctt_pretty_print_json.py  | 194 ++--
 52 files changed, 4752 insertions(+), 3855 deletions(-)
 create mode 100755 utils/raspberrypi/ctt/convert_tuning.py
 mode change 100644 => 100755 utils/raspberrypi/ctt/ctt_pretty_print_json.py

-- 
2.25.1



More information about the libcamera-devel mailing list