single stream only. Allow HLS

Author: scivision

README.md

@@ -5,7 +5,7 @@
 [![pypi versions](https://img.shields.io/pypi/pyversions/PyLivestream.svg)](https://pypi.python.org/pypi/PyLivestream)
 [![PyPi Download stats](https://static.pepy.tech/badge/pylivestream)](https://pepy.tech/project/pylivestream)
 
-Streams to one or **multiple** streaming sites simultaneously, using pure object-oriented Python (no extra packages) and FFmpeg.
+Streams to a livestreaming video service, using pure object-oriented Python (no extra packages) to call FFmpeg.
 Tested with `flake8`, `mypy` type checking and `pytest`.
 `visual_tests.py` is a quick check of several command line scripting scenarios on your laptop.
 FFmpeg is used from Python `subprocess` to stream to sites including:
@@ -15,7 +15,7 @@ FFmpeg is used from Python `subprocess` to stream to sites including:
 * Twitch
 * also IBM Live Video, Vimeo, Restream.io and more for streaming broadcasts.
 
-![PyLivestream diagram showing screen capture or camera simultaneously livestreaming to multiple services.](./doc/logo.png)
+![PyLivestream diagram showing screen capture or camera livestreaming](./doc/logo.png)
 
 [Troubleshooting](./Troubleshooting.md)
 
@@ -201,28 +201,25 @@ JSON:
 * `camera_size`: camera resolution -- find from `v4l2-ctl --list-formats-ext` or camera spec sheet.
 * `camera_fps`: camera fps -- found from command above or camera spec sheet
 
-Stream to multiple sites. This uses FFmpeg
-[-f tee](https://trac.ffmpeg.org/wiki/Creating%20multiple%20outputs#Teepseudo-muxer).
-For example, Facebook Live and YouTube Live simultaneously:
-
+Stream to livestreaming service using FFmpeg.
 ```sh
-python -m pylivestream.camera youtube facebook ./pylivestream.json
+python -m pylivestream.camera youtube ./pylivestream.json
 ```
 
 ### Screen Share Livestream
 
-Stream to multiple sites, in this example Facebook Live and YouTube Live simultaneously:
+Stream to livestreaming service, in this example Facebook Live:
 
 ```sh
-python -m pylivestream.screen youtube facebook ./pylivestream.json
+python -m pylivestream.screen facebook ./pylivestream.json
 ```
 
 ### Image + Audio Livestream
 
 Microphone audio + static image is accomplished by
 
 ```sh
-python -m pylivestream.microphone youtube facebook ./pylivestream.json -image doc/logo.jpg
+python -m pylivestream.microphone youtube ./pylivestream.json -image doc/logo.jpg
 ```
 
 or wherever your image file is.

pyproject.toml

@@ -18,7 +18,7 @@ classifiers = [
   "Topic :: Multimedia :: Video :: Capture"
 ]
 dynamic = ["readme", "version"]
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [tool.setuptools.dynamic]
 readme = {file = ["README.md"], content-type = "text/markdown"}

src/pylivestream/api.py

@@ -9,7 +9,6 @@
 pls.microphone('twitch')
 """
 
-from __future__ import annotations
 from pathlib import Path
 
 from .base import FileIn, Microphone, SaveDisk, Camera
@@ -28,27 +27,27 @@
 
 def stream_file(
     ini_file: Path,
-    websites: str | list[str],
+    websites: str,
     video_file: Path,
     loop: bool | None = None,
     assume_yes: bool = False,
     timeout: float | None = None,
 ):
     S = FileIn(ini_file, websites, infn=video_file, loop=loop, yes=assume_yes, timeout=timeout)
-    sites: list[str] = list(S.streams.keys())
+
     # %% Go live
     if assume_yes:
-        print(f"going live on {sites} with file {video_file}")
+        print(f"going live on {websites} with file {video_file}")
     else:
-        input(f"Press Enter to go live on {sites} with file {video_file}")
+        input(f"Press Enter to go live on {websites} with file {video_file}")
         print("Or Ctrl C to abort.")
 
     S.golive()
 
 
 def stream_microphone(
     ini_file: Path,
-    websites: list[str],
+    websites: str,
     *,
     still_image: Path | None = None,
     assume_yes: bool | None = False,
@@ -59,12 +58,12 @@ def stream_microphone(
     """
 
     s = Microphone(ini_file, websites, image=still_image, yes=assume_yes, timeout=timeout)
-    sites = list(s.streams.keys())
+
     # %% Go live
     if assume_yes:
-        print("going live on", sites)
+        print("going live on", websites)
     else:
-        input(f"Press Enter to go live on {sites}.    Or Ctrl C to abort.")
+        input(f"Press Enter to go live on {websites}.    Or Ctrl C to abort.")
 
     s.golive()
 
@@ -83,13 +82,13 @@ def capture_screen(
     s.save()
 
 
-def stream_camera(ini_file: Path, websites: list[str], *, assume_yes: bool, timeout: float):
+def stream_camera(ini_file: Path, websites: str, *, assume_yes: bool, timeout: float):
+
     S = Camera(ini_file, websites, yes=assume_yes, timeout=timeout)
-    sites: list[str] = list(S.streams.keys())
     # %% Go live
     if assume_yes:
-        print("going live on", sites)
+        print("going live on", websites)
     else:
-        input(f"Press Enter to go live on {sites}.    Or Ctrl C to abort.")
+        input(f"Press Enter to go live on {websites}.    Or Ctrl C to abort.")
 
     S.golive()

src/pylivestream/base.py

@@ -1,8 +1,5 @@
-from __future__ import annotations
 from pathlib import Path
-import logging
 import os
-import typing
 
 from .stream import Stream
 from .utils import run, check_device
@@ -75,7 +72,7 @@ def __init__(self, inifn: Path, site: str, **kwargs) -> None:
             + ["-f", "null", "-"]  # camera needs at output
         )
 
-    def startlive(self, sinks: list[str] | None = None):
+    def startlive(self):
         """
         start the stream(s)
         """
@@ -94,53 +91,7 @@ def startlive(self, sinks: list[str] | None = None):
             # listener stopped prematurely, probably due to error
             raise RuntimeError(f"listener stopped with code {proc.poll()}")
         # %% RUN STREAM
-        if not sinks:  # single stream
-            run(self.cmd)
-        elif self.movingimage:
-            if len(sinks) > 1:
-                logging.warning(f"streaming only to {sinks[0]}")
-
-            run(self.cmd)
-        elif len(sinks) == 1:
-            run(self.cmd)
-        else:
-            """
-            multi-stream output tee
-            https://trac.ffmpeg.org/wiki/Creating%20multiple%20outputs#Teepseudo-muxer
-            https://trac.ffmpeg.org/wiki/EncodingForStreamingSites#Outputtingtomultiplestreamingserviceslocalfile
-            """
-            cmdstem: list[str] = self.cmd[:-3]
-            # +global_header is necessary to tee to multiple services
-            cmd: list[str] = cmdstem + ["-flags:v", "+global_header", "-f", "tee"]
-
-            if self.image:
-                #  connect image to video stream, audio file to audio stream
-                cmd += ["-map", "0:v", "-map", "1:a"]
-            else:
-                if self.vidsource == "file":
-                    # picks first video and audio stream, often correct
-                    cmd += ["-map", "0:v", "-map", "0:a:0"]
-                else:
-                    # device (Camera)
-                    # connect video device to video stream,
-                    # audio device to audio stream
-                    cmd += ["-map", "0:v", "-map", "1:a"]
-
-            # cannot have double quotes for Mac/Linux,
-            #    but need double quotes for Windows
-            if os.name == "nt":
-                sink = f'"[f=flv]{sinks[0][1:-1]}'
-                for s in sinks[1:]:
-                    sink += f"|[f=flv]{s[1:-1]}"
-                sink += '"'
-            else:
-                sink = f"[f=flv]{sinks[0]}"
-                for s in sinks[1:]:
-                    sink += f"|[f=flv]{s}"
-
-            cmd.append(sink)
-
-            run(cmd)
+        run(self.cmd)
 
         # %% stop the listener before starting the next process, or upon final process closing.
         if proc is not None and proc.poll() is None:
@@ -168,92 +119,44 @@ def check_device(self, site: str | None = None) -> bool:
 
 # %% operators
 class Screenshare:
-    def __init__(self, inifn: Path, websites: list[str], **kwargs) -> None:
-
-        if isinstance(websites, str):
-            websites = [websites]
+    def __init__(self, inifn: Path, websites: str, **kwargs) -> None:
 
-        streams = {}
-        for site in websites:
-            streams[site] = Livestream(inifn, site, vidsource="screen", **kwargs)
-
-        self.streams: typing.Mapping[str, Livestream] = streams
+        self.streams = Livestream(inifn, websites, vidsource="screen", **kwargs)
 
     def golive(self) -> None:
 
-        sinks: list[str] = [self.streams[stream].sink for stream in self.streams]
-
-        try:
-            next(self.streams[unify_streams(self.streams)].startlive(sinks))
-        except StopIteration:
-            pass
+        self.streams.startlive()
 
 
 class Camera:
-    def __init__(self, inifn: Path, websites: list[str], **kwargs):
-
-        if isinstance(websites, str):
-            websites = [websites]
-
-        streams = {}
-        for site in websites:
-            streams[site] = Livestream(inifn, site, vidsource="camera", **kwargs)
+    def __init__(self, inifn: Path, websites: str, **kwargs):
 
-        self.streams: dict[str, Livestream] = streams
+        self.streams = Livestream(inifn, websites, vidsource="camera", **kwargs)
 
     def golive(self) -> None:
 
-        sinks: list[str] = [self.streams[stream].sink for stream in self.streams]
-
-        try:
-            next(self.streams[unify_streams(self.streams)].startlive(sinks))
-        except StopIteration:
-            pass
+        self.streams.startlive()
 
 
 class Microphone:
-    def __init__(self, inifn: Path, websites: list[str], **kwargs):
-
-        if isinstance(websites, str):
-            websites = [websites]
+    def __init__(self, inifn: Path, websites: str, **kwargs):
 
-        streams = {}
-        for site in websites:
-            streams[site] = Livestream(inifn, site, **kwargs)
-
-        self.streams: dict[str, Livestream] = streams
+        self.streams = Livestream(inifn, websites, **kwargs)
 
     def golive(self) -> None:
 
-        sinks: list[str] = [self.streams[stream].sink for stream in self.streams]
-
-        try:
-            next(self.streams[unify_streams(self.streams)].startlive(sinks))
-        except StopIteration:
-            pass
+        self.streams.startlive()
 
 
 # %% File-based inputs
 class FileIn:
-    def __init__(self, inifn: Path, websites: str | list[str], **kwargs):
+    def __init__(self, inifn: Path, websites: str, **kwargs):
 
-        if isinstance(websites, str):
-            websites = [websites]
-
-        streams = {}
-        for site in websites:
-            streams[site] = Livestream(inifn, site, vidsource="file", **kwargs)
-
-        self.streams: dict[str, Livestream] = streams
+        self.streams = Livestream(inifn, websites, vidsource="file", **kwargs)
 
     def golive(self) -> None:
 
-        sinks: list[str] = [self.streams[stream].sink for stream in self.streams]
-
-        try:
-            next(self.streams[unify_streams(self.streams)].startlive(sinks))
-        except StopIteration:
-            pass
+        self.streams.startlive()
 
 
 class SaveDisk(Stream):
@@ -295,23 +198,3 @@ def save(self):
 
         else:
             print("specify filename to save screen capture w/ audio to disk.")
-
-
-def unify_streams(streams: typing.Mapping[str, Stream]) -> str:
-    """
-    find least common denominator stream settings,
-        so "tee" output can generate multiple streams.
-    First try: use stream with lowest video bitrate.
-
-    Exploits that Python has guaranteed dict() ordering.
-
-    fast native Python argmin()
-    https://stackoverflow.com/a/11825864
-    """
-    vid_bw: list[int] = [streams[s].video_kbps for s in streams]
-
-    argmin: int = min(range(len(vid_bw)), key=vid_bw.__getitem__)
-
-    key: str = list(streams.keys())[argmin]
-
-    return key

src/pylivestream/camera.py

@@ -8,11 +8,7 @@
     signal.signal(signal.SIGINT, signal.SIG_DFL)
 
     p = argparse.ArgumentParser(description="livestream camera")
-    p.add_argument(
-        "websites",
-        help="site to stream, e.g. localhost youtube facebook twitch",
-        nargs="+",
-    )
+    p.add_argument("websites", help="site to stream, e.g. localhost youtube facebook twitch")
     p.add_argument("json", help="JSON file with stream parameters such as key")
     p.add_argument("-y", "--yes", help="no confirmation dialog", action="store_true")
     p.add_argument("-t", "--timeout", help="stop streaming after --timeout seconds", type=int)

src/pylivestream/data/pylivestream.json

@@ -6,7 +6,6 @@
   "camera_fps": 30,
   "audio_rate": 44100,
   "audio_bps": 128000,
-  "preset": "veryfast",
   "audio_codec": "aac",
   "exe": "ffmpeg",
   "ffprobe_exe": "ffprobe",

src/pylivestream/ffmpeg.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import typing as T
 import subprocess
 from time import sleep

src/pylivestream/fglob.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 import random
 from pathlib import Path
 import signal
@@ -15,7 +14,7 @@
 
 def stream_files(
     ini_file: Path,
-    websites: list[str],
+    websites: str,
     *,
     video_path: Path,
     glob: str | None = None,
@@ -50,7 +49,7 @@ def stream_files(
 def playonce(
     flist: list[Path],
     image: Path | None,
-    sites: list[str],
+    sites: str,
     inifn: Path,
     shuffle: bool,
     usemeta: bool,
@@ -105,7 +104,6 @@ def cli():
     p.add_argument(
         "websites",
         help="site to stream, e.g. localhost youtube facebook twitch",
-        nargs="+",
     )
     p.add_argument("json", help="JSON file with stream parameters such as key")
     p.add_argument("-glob", help="file glob pattern to stream.")