commit fd444fbfcd257003cfe5b45dcb9b210e79a81003
parent 2394f3f3353e52d37045b89eb1aba75e2584f636
Author: rbckman <robinbackman@gmail.com>
Date: Thu, 15 Nov 2018 10:45:38 +0200
new lens profile based on picamera v1
Diffstat:
12 files changed, 172 insertions(+), 9 deletions(-)
diff --git a/gui/Makefile.include b/gui/Makefile.include
@@ -1,9 +1,9 @@
CFLAGS+=-DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -g -DHAVE_LIBOPENMAX=2 -DOMX -DOMX_SKIP64BIT -ftree-vectorize -pipe -DUSE_EXTERNAL_OMX -DHAVE_LIBBCM_HOST -DUSE_EXTERNAL_LIBBCM_HOST -DUSE_VCHIQ_ARM -Wno-psabi
-LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -L$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont
+LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lbrcmGLESv2 -lbrcmEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L$(SDKSTAGE)/home/pi/tarina/gui/libs/ilclient -L$(SDKSTAGE)/home/pi/tarina/gui/libs/vgfont
-INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont
+INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/home/pi/tarina/gui/libs/ilclient -I$(SDKSTAGE)/home/pi/tarina/gui/libs/vgfont
all: $(BIN) $(LIB)
diff --git a/gui/libs/vgfont/libvgfont.a b/gui/libs/vgfont/libvgfont.a
Binary files differ.
diff --git a/gui/src/main.c b/gui/src/main.c
@@ -271,10 +271,10 @@ int main(void)
//fclose(fp3);
//const char *text = "Never give up on your dreams";
uint32_t y_offset2 = 0;
- uint32_t y_offset3 = 22;
- uint32_t y_offset4 = 44;
- uint32_t y_offset5 = 418;
- uint32_t y_offset6 = 440;
+ uint32_t y_offset3 = 21;
+ uint32_t y_offset4 = 42;
+ uint32_t y_offset5 = 421;
+ uint32_t y_offset6 = 442;
graphics_resource_fill(img, 0, 0, width, height, GRAPHICS_RGBA32(0,0,0,0xff));
// blue, at the top (y=40)
// selected 0 1 2 3 4 5 6 7 8
@@ -471,7 +471,7 @@ int main(void)
//graphics_update_displayed_resource(img, 0, 0, 0, 0);
}
}
- uint32_t y_offset = 460;
+ uint32_t y_offset = 463;
render_subtitle(img, vumeter, text_size, 0, y_offset, 5);
graphics_update_displayed_resource(img, 0, 0, 0, 0);
usleep(20000);
diff --git a/gui/tarinagui.bin b/gui/tarinagui.bin
Binary files differ.
diff --git a/lenses/cs6mm b/lenses/cs6mm
@@ -0,0 +1,133 @@
+uint8_t ls_grid[] = {
+//R - Ch 3
+44, 43, 42, 42, 41, 40, 40, 39, 38, 38, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 37, 37,
+44, 43, 42, 41, 41, 40, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 35, 36, 37, 37,
+43, 42, 42, 41, 40, 40, 39, 39, 38, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 36, 37,
+43, 42, 41, 41, 40, 40, 39, 39, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 35, 36, 36,
+42, 42, 41, 40, 39, 39, 39, 39, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35,
+42, 41, 41, 40, 39, 39, 38, 38, 38, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35,
+42, 41, 40, 39, 39, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 34, 34, 34,
+42, 41, 40, 40, 39, 38, 38, 37, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34, 34,
+41, 40, 40, 39, 39, 38, 38, 37, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 34, 34,
+41, 40, 39, 39, 38, 38, 37, 37, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+41, 40, 39, 39, 38, 38, 37, 37, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+40, 40, 39, 39, 38, 38, 37, 37, 37, 37, 36, 36, 36, 35, 35, 35, 35, 34, 34, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+41, 40, 39, 38, 38, 38, 37, 37, 37, 37, 36, 36, 36, 36, 35, 35, 35, 34, 34, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+40, 40, 39, 38, 38, 38, 37, 37, 37, 37, 36, 36, 36, 36, 35, 35, 35, 34, 34, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+40, 39, 39, 38, 38, 38, 37, 37, 37, 37, 37, 37, 36, 36, 36, 35, 35, 34, 34, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+40, 39, 39, 38, 38, 38, 37, 37, 37, 37, 37, 37, 36, 36, 36, 35, 35, 34, 34, 34, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+40, 40, 39, 39, 38, 38, 38, 37, 37, 37, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33,
+41, 40, 39, 39, 38, 38, 38, 38, 37, 37, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+41, 41, 40, 39, 38, 38, 38, 37, 37, 37, 37, 36, 36, 36, 36, 35, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33,
+41, 41, 40, 39, 39, 38, 38, 38, 37, 37, 37, 36, 36, 36, 36, 35, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33,
+41, 40, 40, 40, 39, 38, 38, 38, 37, 37, 37, 37, 36, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33,
+41, 41, 40, 40, 39, 39, 38, 38, 38, 37, 37, 37, 37, 36, 36, 36, 35, 35, 35, 35, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 32, 32, 33, 33, 33, 33, 33, 34, 34,
+42, 41, 41, 40, 39, 39, 39, 38, 38, 37, 37, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34,
+42, 42, 41, 40, 40, 39, 39, 38, 38, 38, 37, 37, 37, 37, 37, 36, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34,
+43, 42, 41, 41, 40, 40, 39, 38, 38, 38, 37, 37, 37, 37, 37, 36, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 36,
+43, 42, 42, 41, 40, 40, 40, 39, 38, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 35, 36, 36,
+44, 43, 42, 41, 41, 41, 41, 40, 39, 38, 38, 37, 37, 36, 36, 36, 36, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 37,
+44, 43, 42, 42, 41, 41, 41, 41, 39, 38, 38, 37, 37, 37, 37, 36, 36, 35, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 36, 36, 37,
+45, 44, 43, 42, 41, 41, 41, 40, 39, 39, 38, 38, 37, 37, 37, 37, 36, 35, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 37,
+45, 44, 43, 43, 42, 41, 40, 40, 40, 39, 38, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 37, 37, 37, 37, 38,
+46, 45, 44, 44, 42, 42, 41, 40, 40, 40, 39, 38, 38, 38, 37, 37, 37, 36, 36, 35, 35, 36, 35, 35, 35, 36, 36, 35, 35, 36, 36, 36, 36, 36, 36, 37, 38, 38, 38, 38, 38,
+//Gr - Ch 2
+52, 51, 50, 49, 48, 47, 46, 45, 45, 44, 43, 43, 43, 42, 42, 41, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 42, 42, 42, 43, 43, 44, 45, 45, 46, 46,
+52, 50, 49, 48, 47, 47, 46, 45, 44, 44, 43, 42, 42, 42, 41, 41, 40, 40, 40, 40, 39, 39, 39, 39, 39, 39, 40, 40, 40, 41, 41, 41, 42, 42, 43, 43, 44, 45, 45, 46, 46,
+51, 50, 49, 48, 47, 46, 46, 45, 44, 43, 42, 42, 41, 41, 40, 40, 40, 39, 39, 39, 39, 39, 38, 38, 39, 39, 39, 39, 40, 40, 40, 41, 41, 42, 42, 43, 44, 44, 45, 46, 45,
+50, 49, 49, 47, 46, 46, 46, 45, 44, 42, 42, 41, 40, 40, 40, 39, 39, 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 40, 40, 41, 41, 42, 43, 43, 44, 44, 45, 45,
+50, 49, 48, 47, 46, 45, 45, 44, 43, 42, 41, 40, 40, 39, 39, 38, 38, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 38, 38, 39, 39, 40, 40, 41, 41, 42, 43, 44, 44, 45, 45,
+50, 48, 47, 46, 45, 45, 44, 43, 42, 41, 40, 40, 39, 38, 38, 37, 37, 37, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 38, 39, 39, 39, 40, 41, 42, 43, 43, 44, 45, 44,
+49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 40, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 35, 35, 35, 36, 36, 36, 37, 37, 38, 38, 39, 40, 41, 42, 42, 43, 44, 44, 44,
+49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 38, 37, 36, 36, 36, 35, 35, 35, 35, 35, 34, 35, 35, 35, 35, 36, 36, 37, 37, 38, 39, 39, 40, 41, 42, 42, 43, 44, 44,
+49, 48, 46, 45, 44, 43, 43, 41, 41, 40, 39, 38, 37, 37, 36, 36, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 36, 36, 37, 38, 38, 39, 40, 41, 42, 42, 43, 44, 43,
+49, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 38, 37, 36, 36, 35, 35, 34, 34, 34, 34, 33, 33, 34, 34, 34, 34, 35, 35, 36, 37, 37, 38, 39, 39, 41, 41, 42, 43, 43, 44,
+48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 37, 36, 35, 35, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 35, 36, 36, 37, 38, 38, 39, 40, 41, 42, 43, 43, 43,
+48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 36, 35, 34, 34, 34, 33, 33, 32, 32, 32, 33, 33, 33, 34, 34, 35, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43, 43, 44,
+48, 47, 46, 45, 44, 42, 41, 40, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 36, 36, 37, 38, 39, 40, 41, 42, 43, 43, 44,
+48, 47, 46, 44, 43, 42, 41, 40, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 36, 37, 37, 38, 39, 40, 41, 41, 42, 43, 43,
+48, 47, 46, 44, 43, 42, 41, 40, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 32, 32, 32, 32, 32, 32, 32, 32, 33, 34, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42, 43, 43, 44,
+48, 47, 46, 45, 43, 42, 41, 41, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42, 42, 43, 43,
+48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 33, 33, 32, 32, 32, 32, 33, 33, 33, 34, 34, 35, 36, 36, 37, 38, 39, 40, 41, 42, 43, 43, 43,
+49, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 33, 33, 33, 32, 33, 33, 33, 33, 34, 34, 35, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43, 44, 44,
+49, 48, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 37, 36, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 33, 34, 34, 35, 35, 35, 36, 37, 38, 38, 39, 40, 41, 42, 43, 44, 43,
+49, 48, 47, 46, 44, 43, 42, 41, 40, 39, 38, 38, 37, 36, 36, 35, 35, 34, 34, 34, 33, 34, 34, 34, 34, 34, 34, 35, 35, 36, 36, 37, 38, 39, 39, 40, 41, 42, 43, 44, 44,
+49, 48, 47, 46, 44, 43, 42, 42, 41, 40, 39, 38, 37, 37, 36, 36, 35, 35, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 36, 37, 37, 38, 39, 40, 41, 41, 42, 43, 44, 43,
+49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 39, 38, 37, 37, 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 37, 38, 38, 39, 40, 41, 42, 42, 43, 44, 44,
+50, 49, 47, 46, 45, 44, 43, 42, 42, 41, 40, 39, 39, 38, 38, 37, 36, 36, 36, 35, 35, 35, 35, 35, 35, 36, 36, 36, 37, 37, 38, 38, 39, 39, 40, 41, 42, 43, 44, 44, 44,
+50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 41, 40, 39, 39, 39, 38, 37, 37, 36, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 38, 38, 39, 39, 40, 41, 41, 42, 43, 44, 44, 45,
+51, 50, 48, 47, 47, 46, 44, 44, 43, 42, 41, 41, 40, 40, 39, 39, 38, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 38, 38, 39, 39, 40, 40, 41, 42, 43, 43, 44, 45, 45,
+51, 50, 49, 48, 47, 46, 46, 44, 43, 43, 42, 41, 40, 40, 40, 39, 38, 38, 38, 37, 37, 37, 37, 37, 37, 38, 38, 38, 39, 39, 39, 40, 40, 41, 42, 42, 43, 44, 45, 45, 46,
+52, 51, 50, 49, 47, 48, 48, 46, 44, 43, 43, 42, 41, 41, 40, 40, 39, 39, 39, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 40, 40, 41, 41, 42, 42, 43, 44, 44, 45, 46, 46,
+53, 51, 50, 49, 48, 48, 48, 47, 45, 44, 43, 43, 42, 41, 41, 41, 40, 40, 39, 39, 39, 39, 39, 39, 39, 39, 40, 40, 40, 41, 41, 41, 42, 42, 43, 44, 44, 45, 46, 46, 46,
+53, 52, 51, 49, 48, 48, 48, 46, 45, 45, 44, 43, 43, 42, 42, 42, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 42, 42, 42, 43, 43, 44, 44, 45, 46, 46, 47, 46,
+53, 52, 51, 50, 49, 48, 47, 47, 46, 45, 45, 44, 43, 43, 43, 42, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 42, 42, 42, 42, 43, 43, 43, 44, 44, 45, 46, 47, 47, 47, 47,
+53, 52, 51, 51, 50, 49, 48, 48, 47, 47, 46, 46, 45, 44, 44, 44, 44, 43, 43, 43, 42, 43, 43, 43, 43, 43, 43, 43, 43, 44, 44, 45, 45, 45, 45, 46, 47, 48, 48, 49, 47,
+//Gb - Ch 1
+52, 51, 50, 49, 48, 47, 46, 45, 44, 44, 43, 42, 42, 42, 41, 41, 40, 40, 40, 39, 39, 39, 39, 40, 40, 40, 40, 40, 40, 41, 41, 42, 42, 43, 43, 43, 44, 45, 46, 46, 46,
+52, 50, 49, 48, 47, 46, 46, 45, 44, 43, 43, 42, 42, 41, 41, 40, 40, 40, 39, 39, 39, 39, 39, 39, 39, 39, 39, 40, 40, 40, 41, 41, 42, 42, 43, 43, 44, 45, 46, 46, 46,
+51, 50, 49, 48, 47, 46, 46, 45, 44, 43, 42, 42, 41, 41, 40, 40, 39, 39, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 40, 40, 40, 41, 41, 42, 42, 43, 44, 45, 45, 46, 46,
+51, 50, 48, 47, 46, 46, 46, 45, 44, 42, 42, 41, 40, 40, 39, 39, 38, 38, 38, 37, 37, 37, 37, 37, 38, 38, 38, 39, 39, 39, 40, 40, 41, 41, 42, 43, 44, 44, 45, 45, 46,
+50, 49, 48, 47, 46, 45, 45, 44, 43, 42, 41, 40, 40, 39, 38, 38, 38, 37, 37, 37, 37, 37, 37, 37, 37, 37, 37, 38, 38, 39, 39, 40, 40, 41, 42, 42, 43, 44, 44, 45, 45,
+50, 49, 48, 46, 46, 45, 44, 43, 42, 41, 40, 40, 39, 38, 38, 37, 37, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 38, 39, 39, 40, 40, 41, 42, 43, 43, 44, 45, 45,
+50, 48, 47, 46, 45, 44, 43, 42, 41, 41, 40, 39, 38, 38, 37, 37, 36, 36, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 37, 37, 38, 39, 39, 40, 41, 42, 43, 43, 44, 45, 45,
+50, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 38, 37, 36, 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 38, 38, 39, 39, 41, 42, 42, 43, 44, 44, 45,
+49, 48, 47, 45, 44, 43, 42, 41, 41, 40, 39, 38, 37, 37, 36, 36, 35, 35, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 37, 37, 38, 38, 39, 40, 41, 42, 43, 43, 44, 44,
+49, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 38, 37, 36, 36, 35, 35, 34, 34, 34, 33, 33, 33, 33, 34, 34, 34, 35, 35, 36, 37, 37, 38, 39, 40, 41, 42, 42, 43, 44, 45,
+48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 37, 36, 35, 35, 34, 34, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 36, 36, 37, 38, 39, 39, 40, 41, 42, 43, 44, 44,
+48, 47, 46, 45, 44, 43, 42, 40, 40, 39, 38, 37, 36, 35, 35, 34, 34, 34, 33, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43, 44, 44,
+48, 47, 46, 45, 43, 42, 41, 41, 40, 39, 38, 37, 36, 35, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 36, 36, 37, 38, 39, 40, 41, 42, 43, 44, 44,
+48, 47, 46, 45, 43, 42, 41, 40, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42, 43, 43, 44,
+48, 47, 46, 44, 43, 42, 41, 40, 40, 39, 38, 37, 36, 36, 35, 34, 33, 33, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 36, 37, 38, 38, 39, 40, 41, 42, 43, 43, 44,
+48, 47, 46, 45, 43, 42, 41, 40, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 32, 32, 32, 32, 32, 32, 32, 33, 33, 34, 34, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43, 44, 44,
+48, 47, 46, 45, 44, 42, 41, 41, 40, 39, 38, 37, 36, 36, 35, 34, 34, 33, 33, 33, 32, 32, 32, 32, 33, 33, 33, 34, 35, 35, 36, 37, 37, 38, 39, 40, 41, 42, 43, 44, 44,
+49, 47, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, 36, 35, 34, 34, 34, 33, 33, 33, 32, 33, 33, 33, 33, 34, 34, 35, 35, 36, 37, 38, 38, 39, 40, 41, 42, 43, 44, 44,
+49, 48, 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, 37, 36, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 33, 34, 34, 35, 35, 36, 36, 37, 38, 38, 39, 40, 41, 42, 43, 44, 44,
+49, 48, 47, 46, 44, 43, 42, 41, 40, 39, 38, 38, 37, 36, 36, 35, 35, 34, 34, 34, 33, 33, 34, 34, 34, 34, 34, 35, 35, 36, 37, 37, 38, 39, 40, 40, 41, 42, 43, 44, 44,
+49, 48, 47, 46, 44, 43, 42, 41, 41, 40, 39, 38, 37, 37, 36, 36, 35, 35, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 36, 37, 38, 38, 39, 40, 41, 42, 42, 43, 44, 44,
+49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 39, 39, 38, 37, 37, 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 37, 37, 38, 39, 39, 40, 41, 42, 43, 44, 44, 45,
+50, 49, 47, 46, 45, 44, 43, 42, 42, 41, 40, 39, 38, 38, 38, 37, 36, 36, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 37, 37, 38, 39, 39, 40, 40, 41, 42, 43, 44, 45, 45,
+50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40, 40, 39, 39, 38, 38, 37, 36, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 38, 38, 39, 39, 40, 41, 42, 43, 43, 44, 45, 45,
+50, 49, 48, 47, 46, 45, 44, 44, 43, 42, 41, 40, 39, 39, 39, 39, 37, 37, 37, 36, 36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 39, 39, 40, 41, 41, 42, 43, 44, 44, 45, 45,
+51, 50, 49, 48, 47, 46, 46, 44, 43, 42, 42, 41, 40, 40, 39, 39, 38, 38, 37, 37, 37, 37, 37, 37, 37, 38, 38, 38, 38, 39, 39, 40, 41, 41, 42, 43, 43, 44, 45, 46, 46,
+52, 51, 49, 48, 47, 47, 47, 45, 44, 43, 42, 42, 41, 40, 40, 39, 39, 38, 38, 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, 40, 40, 41, 41, 42, 43, 43, 44, 45, 45, 46, 47,
+52, 51, 50, 49, 48, 48, 48, 46, 45, 44, 43, 42, 42, 41, 41, 40, 40, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 40, 40, 41, 41, 41, 42, 43, 43, 44, 44, 45, 46, 46, 47,
+53, 52, 50, 49, 48, 47, 47, 46, 45, 44, 43, 43, 42, 42, 42, 41, 41, 40, 40, 40, 40, 40, 40, 40, 40, 40, 40, 41, 41, 41, 42, 42, 43, 43, 44, 44, 45, 46, 46, 47, 47,
+53, 51, 50, 49, 48, 47, 47, 46, 46, 45, 44, 43, 43, 42, 42, 42, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 41, 42, 42, 43, 43, 43, 44, 44, 45, 46, 47, 47, 47, 48,
+53, 52, 52, 50, 49, 48, 48, 47, 46, 46, 45, 44, 45, 44, 43, 43, 43, 42, 42, 42, 42, 42, 42, 42, 42, 43, 43, 43, 43, 43, 44, 44, 44, 45, 45, 46, 47, 48, 48, 49, 48,
+//B - Ch 0
+45, 44, 43, 42, 42, 41, 40, 39, 39, 38, 37, 37, 37, 36, 36, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 35, 34, 35, 35, 35, 35, 35, 36, 36, 36, 37, 37, 38, 38, 39, 39,
+45, 44, 43, 42, 41, 41, 40, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 36, 36, 36, 37, 37, 38, 38, 39, 39,
+45, 44, 43, 42, 41, 40, 40, 40, 38, 38, 37, 37, 36, 36, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 36, 37, 37, 37, 38, 38, 39,
+44, 43, 43, 42, 41, 40, 40, 40, 38, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 37, 37, 37, 38, 38,
+44, 43, 42, 41, 41, 40, 40, 39, 38, 38, 37, 36, 36, 36, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 36, 36, 37, 37, 37, 38,
+44, 43, 42, 41, 40, 40, 39, 39, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 34, 34, 33, 33, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 36, 36, 36, 37, 37, 38,
+43, 43, 42, 41, 40, 39, 39, 38, 38, 37, 36, 36, 36, 35, 35, 34, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 36, 36, 36, 37, 36,
+43, 42, 41, 41, 40, 39, 39, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 36, 36, 36, 36,
+43, 42, 41, 40, 40, 39, 38, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, 36, 36, 36,
+43, 42, 41, 40, 39, 39, 38, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 32, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, 35, 35,
+42, 41, 41, 40, 39, 39, 38, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 33, 33, 33, 33, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35,
+42, 41, 40, 40, 39, 39, 38, 38, 37, 37, 36, 36, 35, 35, 34, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35,
+42, 41, 40, 40, 39, 38, 38, 38, 37, 37, 36, 36, 35, 35, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 36,
+42, 41, 40, 40, 39, 38, 38, 38, 37, 37, 36, 36, 36, 35, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 35, 35,
+42, 41, 40, 40, 39, 38, 38, 38, 37, 37, 36, 36, 36, 35, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35,
+42, 41, 40, 40, 39, 38, 38, 38, 37, 37, 37, 36, 36, 35, 35, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35,
+42, 41, 40, 40, 39, 39, 38, 38, 37, 37, 37, 36, 36, 35, 35, 34, 34, 34, 33, 33, 32, 32, 32, 32, 32, 32, 32, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 35, 35, 35, 35,
+43, 42, 41, 40, 39, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 34, 34, 34, 33, 33, 33, 32, 32, 33, 32, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 35, 35, 35, 35,
+43, 42, 41, 40, 39, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 35, 35, 35, 35,
+43, 42, 41, 41, 40, 39, 38, 38, 37, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 36, 35,
+43, 42, 41, 41, 40, 39, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 34, 34, 34, 34, 34, 35, 35, 35, 36, 35,
+43, 42, 42, 41, 40, 40, 39, 38, 38, 37, 37, 37, 36, 36, 36, 35, 35, 34, 34, 34, 34, 34, 34, 34, 33, 33, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 36, 36,
+44, 43, 42, 41, 40, 40, 39, 39, 38, 38, 37, 37, 36, 36, 36, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 36, 36, 36, 36,
+44, 43, 42, 41, 41, 40, 40, 39, 39, 38, 38, 37, 36, 37, 36, 36, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 36, 36, 36, 37, 36,
+44, 43, 43, 42, 41, 41, 40, 39, 39, 38, 38, 37, 37, 37, 36, 36, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 36, 36, 36, 37, 37, 37,
+45, 44, 43, 42, 41, 41, 41, 40, 39, 39, 38, 37, 37, 36, 36, 36, 35, 35, 35, 35, 35, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 36, 36, 36, 37, 37, 38, 38,
+45, 44, 43, 43, 42, 42, 42, 41, 39, 39, 38, 37, 37, 37, 36, 36, 36, 35, 35, 35, 35, 35, 35, 35, 34, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 37, 37, 37, 38, 38, 38,
+46, 44, 44, 43, 42, 42, 42, 41, 40, 39, 38, 38, 37, 37, 37, 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 37, 37, 38, 38, 38, 39,
+46, 45, 44, 43, 42, 42, 41, 41, 40, 39, 39, 38, 38, 37, 37, 37, 36, 36, 35, 35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 39, 39, 39,
+46, 45, 44, 43, 43, 42, 41, 41, 40, 39, 39, 38, 38, 37, 37, 37, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 37, 37, 37, 37, 38, 38, 39, 39, 39, 40, 40,
+48, 45, 46, 44, 44, 42, 42, 41, 41, 41, 40, 40, 39, 39, 38, 37, 37, 37, 36, 37, 37, 37, 36, 37, 36, 37, 37, 37, 37, 37, 38, 37, 38, 38, 38, 39, 40, 41, 41, 41, 40,
+};
+uint32_t ref_transform = 3;
+uint32_t grid_width = 31;
+uint32_t grid_height = 41;
diff --git a/lenses/cs_6-60mm b/lenses/cs_6-60mm
Binary files differ.
diff --git a/lenses/hmm b/lenses/hmm
Binary files differ.
diff --git a/lenses/lensconfig.npz b/lenses/lensconfig.npz
Binary files differ.
diff --git a/srv/static/style.css b/srv/static/style.css
@@ -0,0 +1,18 @@
+body
+{
+ margin: 0px auto;
+ text-align: center;
+ background-color:#000;
+ color: #f4f4f4;
+ font-family: monospace;
+}
+
+pre
+{
+ margin: 5px auto;
+ padding: 3px;
+ display: inline-block;
+ background-color: #555;
+ color: #fff;
+}
+
diff --git a/srv/tarinaserver.py b/srv/tarinaserver.py
@@ -20,7 +20,7 @@ urls = (
'/', 'index'
)
-render = web.template.render('templates/')
+render = web.template.render('templates/', base="base")
class index:
def GET(self):
diff --git a/srv/templates/base.html b/srv/templates/base.html
@@ -0,0 +1,12 @@
+$def with (content)
+<!doctype html>
+<HEAD>
+ <meta charset="utf-8">
+ <title>Tarina | video & audio recorder with glue</title>
+ <link rel="stylesheet" href="static/style.css" type="text/css" rel="stylesheet"/>
+</HEAD>
+<BODY>
+
+ $:content
+
+</BODY>
diff --git a/tarina.py b/tarina.py
@@ -1098,7 +1098,7 @@ def stopinterface(camera):
def startcamera(lens):
camera = picamera.PiCamera()
- camera.resolution = (1296, 578) #tested modes 1920x816, 1296x552/578, v2 1640x698, 1640x1232
+ camera.resolution = (1296, 552) #tested modes 1920x816, 1296x552/578, v2 1640x698, 1640x1232
#lensshade = ''
#npzfile = np.load('lenses/' + lens)
#lensshade = npzfile['lens_shading_table']
