commit 2d93be8fc2071e5e640670c390886fca452c2bab parent 58dc814f4511664dcdef44817a81cdcd3b0d7457 Author: rob <rob@tarina.org> Date: Sat, 19 Aug 2023 16:18:42 +0100 this Diffstat:
34 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/3d/button-symbols.stl b/3d/button-symbols.stl Binary files differ. diff --git a/3d/tarina-body.png b/3d/tarina-body.png Binary files differ. diff --git a/3d/tarina-body.stl b/3d/tarina-body.stl Binary files differ. diff --git a/3d/tarina-button-plate-bottom.png b/3d/tarina-button-plate-bottom.png Binary files differ. diff --git a/3d/tarina-button-plate-bottom.stl b/3d/tarina-button-plate-bottom.stl Binary files differ. diff --git a/3d/tarina-button-plate-upper.png b/3d/tarina-button-plate-upper.png Binary files differ. diff --git a/3d/tarina-button-plate-upper.stl b/3d/tarina-button-plate-upper.stl Binary files differ. diff --git a/3d/tarina-dev.blend b/3d/tarina-dev.blend Binary files differ. diff --git a/3d/tarina-dev.blend1 b/3d/tarina-dev.blend1 Binary files differ. diff --git a/3d/tarina-hdmi-cap.png b/3d/tarina-hdmi-cap.png Binary files differ. diff --git a/3d/tarina-hdmi-cap.stl b/3d/tarina-hdmi-cap.stl Binary files differ. diff --git a/3d/tarina-left-side-cap.png b/3d/tarina-left-side-cap.png Binary files differ. diff --git a/3d/tarina-left-side-cap.stl b/3d/tarina-left-side-cap.stl Binary files differ. diff --git a/3d/tarina-left-side.png b/3d/tarina-left-side.png Binary files differ. diff --git a/3d/tarina-modifyer-body-logo.stl b/3d/tarina-modifyer-body-logo.stl Binary files differ. diff --git a/3d/tarina-modifyer-button-icons.stl b/3d/tarina-modifyer-button-icons.stl Binary files differ. diff --git a/3d/tarina-picamera-hq-body-lid.png b/3d/tarina-picamera-hq-body-lid.png Binary files differ. diff --git a/3d/tarina-picamera-hq-body.png b/3d/tarina-picamera-hq-body.png Binary files differ. diff --git a/3d/tarina-picamera-hq-body.stl b/3d/tarina-picamera-hq-body.stl Binary files differ. diff --git a/3d/tarina-picamera-screwhandle.png b/3d/tarina-picamera-screwhandle.png Binary files differ. diff --git a/3d/tarina-picamera-screwhandle.stl b/3d/tarina-picamera-screwhandle.stl Binary files differ. diff --git a/3d/tarina-right-side.png b/3d/tarina-right-side.png Binary files differ. diff --git a/3d/tarina-right-side.stl b/3d/tarina-right-side.stl Binary files differ. diff --git a/3d/tarina-screen-lid-hyperpixel.png b/3d/tarina-screen-lid-hyperpixel.png Binary files differ. diff --git a/3d/tarina-screen-lid-hyperpixel.stl b/3d/tarina-screen-lid-hyperpixel.stl Binary files differ. diff --git a/3d/tarina-screen-lid-ugeek.png b/3d/tarina-screen-lid-ugeek.png Binary files differ. diff --git a/3d/tarina-screen-lid-ugeek.stl b/3d/tarina-screen-lid-ugeek.stl Binary files differ. diff --git a/3d/tarina-viewfinder-eyepiece.stl b/3d/tarina-viewfinder-eyepiece.stl Binary files differ. diff --git a/3d/tarina-viewfinder-hyperpixel.png b/3d/tarina-viewfinder-hyperpixel.png Binary files differ. diff --git a/3d/tarina-viewfinder-hyperpixel.stl b/3d/tarina-viewfinder-hyperpixel.stl Binary files differ. diff --git a/3d/viewfinder-clip-bridge.stl b/3d/viewfinder-clip-bridge.stl Binary files differ. diff --git a/3d/viewfinder-clip-bridge2.stl b/3d/viewfinder-clip-bridge2.stl Binary files differ. diff --git a/3d/viewfinder-clip-bridge3.stl b/3d/viewfinder-clip-bridge3.stl Binary files differ. diff --git a/tarina.py b/tarina.py @@ -735,6 +735,7 @@ def main(): if onlysound != True: camera.start_recording(filmfolder+ '.videos/'+video_origins+'.h264', format='h264', quality=quality, level=profilelevel) starttime = time.time() + os.system('ln -s '+filmfolder+'.videos/'+video_origins+'.h264 '+foldername+filename+'.h264') recording = True showmenu = 0 if cammode == 'picture': @@ -760,7 +761,6 @@ def main(): disk = os.statvfs(tarinafolder + '/') diskleft = str(int(disk.f_bavail * disk.f_frsize / 1024 / 1024 / 1024)) + 'Gb' recording = False - os.system('ln -s '+filmfolder+'.videos/'+video_origins+'.h264 '+foldername+filename+'.h264') if showmenu_settings == True: showmenu = 1 if onlysound != True: @@ -3508,14 +3508,14 @@ def startstream(camera, stream, plughw, channels): stream_cmd = 'ffmpeg -f h264 -r 25 -i - -itsoffset 5.5 -fflags nobuffer -f alsa -ac '+str(channels)+' -i hw:'+str(plughw)+' -ar '+soundrate+' -acodec mp2 -b:a 128k -ar '+soundrate+' -vcodec copy -f mpegts udp://10.42.0.169:5002' try: stream = subprocess.Popen(stream_cmd, shell=True, stdin=subprocess.PIPE) - camera.start_recording(stream.stdin, format='h264', bitrate = 500000) + camera.start_recording(stream.stdin, splitter_port=2, format='h264', bitrate = 55555) except: stream = '' #now = time.strftime("%Y-%m-%d-%H:%M:%S") return stream def stopstream(camera, stream): - camera.stop_recording() + camera.stop_recording(splitter_port=2) os.system('pkill -9 ffmpeg') print("Camera safely shut down") print("Good bye")
