Extract stop_streams()

[srec] / srec.py

diff --git a/srec.py b/srec.py
index 50f311c14d1dd6d2ff4e4fac08a31fb9af03d645..7ef4d466514f0d5a0f4fe810697e91d66312dcb3 100644 (file)
--- a/srec.py
+++ b/srec.py
@@ -4,10 +4,14 @@
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation, version 3.
 
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation, version 3.
 

+from __future__ import annotations
+

 from dataclasses import dataclass
 from datetime import datetime
 import os
 import subprocess
 from dataclasses import dataclass
 from datetime import datetime
 import os
 import subprocess

+import sys
+import time

 from typing import Any, Callable
 
 import gi
 from typing import Any, Callable
 
 import gi


@@ -19,18 +23,27 @@ from gi.repository import GLib  # nopep8 pylint: disable=wrong-import-position
 
 
 @dataclass
 
 
 @dataclass

-class Recording:
+class Stream:

     process: subprocess.Popen[bytes]
 
     process: subprocess.Popen[bytes]
 

+    @staticmethod
+    def start(command: list[str]) -> Stream:
+        # pylint: disable=consider-using-with
+        return Stream(process=subprocess.Popen(command, stdin=subprocess.PIPE))
+

     def stop(self) -> None:
         stdin = self.process.stdin
         assert stdin is not None
     def stop(self) -> None:
         stdin = self.process.stdin
         assert stdin is not None

-        stdin.write(b'q')
-        stdin.flush()
+        try:
+            stdin.write(b'q')
+            stdin.flush()
+        except BrokenPipeError:
+            print("Stream already stopped?", file=sys.stderr)

         self.process.wait()
 
 
         self.process.wait()
 
 

-recording: Recording | None = None
+recording: Stream | None = None
+sharing: Stream | None = None

 
 
 def make_filename() -> str:
 
 
 def make_filename() -> str:


@@ -45,9 +58,18 @@ def make_filename() -> str:
 def video_source(stack: Gtk.Stack) -> list[str]:
     if stack.get_child_by_name('not_recording').get_first_child().get_active():
         return ['-f', 'x11grab', '-i', ':0.0+0,0']
 def video_source(stack: Gtk.Stack) -> list[str]:
     if stack.get_child_by_name('not_recording').get_first_child().get_active():
         return ['-f', 'x11grab', '-i', ':0.0+0,0']

+    if is_sharing_enabled(stack):
+        return ['-f', 'v4l2', '-i', '/dev/video9']

     return ['-f', 'v4l2', '-i', '/dev/video0']
 
 
     return ['-f', 'v4l2', '-i', '/dev/video0']
 
 

+def is_sharing_enabled(stack: Gtk.Stack) -> bool:
+    enabled = stack.get_child_by_name('not_recording').get_first_child(
+    ).get_next_sibling().get_next_sibling().get_active()
+    assert isinstance(enabled, bool)
+    return enabled
+
+

 def find_size_display(stack: Gtk.Stack) -> Gtk.Label:
     return stack.get_child_by_name(
         'recording').get_first_child().get_next_sibling()
 def find_size_display(stack: Gtk.Stack) -> Gtk.Label:
     return stack.get_child_by_name(
         'recording').get_first_child().get_next_sibling()


@@ -63,35 +85,59 @@ def summarize_size(n: int) -> str:
     return str(n)
 
 
     return str(n)
 
 

-def on_start_recording(_: Gtk.Button, stack: Gtk.Stack) -> None:
-    global recording  # pylint: disable=global-statement
+def begin_monitoring_file_size(size_display: Gtk.Label, filename: str) -> None:
+    def update_size_display() -> Any:
+        done = recording is None
+        if done:
+            size_display.set_label('')
+        else:
+            try:
+                size = summarize_size(os.stat(filename).st_size)
+            except FileNotFoundError:
+                size = '--'
+            size_display.set_label(f'<big>{size}</big>')
+        return GLib.SOURCE_REMOVE if done else GLib.SOURCE_CONTINUE
+    GLib.timeout_add_seconds(1, update_size_display)
+
+
+def on_start_button(_: Gtk.Button, stack: Gtk.Stack) -> None:
+    global recording, sharing  # pylint: disable=global-statement

     assert recording is None
     assert recording is None

