diff --git a/camera_config.c b/camera_config.c index 2a8284d..36eff8d 100644 --- a/camera_config.c +++ b/camera_config.c @@ -2,6 +2,7 @@ #include "ini.h" #include "config.h" +#include "matrix.h" #include #include #include @@ -227,6 +228,15 @@ config_ini_handler(void *user, const char *section, const char *name, return 1; } +void +calculate_matrices() { + for (size_t i = 0; i < MP_MAX_CAMERAS; ++i) { + if (cameras[i].colormatrix != NULL && cameras[i].forwardmatrix != NULL) { + multiply_matrices(cameras[i].colormatrix, cameras[i].forwardmatrix, cameras[i].previewmatrix); + } + } +} + bool mp_load_config() { char file[512]; if (!find_config(file)) { @@ -237,14 +247,20 @@ bool mp_load_config() { int result = ini_parse(file, config_ini_handler, NULL); if (result == -1) { g_printerr("Config file not found\n"); - } else if (result == -2) { + return false; + } + if (result == -2) { g_printerr("Could not allocate memory to parse config file\n"); - } else if (result != 0) { - g_printerr("Could not parse config file\n"); - } else { - return true; + return false; } - return false; + if (result != 0) { + g_printerr("Could not parse config file\n"); + return false; + } + + calculate_matrices(); + + return true; } const char * mp_get_device_make() diff --git a/camera_config.h b/camera_config.h index b2bb070..10817ae 100644 --- a/camera_config.h +++ b/camera_config.h @@ -32,6 +32,7 @@ struct mp_camera_config { float colormatrix[9]; float forwardmatrix[9]; + float previewmatrix[9]; int blacklevel; int whitelevel; diff --git a/matrix.c b/matrix.c new file mode 100644 index 0000000..f2f0607 --- /dev/null +++ b/matrix.c @@ -0,0 +1,15 @@ +void +multiply_matrices(float a[9], float b[9], float out[9]) { + // zero out target matrix + for(int i=0; i<9; i++) { + out[i] = 0; + } + + for(int i=0; i<3; i++) { + for(int j=0; j<3; j++) { + for(int k=0; k<3; k++) { + out[i*3+j] += a[i*3+k] * b[k*3+j]; + } + } + } +} diff --git a/matrix.h b/matrix.h new file mode 100644 index 0000000..19a705d --- /dev/null +++ b/matrix.h @@ -0,0 +1 @@ +void multiply_matrices(float a[9], float b[9], float out[9]); diff --git a/meson.build b/meson.build index 71e1969..5578c43 100644 --- a/meson.build +++ b/meson.build @@ -21,7 +21,7 @@ if get_option('buildtype') == 'debug' add_global_arguments('-DDEBUG', language: 'c') endif -executable('megapixels', 'main.c', 'ini.c', 'quickpreview.c', 'camera.c', 'device.c', 'pipeline.c', 'camera_config.c', 'io_pipeline.c', 'process_pipeline.c', resources, dependencies : [gtkdep, libm, tiff, threads], install : true) +executable('megapixels', 'main.c', 'ini.c', 'quickpreview.c', 'camera.c', 'device.c', 'pipeline.c', 'camera_config.c', 'io_pipeline.c', 'process_pipeline.c', 'matrix.c', resources, dependencies : [gtkdep, libm, tiff, threads], install : true) install_data(['data/org.postmarketos.Megapixels.desktop'], install_dir : get_option('datadir') / 'applications') diff --git a/process_pipeline.c b/process_pipeline.c index 19279fa..0bc8dca 100644 --- a/process_pipeline.c +++ b/process_pipeline.c @@ -158,7 +158,7 @@ process_image_for_preview(const MPImage *image) image->pixel_format, camera->rotate, camera->mirrored, - camera->colormatrix[0] == 0 ? NULL : camera->colormatrix, + camera->previewmatrix[0] == 0 ? NULL : camera->previewmatrix, camera->blacklevel, skip); diff --git a/quickpreview.c b/quickpreview.c index dc987b4..7f56fee 100644 --- a/quickpreview.c +++ b/quickpreview.c @@ -7,28 +7,6 @@ #include #include -/* Linear -> sRGB lookup table */ -static const int srgb[] = { - 0, 12, 21, 28, 33, 38, 42, 46, 49, 52, 55, 58, 61, 63, 66, 68, 70, - 73, 75, 77, 79, 81, 82, 84, 86, 88, 89, 91, 93, 94, 96, 97, 99, 100, - 102, 103, 104, 106, 107, 109, 110, 111, 112, 114, 115, 116, 117, 118, - 120, 121, 122, 123, 124, 125, 126, 127, 129, 130, 131, 132, 133, 134, - 135, 136, 137, 138, 139, 140, 141, 142, 142, 143, 144, 145, 146, 147, - 148, 149, 150, 151, 151, 152, 153, 154, 155, 156, 157, 157, 158, 159, - 160, 161, 161, 162, 163, 164, 165, 165, 166, 167, 168, 168, 169, 170, - 171, 171, 172, 173, 174, 174, 175, 176, 176, 177, 178, 179, 179, 180, - 181, 181, 182, 183, 183, 184, 185, 185, 186, 187, 187, 188, 189, 189, - 190, 191, 191, 192, 193, 193, 194, 194, 195, 196, 196, 197, 197, 198, - 199, 199, 200, 201, 201, 202, 202, 203, 204, 204, 205, 205, 206, 206, - 207, 208, 208, 209, 209, 210, 210, 211, 212, 212, 213, 213, 214, 214, - 215, 215, 216, 217, 217, 218, 218, 219, 219, 220, 220, 221, 221, 222, - 222, 223, 223, 224, 224, 225, 226, 226, 227, 227, 228, 228, 229, 229, - 230, 230, 231, 231, 232, 232, 233, 233, 234, 234, 235, 235, 236, 236, - 237, 237, 237, 238, 238, 239, 239, 240, 240, 241, 241, 242, 242, 243, - 243, 244, 244, 245, 245, 245, 246, 246, 247, 247, 248, 248, 249, 249, - 250, 250, 251, 251, 251, 252, 252, 253, 253, 254, 254, 255 -}; - static inline uint32_t pack_rgb(uint8_t r, uint8_t g, uint8_t b) { return (r << 16) | (g << 8) | b; @@ -110,9 +88,9 @@ static void quick_preview_rggb8( while (src_x < src_width) { uint32_t src_i = src_y * src_width + src_x; - uint8_t b0 = srgb[src[src_i] - blacklevel]; - uint8_t b1 = srgb[src[src_i + 1] - blacklevel]; - uint8_t b2 = srgb[src[src_i + src_width + 1] - blacklevel]; + uint8_t b0 = src[src_i] - blacklevel; + uint8_t b1 = src[src_i + 1] - blacklevel; + uint8_t b2 = src[src_i + src_width + 1] - blacklevel; uint32_t color; switch (format) { @@ -169,9 +147,9 @@ static void quick_preview_rggb10( while (src_x < width_bytes) { uint32_t src_i = src_y * width_bytes + src_x; - uint8_t b0 = srgb[src[src_i] - blacklevel]; - uint8_t b1 = srgb[src[src_i + 1] - blacklevel]; - uint8_t b2 = srgb[src[src_i + width_bytes + 1] - blacklevel]; + uint8_t b0 = src[src_i] - blacklevel; + uint8_t b1 = src[src_i + 1] - blacklevel; + uint8_t b2 = src[src_i + width_bytes + 1] - blacklevel; uint32_t color; switch (format) {