From cd6ae3f99c1ef3b056af87ad719289635720cbe1 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Thu, 27 Jun 2024 14:02:54 +0200 Subject: [PATCH] libpisp: Remove pisp_types.h The pips_types.h header has been absorbed in pisp_common.h by the mainline driver version. Drop it from libpisp as well. Signed-off-by: Jacopo Mondi --- src/libpisp/common/meson.build | 1 - src/libpisp/common/pisp_types.h | 155 ------------------------------ src/libpisp/frontend/frontend.hpp | 2 +- 3 files changed, 1 insertion(+), 157 deletions(-) delete mode 100644 src/libpisp/common/pisp_types.h diff --git a/src/libpisp/common/meson.build b/src/libpisp/common/meson.build index 5798802..ea327c6 100644 --- a/src/libpisp/common/meson.build +++ b/src/libpisp/common/meson.build @@ -10,7 +10,6 @@ pisp_sources += files([ common_headers = files([ 'pisp_common.h', 'logging.hpp', - 'pisp_types.h', 'shm_mutex.hpp', 'utils.hpp', 'version.hpp', diff --git a/src/libpisp/common/pisp_types.h b/src/libpisp/common/pisp_types.h deleted file mode 100644 index 2b95387..0000000 --- a/src/libpisp/common/pisp_types.h +++ /dev/null @@ -1,155 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ -/* - * Copyright (C) 2021 - 2023, Raspberry Pi Ltd - * - * pisp_types.h - Raspberry Pi PiSP common types - */ -#pragma once - -#include -#include - -/* This definition must match the format description in the hardware exactly! */ -typedef struct { - /* size in pixels */ - uint16_t width, height; - /* must match struct pisp_image_format below */ - uint32_t format; - int32_t stride; - /* some planar image formats will need a second stride */ - int32_t stride2; -} pisp_image_format_config; - -static_assert(sizeof(pisp_image_format_config) == 16, "pisp_image_format_config not packed as expected"); - -typedef enum { - PISP_FAIL = -1, // generic failure code - PISP_SUCCESS = 0 - // other more specific failure codes here... -} pisp_status; - -typedef enum { - /* - * Note how bayer_order&1 tells you if G is on the even pixels of the - * checkerboard or not, and bayer_order&2 tells you if R is on the even - * rows or is swapped with B. Note that if the top (of the 8) bits is - * set, this denotes a monochrome or greyscale image, and the lower bits - * should all be ignored. - */ - PISP_BAYER_ORDER_RGGB = 0, - PISP_BAYER_ORDER_GBRG = 1, - PISP_BAYER_ORDER_BGGR = 2, - PISP_BAYER_ORDER_GRBG = 3, - PISP_BAYER_ORDER_GREYSCALE = 128 -} pisp_bayer_order; - -typedef enum { - /* - * Precise values are mostly tbd. Generally these will be portmanteau - * values comprising bit fields and flags. This format must be shared - * throughout the PiSP. - */ - PISP_IMAGE_FORMAT_BPS_8 = 0x00000000, - PISP_IMAGE_FORMAT_BPS_10 = 0x00000001, - PISP_IMAGE_FORMAT_BPS_12 = 0x00000002, - PISP_IMAGE_FORMAT_BPS_16 = 0x00000003, - PISP_IMAGE_FORMAT_BPS_MASK = 0x00000003, - - PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED = 0x00000000, - PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR = 0x00000010, - PISP_IMAGE_FORMAT_PLANARITY_PLANAR = 0x00000020, - PISP_IMAGE_FORMAT_PLANARITY_MASK = 0x00000030, - - PISP_IMAGE_FORMAT_SAMPLING_444 = 0x00000000, - PISP_IMAGE_FORMAT_SAMPLING_422 = 0x00000100, - PISP_IMAGE_FORMAT_SAMPLING_420 = 0x00000200, - PISP_IMAGE_FORMAT_SAMPLING_MASK = 0x00000300, - - PISP_IMAGE_FORMAT_ORDER_NORMAL = 0x00000000, - PISP_IMAGE_FORMAT_ORDER_SWAPPED = 0x00001000, - - PISP_IMAGE_FORMAT_SHIFT_0 = 0x00000000, - PISP_IMAGE_FORMAT_SHIFT_1 = 0x00010000, - PISP_IMAGE_FORMAT_SHIFT_2 = 0x00020000, - PISP_IMAGE_FORMAT_SHIFT_3 = 0x00030000, - PISP_IMAGE_FORMAT_SHIFT_4 = 0x00040000, - PISP_IMAGE_FORMAT_SHIFT_5 = 0x00050000, - PISP_IMAGE_FORMAT_SHIFT_6 = 0x00060000, - PISP_IMAGE_FORMAT_SHIFT_7 = 0x00070000, - PISP_IMAGE_FORMAT_SHIFT_8 = 0x00080000, - PISP_IMAGE_FORMAT_SHIFT_MASK = 0x000f0000, - - PISP_IMAGE_FORMAT_BPP_32 = 0x00100000, - PISP_IMAGE_FORMAT_X_VALUE = 0x00200000, - - PISP_IMAGE_FORMAT_UNCOMPRESSED = 0x00000000, - PISP_IMAGE_FORMAT_COMPRESSION_MODE_1 = 0x01000000, - PISP_IMAGE_FORMAT_COMPRESSION_MODE_2 = 0x02000000, - PISP_IMAGE_FORMAT_COMPRESSION_MODE_3 = 0x03000000, - PISP_IMAGE_FORMAT_COMPRESSION_MASK = 0x03000000, - - PISP_IMAGE_FORMAT_HOG_SIGNED = 0x04000000, - PISP_IMAGE_FORMAT_HOG_UNSIGNED = 0x08000000, - PISP_IMAGE_FORMAT_INTEGRAL_IMAGE = 0x10000000, - PISP_IMAGE_FORMAT_WALLPAPER_ROLL = 0x20000000, - PISP_IMAGE_FORMAT_THREE_CHANNEL = 0x40000000, - - /* Lastly a few specific instantiations of the above. */ - PISP_IMAGE_FORMAT_SINGLE_16 = PISP_IMAGE_FORMAT_BPS_16, - PISP_IMAGE_FORMAT_THREE_16 = - PISP_IMAGE_FORMAT_BPS_16 | PISP_IMAGE_FORMAT_THREE_CHANNEL -} pisp_image_format; - -#define PISP_IMAGE_FORMAT_bps_8(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_8) -#define PISP_IMAGE_FORMAT_bps_10(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_10) -#define PISP_IMAGE_FORMAT_bps_12(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_12) -#define PISP_IMAGE_FORMAT_bps_16(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_16) -#define PISP_IMAGE_FORMAT_bps(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) ? \ - 8 + (2 << (((fmt)&PISP_IMAGE_FORMAT_BPS_MASK) - 1)) : \ - 8) -#define PISP_IMAGE_FORMAT_shift(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_SHIFT_MASK) / PISP_IMAGE_FORMAT_SHIFT_1) -#define PISP_IMAGE_FORMAT_three_channel(fmt) \ - ((fmt)&PISP_IMAGE_FORMAT_THREE_CHANNEL) -#define PISP_IMAGE_FORMAT_single_channel(fmt) \ - (!((fmt)&PISP_IMAGE_FORMAT_THREE_CHANNEL)) -#define PISP_IMAGE_FORMAT_compressed(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_COMPRESSION_MASK) != \ - PISP_IMAGE_FORMAT_UNCOMPRESSED) -#define PISP_IMAGE_FORMAT_sampling_444(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_SAMPLING_MASK) == \ - PISP_IMAGE_FORMAT_SAMPLING_444) -#define PISP_IMAGE_FORMAT_sampling_422(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_SAMPLING_MASK) == \ - PISP_IMAGE_FORMAT_SAMPLING_422) -#define PISP_IMAGE_FORMAT_sampling_420(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_SAMPLING_MASK) == \ - PISP_IMAGE_FORMAT_SAMPLING_420) -#define PISP_IMAGE_FORMAT_order_normal(fmt) \ - (!((fmt)&PISP_IMAGE_FORMAT_ORDER_SWAPPED)) -#define PISP_IMAGE_FORMAT_order_swapped(fmt) \ - ((fmt)&PISP_IMAGE_FORMAT_ORDER_SWAPPED) -#define PISP_IMAGE_FORMAT_bpp_32(fmt) ((fmt)&PISP_IMAGE_FORMAT_BPP_32) -#define PISP_IMAGE_FORMAT_x_value(fmt) (((fmt)&PISP_IMAGE_FORMAT_X_VALUE) ? 255 : 0) - -#define PISP_IMAGE_FORMAT_interleaved(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_PLANARITY_MASK) == \ - PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED) -#define PISP_IMAGE_FORMAT_semiplanar(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_PLANARITY_MASK) == \ - PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR) -#define PISP_IMAGE_FORMAT_planar(fmt) \ - (((fmt)&PISP_IMAGE_FORMAT_PLANARITY_MASK) == \ - PISP_IMAGE_FORMAT_PLANARITY_PLANAR) -#define PISP_IMAGE_FORMAT_wallpaper(fmt) \ - ((fmt)&PISP_IMAGE_FORMAT_WALLPAPER_ROLL) -#define PISP_IMAGE_FORMAT_HOG(fmt) \ - ((fmt) & \ - (PISP_IMAGE_FORMAT_HOG_SIGNED | PISP_IMAGE_FORMAT_HOG_UNSIGNED)) - -#define PISP_WALLPAPER_WIDTH 128 // in bytes diff --git a/src/libpisp/frontend/frontend.hpp b/src/libpisp/frontend/frontend.hpp index 2d3998e..dc8f042 100644 --- a/src/libpisp/frontend/frontend.hpp +++ b/src/libpisp/frontend/frontend.hpp @@ -10,7 +10,7 @@ #include #include -#include "common/pisp_types.h" +#include "common/pisp_common.h" #include "common/shm_mutex.hpp" #include "variants/variant.hpp"