tarina

commit d73c9c659128c5143d44abc6ef362f7f55d390d5
parent bec2f89eaf1906e62c039de2d9f1b43c78b80a08
Author: rbckman <rob@tarina.org>
Date:   Sat,  5 Mar 2022 22:07:21 +0000

16/9  mode, wierd comp neaudiomix thing,  lots of thing to do but 169 worls, hurray

Diffstat:
M
gui/src/main.c
 | 
7
+++----
M
gui/tarinagui.bin
 | 
0

M
tarina.py
 | 
20
+++++++++++---------

3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/gui/src/main.c b/gui/src/main.c
@@ -91,7 +91,7 @@ int main(void)
 {
     GRAPHICS_RESOURCE_HANDLE img;
     uint32_t width, height;
-    int LAYER=1;
+    int LAYER=10;
     bcm_host_init();
     int s;
 
@@ -109,7 +109,7 @@ int main(void)
 
     graphics_display_resource(img, 0, LAYER, 0, 0, GRAPHICS_RESOURCE_WIDTH, GRAPHICS_RESOURCE_HEIGHT, VC_DISPMAN_ROT0, 1);
 
-    uint32_t text_size = 16;
+    uint32_t text_size = 15;
     FILE * fp;
     FILE * fp2;
     FILE * fp3;
@@ -122,7 +122,6 @@ int main(void)
     char newread[500];
     char oldread[500];
     char vumeter[130];
-    //graphics_resource_fill(img, 0, 0, width, height, GRAPHICS_RGBA32(0,0,0,0xff));
     while (1) {
         // char ch;
         linenr = 0;
@@ -143,7 +142,7 @@ int main(void)
             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));
+            graphics_resource_fill(img, 0, 0, width, height, GRAPHICS_RGBA32(0,0,0,0x00));
             // blue, at the top (y=40)
             // selected 0 1 2 3 4 5 6 7 8
             int space = 10;
diff --git a/gui/tarinagui.bin b/gui/tarinagui.bin
Binary files differ.
diff --git a/tarina.py b/tarina.py
@@ -95,7 +95,7 @@ def main():
     awbx = 0
     awb_lock = 'no'
     fps = 24.999
-    quality = 26
+    quality = 25
     headphoneslevel = 40
     miclevel = 50
     recording = False
@@ -215,7 +215,7 @@ def main():
                 if renderedfilename != '':
                     #render thumbnail
                     #writemessage('creating thumbnail')
-                    #run_command('avconv -i ' + foldername + filename  + '.mp4 -frames 1 -vf scale=800:340 ' + foldername + filename + '.jpeg')
+                    #run_command('avconv -i ' + foldername + filename  + '.mp4 -frames 1 -vf scale=800:460 ' + foldername + filename + '.jpeg')
                     updatethumb =  True
             #VIEW SCENE
             elif pressed == 'view' and menu[selected] == 'SCENE:':
@@ -594,7 +594,8 @@ def main():
                     buzz(150)
                 #camera.capture(foldername + filename + '.jpeg', resize=(800,341))
                 try:
-                    camera.capture(foldername + filename + '.jpeg', resize=(800,340), use_video_port=True)
+                    #camera.capture(foldername + filename + '.jpeg', resize=(800,340), use_video_port=True)
+                    camera.capture(foldername + filename + '.jpeg', resize=(800,460), use_video_port=True)
                 except:
                     logger.warning('something wrong with camera jpeg capture')
                 t = 0
@@ -1587,7 +1588,7 @@ def timelapse(beeps,camera,foldername,filename,between,duration):
                             camera.stop_recording()
                         #create thumbnail
                         try:
-                            camera.capture(foldername + filename + '.jpeg', resize=(800,340), use_video_port=True)
+                            camera.capture(foldername + filename + '.jpeg', resize=(800,460), use_video_port=True)
                         except:
                             logger.warning('something wrong with camera jpeg capture')
                         writemessage('Compiling timelapse')
@@ -2107,8 +2108,8 @@ def renderscene(filmfolder, filmname, scene):
 def renderfilm(filmfolder, filmname, comp, scene, muxing):
     def render(q, filmfolder, filmname, comp, scene):
         newaudiomix = False
-        if comp == 1:
-            newaudiomix = True
+        #if comp == 1:
+        #    newaudiomix = True
         #This function checks and calls renderscene first then rendervideo & renderaudio if something has changed in the film
         if scene > 0:
             scenefilename, audiomix = renderscene(filmfolder, filmname, scene)
@@ -2521,7 +2522,8 @@ def playdub(filename, player_menu):
     remove_shots = []
     if video == True:
         try:
-            player = OMXPlayer(filename + '.mp4', args=['--fps', '25', '--layer', '3', '--win', '0,70,800,410', '--no-osd', '--no-keys'], dbus_name='org.mpris.MediaPlayer2.omxplayer1', pause=True)
+            #player = OMXPlayer(filename + '.mp4', args=['--fps', '25', '--layer', '3', '--win', '0,70,800,410', '--no-osd', '--no-keys'], dbus_name='org.mpris.MediaPlayer2.omxplayer1', pause=True)
+            player = OMXPlayer(filename + '.mp4', args=['--fps', '25', '--layer', '3', '--no-osd', '--win', '0,0,800,460','--no-keys'], dbus_name='org.mpris.MediaPlayer2.omxplayer1', pause=True)
         except:
             writemessage('Something wrong with omxplayer')
             time.sleep(2)
@@ -2765,7 +2767,7 @@ def videotrim(filename, trim_filename, where, s):
         run_command('cp ' + filename + '.wav ' + trim_filename + '.wav')
         audiotrim(trim_filename, 'end')
     #take last frame 
-    run_command('ffmpeg -sseof -1 -i ' + trim_filename + '.mp4 -update 1 -q:v 1 -vf scale=800:340 ' + trim_filename + '.jpeg')
+    run_command('ffmpeg -sseof -1 -i ' + trim_filename + '.mp4 -update 1 -q:v 1 -vf scale=800:460 ' + trim_filename + '.jpeg')
     return
 
 #--------------Get Audio cards--------------
@@ -3218,7 +3220,7 @@ def stopinterface(camera):
 
 def startcamera(lens, fps):
     camera = picamera.PiCamera()
-    camera.resolution = (1920, 816) #tested modes 1920x816, 1296x552/578, v2 1640x698, 1640x1232
+    camera.resolution = (1920, 1080) #tested modes 1920x816, 1296x552/578, v2 1640x698, 1640x1232
     #lensshade = ''
     #npzfile = np.load('lenses/' + lens)
     #lensshade = npzfile['lens_shading_table']