+    assert sharing is None

 
     filename = make_filename()
 
     filename = make_filename()

-    size_display = find_size_display(stack)
+    begin_monitoring_file_size(find_size_display(stack), filename)

 
 

-    def update_size_display() -> Any:
-        try:
-            size = summarize_size(os.stat(filename).st_size)
-        except FileNotFoundError:
-            size = '--'
-        size_display.set_label(f'<big>{size}</big>')
-        return GLib.SOURCE_REMOVE if recording is None else GLib.SOURCE_CONTINUE
-    GLib.timeout_add_seconds(1, update_size_display)
-
-    command = (['ffmpeg', '-framerate', '25'] + video_source(stack) +
-               ['-f', 'pulse', '-ac', '2', '-i', 'default', filename])
-    # pylint: disable=consider-using-with
-    recording = Recording(
-        process=subprocess.Popen(command, stdin=subprocess.PIPE))

     stack.set_visible_child_name("recording")
 
     stack.set_visible_child_name("recording")
 

+    if is_sharing_enabled(stack):
+        out_opts = [
+            '-f', 'v4l2', '-framerate', '25', '-codec:v', 'rawvideo',
+            '-pix_fmt', 'yuv420p',
+        ]
+        sharing = Stream.start(
+            ['ffmpeg', '-i', '/dev/video0']
+            + out_opts + ['/dev/video8']
+            + out_opts + ['/dev/video9'])
+        time.sleep(3)  # Bad!!  We should not be sleeping in this thread!

 
 

-def on_stop_recording(_: Gtk.Button, stack: Gtk.Stack) -> None:
-    global recording  # pylint: disable=global-statement
+    recording = Stream.start(
+        ['ffmpeg', '-framerate', '25'] + video_source(stack) +
+        ['-f', 'pulse', '-ac', '2', '-i', 'default', filename])
+
+
+def stop_streams() -> None:
+    global recording, sharing  # pylint: disable=global-statement

     assert recording is not None
     recording.stop()
     recording = None
     assert recording is not None
     recording.stop()
     recording = None

+    if sharing is not None:
+        sharing.stop()
+        sharing = None
+
+
+def on_stop_button(_: Gtk.Button, stack: Gtk.Stack) -> None:
+    stop_streams()

     stack.set_visible_child_name("not_recording")
 
 
     stack.set_visible_child_name("not_recording")
 
 


@@ -127,12 +173,12 @@ def on_activate(app: Gtk.Application) -> None:
     nr_box.append(screen)
     nr_box.append(Gtk.CheckButton(label='Webcam', active=True, group=screen))
     nr_box.append(make_share_control())
     nr_box.append(screen)
     nr_box.append(Gtk.CheckButton(label='Webcam', active=True, group=screen))
     nr_box.append(make_share_control())

-    nr_box.append(make_button("Start Recording", on_start_recording, stack))
+    nr_box.append(make_button("Start Recording", on_start_button, stack))

     stack.add_named(nr_box, "not_recording")
 
     r_box = Gtk.Box()
     r_box.set_orientation(Gtk.Orientation.VERTICAL)
     stack.add_named(nr_box, "not_recording")
 
     r_box = Gtk.Box()
     r_box.set_orientation(Gtk.Orientation.VERTICAL)

-    r_box.append(make_button("Stop Recording", on_stop_recording, stack))
+    r_box.append(make_button("Stop Recording", on_stop_button, stack))

     r_box.append(Gtk.Label(use_markup=True, justify=Gtk.Justification.CENTER))
     stack.add_named(r_box, "recording")
 
     r_box.append(Gtk.Label(use_markup=True, justify=Gtk.Justification.CENTER))
     stack.add_named(r_box, "recording")