Mercurial > code > home > repos > light9
changeset 1942:82e98aa4d159
reformatting and typing
Ignore-this: 208dd84c52c544998142de6622fced2c
| author | drewp@bigasterisk.com |
|---|---|
| date | Tue, 04 Jun 2019 17:17:55 +0000 |
| parents | 0dc3715050cf |
| children | 748ecc2d1f2a |
| files | bin/musictime bin/vidref light9/ascoltami/musictime_client.py light9/vidref/videorecorder.py tasks.py |
| diffstat | 5 files changed, 39 insertions(+), 30 deletions(-) [+] |
line wrap: on
line diff
--- a/bin/musictime Tue Jun 04 16:24:12 2019 +0000 +++ b/bin/musictime Tue Jun 04 17:17:55 2019 +0000 @@ -3,14 +3,13 @@ import light9.networking import tkinter as tk -import time -import json -from twisted.internet import reactor, tksupport, task, defer +from twisted.internet import reactor, tksupport, task from light9.ascoltami.musictime_client import MusicTime mt = MusicTime() + class MusicTimeTk(tk.Frame, MusicTime): def __init__(self, master, url): @@ -35,11 +34,12 @@ self.timelabel.bind('<1>', print_time) self.timelabel.focus() task.LoopingCall(self.update_time).start(.1) - + def update_time(self): t = self.getLatest().get('t', 0) self.timevar.set(t) + if __name__ == "__main__": from optparse import OptionParser parser = OptionParser() @@ -51,4 +51,3 @@ MusicTimeTk(root, options.url).pack(expand=1, fill='both') tksupport.install(root, ms=20) reactor.run() -
--- a/bin/vidref Tue Jun 04 16:24:12 2019 +0000 +++ b/bin/vidref Tue Jun 04 17:17:55 2019 +0000 @@ -57,7 +57,7 @@ pipeline = videorecorder.GstSource( '/dev/v4l/by-id/usb-Bison_HD_Webcam_200901010001-video-index0' -# '/dev/v4l/by-id/usb-Generic_FULL_HD_1080P_Webcam_200901010001-video-index0' + # '/dev/v4l/by-id/usb-Generic_FULL_HD_1080P_Webcam_200901010001-video-index0' )
--- a/light9/ascoltami/musictime_client.py Tue Jun 04 16:24:12 2019 +0000 +++ b/light9/ascoltami/musictime_client.py Tue Jun 04 17:17:55 2019 +0000 @@ -20,7 +20,8 @@ period=.2, onChange=lambda position: None, pollCurvecalc='ignored'): - """period is the seconds between http time requests. + """period is the seconds between + http time requests. We call onChange with the time in seconds and the total time
--- a/light9/vidref/videorecorder.py Tue Jun 04 16:24:12 2019 +0000 +++ b/light9/vidref/videorecorder.py Tue Jun 04 17:17:55 2019 +0000 @@ -1,20 +1,22 @@ +from dataclasses import dataclass +from queue import Queue +from typing import Optional import time, logging, os, traceback, sys import gi gi.require_version('Gst', '1.0') gi.require_version('GstBase', '1.0') + +from PIL import Image from gi.repository import Gst from rx.subjects import BehaviorSubject -from dataclasses import dataclass -from PIL import Image from twisted.internet import defer, threads -from queue import Queue -from light9.vidref.replay import framerate, songDir, takeDir, snapshotDir -from typing import Set, Optional import moviepy.editor import numpy + from light9.ascoltami.musictime_client import MusicTime from light9.newtypes import Song + from IPython.core import ultratb sys.excepthook = ultratb.FormattedTB(mode='Verbose', color_scheme='Linux', @@ -22,6 +24,7 @@ log = logging.getLogger() + @dataclass(frozen=True) class CaptureFrame: img: Image @@ -29,6 +32,7 @@ t: float isPlaying: bool + class FramesToVideoFiles: """ @@ -46,12 +50,13 @@ nextWriteAction: 'ignore' """ + def __init__(self, frames: BehaviorSubject): self.frames = frames - self.nextImg = None + self.nextImg: Optional[CaptureFrame] = None self.currentOutputClip = None - self.currentOutputSong = None + self.currentOutputSong: Optional[Song] = None self.nextWriteAction = 'ignore' self.frames.subscribe(on_next=self.onFrame) @@ -69,13 +74,13 @@ self.nextWriteAction = 'saveFrames' # continue recording this elif self.currentOutputClip is None and not cf.isPlaying: - self.nextWriteAction = 'notWritingClip' - pass # continue waiting + self.nextWriteAction = 'notWritingClip' + pass # continue waiting elif self.currentOutputClip and not cf.isPlaying or self.currentOutputSong != cf.song: # stop self.nextWriteAction = 'close' else: - raise NotImplementedError + raise NotImplementedError(str(vars())) def save(self, outBase): """ @@ -93,14 +98,17 @@ self.currentOutputClip.fps = 5 log.info(f'write_videofile {outBase} start') try: - self.currentOutputClip.write_videofile( - outBase + '.mp4', - audio=False, preset='ultrafast', verbose=True, bitrate='150000') + self.currentOutputClip.write_videofile(outBase + '.mp4', + audio=False, + preset='ultrafast', + logger=None, + bitrate='150000') except (StopIteration, RuntimeError): - pass + self.frameMap.close() + log.info('write_videofile done') self.currentOutputClip = None - + def _bg_make_frame(self, video_time_secs): if self.nextWriteAction == 'close': raise StopIteration # the one in write_videofile @@ -110,11 +118,10 @@ time.sleep(.03) cf, self.nextImg = self.nextImg, None - self.frameMap.write( - f'video {video_time_secs:g} = song {cf.t:g}\n') - self.frameMap.flush() + self.frameMap.write(f'video {video_time_secs:g} = song {cf.t:g}\n') return numpy.asarray(cf.img) + class GstSource: def __init__(self, dev): @@ -123,12 +130,13 @@ """ Gst.init(None) self.musicTime = MusicTime(pollCurvecalc=False) - self.liveImages: BehaviorSubject[Optional[CaptureFrame]] = BehaviorSubject(None) + self.liveImages: BehaviorSubject[ + Optional[CaptureFrame]] = BehaviorSubject(None) size = [640, 480] log.info("new pipeline using device=%s" % dev) - + # using videocrop breaks the pipeline, may be this issue # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/issues/732 pipeStr = ( @@ -136,7 +144,7 @@ f'autovideosrc' f" ! videoconvert" f" ! appsink emit-signals=true max-buffers=1 drop=true name=end0 caps=video/x-raw,format=RGB,width={size[0]},height={size[1]}" - ) + ) log.info("pipeline: %s" % pipeStr) self.pipe = Gst.parse_launch(pipeStr) @@ -167,8 +175,8 @@ latest = self.musicTime.getLatest() if 'song' in latest: self.liveImages.on_next( - CaptureFrame(img, Song(latest['song']), - latest['t'], latest['playing'])) + CaptureFrame(img, Song(latest['song']), latest['t'], + latest['playing'])) except Exception: traceback.print_exc() return Gst.FlowReturn.OK