colin/Megapixels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert to sRGB for preview

Browse Source
This commit is contained in:
Martijn Braam
2020-10-07 01:51:38 +02:00
parent 985aa00fd2
commit ed8d390bfc
7 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/pine64,pinephone-1.0.ini
View File

@@ -12,7 +12,7 @@ fmt=BGGR8
rotate=270 rotate=270
colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050
forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693
blacklevel=10 blacklevel=3
whitelevel=255 whitelevel=255
focallength=3.33 focallength=3.33
cropfactor=10.81 cropfactor=10.81

2
config/pine64,pinephone-1.1.ini
View File

@@ -12,7 +12,7 @@ fmt=BGGR8
rotate=270 rotate=270
colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050
forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693
blacklevel=10 blacklevel=3
whitelevel=255 whitelevel=255
focallength=3.33 focallength=3.33
cropfactor=10.81 cropfactor=10.81

2
config/pine64,pinephone-1.2.ini
View File

@@ -12,7 +12,7 @@ fmt=BGGR8
rotate=270 rotate=270
colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050
forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693
blacklevel=10 blacklevel=3
whitelevel=255 whitelevel=255
focallength=3.33 focallength=3.33
cropfactor=10.81 cropfactor=10.81

2
config/pine64,pinetab.ini
View File

@@ -12,7 +12,7 @@ fmt=BGGR8
rotate=270 rotate=270
colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050 colormatrix=1.384,-0.3203,-0.0124,-0.2728,1.049,0.1556,-0.0506,0.2577,0.8050
forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693 forwardmatrix=0.7331,0.1294,0.1018,0.3039,0.6698,0.0263,0.0002,0.0556,0.7693
blacklevel=10 blacklevel=3
whitelevel=255 whitelevel=255
focallength=3.33 focallength=3.33
cropfactor=10.81 cropfactor=10.81

6
main.c
View File

@@ -97,7 +97,7 @@ static int auto_exposure = 1;
static int exposure = 1; static int exposure = 1;
static int auto_gain = 1; static int auto_gain = 1;
static int gain = 1; static int gain = 1;
static int burst_length = 5; static int burst_length = 10;
static char burst_dir[23]; static char burst_dir[23];
static char processing_script[512]; static char processing_script[512];
static enum user_control current_control; static enum user_control current_control;
@@ -606,7 +606,7 @@ process_image(const int *p, int size)
} }
pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, current.width / (skip*2), current.height / (skip*2)); pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, current.width / (skip*2), current.height / (skip*2));
pixels = gdk_pixbuf_get_pixels(pixbuf); pixels = gdk_pixbuf_get_pixels(pixbuf);
quick_debayer_bggr8((const uint8_t *)p, pixels, current.width, current.height, skip); quick_debayer_bggr8((const uint8_t *)p, pixels, current.width, current.height, skip, current.blacklevel);
if (current.rotate == 0) { if (current.rotate == 0) {
pixbufrot = pixbuf; pixbufrot = pixbuf;
@@ -761,7 +761,7 @@ process_image(const int *p, int size)
// Update the thumbnail if this is the last frame // Update the thumbnail if this is the last frame
pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, current.width / (skip*2), current.height / (skip*2)); pixbuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, current.width / (skip*2), current.height / (skip*2));
pixels = gdk_pixbuf_get_pixels(pixbuf); pixels = gdk_pixbuf_get_pixels(pixbuf);
quick_debayer_bggr8((const uint8_t *)p, pixels, current.width, current.height, skip); quick_debayer_bggr8((const uint8_t *)p, pixels, current.width, current.height, skip, current.blacklevel);
if (current.rotate == 0) { if (current.rotate == 0) {
pixbufrot = pixbuf; pixbufrot = pixbuf;

27
quickdebayer.c
View File

@@ -4,7 +4,7 @@
// doesn't interpolate any values at all // doesn't interpolate any values at all
void void
quick_debayer_bggr8(const uint8_t *source, uint8_t *destination, int width, int height, int skip) quick_debayer_bggr8(const uint8_t *source, uint8_t *destination, int width, int height, int skip, int blacklevel)
{ {
int byteskip = 2 * skip; int byteskip = 2 * skip;
int input_size = width * height; int input_size = width * height;
@@ -13,12 +13,31 @@ quick_debayer_bggr8(const uint8_t *source, uint8_t *destination, int width, int
int j=0; int j=0;
int row_left = width; int row_left = width;
// Linear -> sRGB lookup table
static 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
};
// B G // B G
// G R // G R
for(i=0;i<input_size;) { for(i=0;i<input_size;) {
destination[j++] = source[i+width+1]; destination[j++] = srgb[source[i+width+1] - blacklevel];
destination[j++] = source[i+1]; destination[j++] = srgb[source[i+1] - blacklevel];
destination[j++] = source[i]; destination[j++] = srgb[source[i] - blacklevel];
i = i + byteskip; i = i + byteskip;
row_left = row_left - byteskip; row_left = row_left - byteskip;
if(row_left < byteskip){ if(row_left < byteskip){

2
quickdebayer.h
View File

@@ -1,4 +1,4 @@
#include <stdint.h> #include <stdint.h>
void quick_debayer_bggr8(const uint8_t *source, uint8_t *destination, int width, int height, int skip); void quick_debayer_bggr8(const uint8_t *source, uint8_t *destination, int width, int height, int skip, int blacklevel);