complete first iteration of multiparty broadcast

.vscode/launch.json

@@ -74,6 +74,20 @@
       "windows": {
         "program": "${workspaceFolder}\\modules\\Controller\\main.py"
       }
+    },
+    {
+      "name": "Streamer Local Debug (Python)",
+      "type": "python",
+      "request": "launch",
+      "program": "${workspaceFolder}/modules/obscam/app/app.py",
+      "console": "integratedTerminal",
+      "env": {
+        "EdgeHubConnectionString": "${config:azure-iot-edge.EdgeHubConnectionString}",
+        "EdgeModuleCACertificateFile": "${config:azure-iot-edge.EdgeModuleCACertificateFile}"
+      },
+      "windows": {
+        "program": "${workspaceFolder}\\modules\\obscam\\app\\app.py"
+      }
     }
   ]
 }

modules/obscam/app/app.py

@@ -46,22 +46,21 @@
 logger.setLevel(logging.INFO)
 
 test_video_pipeline = '''
-webrtcbin name=sendrecv bundle-policy=max-bundle
- videotestsrc ! {custom}  videoconvert ! queue ! vp8enc deadline=1 ! rtpvp8pay !
- queue ! application/x-rtp,media=video,encoding-name=VP8,payload=97 ! sendrecv.
- audiotestsrc is-live=true wave=red-noise ! audioconvert ! audioresample ! queue ! opusenc ! rtpopuspay !
- queue ! application/x-rtp,media=audio,encoding-name=OPUS,payload=96 ! sendrecv.
+tee name=videotee ! queue ! fakesink
+videotestsrc ! {custom} videoconvert ! queue ! vp8enc deadline=1 ! rtpvp8pay ! queue ! application/x-rtp,media=video,encoding-name=VP8,payload=97 ! videotee.
+tee name=audiotee ! queue ! fakesink
+audiotestsrc is-live=true wave=red-noise volume=0.2 ! queue ! opusenc ! rtpopuspay ! queue leaky=1 ! application/x-rtp,media=audio,encoding-name=OPUS,payload=96 ! audiotee.
 ''' # test source with video and audio.
 
 rpi_cam_pipeline = '''
-webrtcbin name=sendrecv bundle-policy=max-bundle
+tee name=videotee ! queue ! fakesink
 rpicamsrc bitrate=2000000 ! video/x-h264,profile=constrained-baseline,width={width},height={height},framerate={fps}/1,level=3.0 ! {custom}  queue ! h264parse ! rtph264pay config-interval=-1 !
-queue ! application/x-rtp,media=video,encoding-name=H264,payload=96 ! sendrecv.
+queue ! application/x-rtp,media=video,encoding-name=H264,payload=96 ! videotee.
 ''' # raspberry pi camera needed; audio source removed to perserve simplicity.
 
 v4l_pipeline = '''
-webrtcbin name=sendrecv bundle-policy=max-bundle 
-v4l2src {source_params} ! {caps} ! {custom} videoconvert ! queue ! vp8enc deadline=1 ! rtpvp8pay ! queue ! application/x-rtp,media=video,encoding-name=VP8,payload=97 ! sendrecv.
+tee name=videotee ! queue ! fakesink
+v4l2src {source_params} ! {caps} ! {custom} videoconvert ! queue ! vp8enc deadline=1 ! rtpvp8pay ! queue ! application/x-rtp,media=video,encoding-name=VP8,payload=97 ! videotee.
 ''' # usb camera needed; audio source removed to perserve simplicity.
 
 async def main(settings:SimpleNamespace):
@@ -175,7 +174,7 @@ async def twin_update_handler(patch):
             sys.exit(1)
 
         logger.info(f'{datetime.datetime.now()}: Booting up using settings: {settings}')
-        webrtc_client = WebRTCClient(pipeline=settings.gst_pipeline, peer_id=settings.stream_id, server=settings.server)
+        webrtc_client = WebRTCClient(pipeline=settings.gst_pipeline, stream_id=settings.stream_id, server=settings.server)
         await webrtc_client.connect()
 
         # start send telemetry and receive commands        
@@ -213,7 +212,7 @@ def check_plugins():
         'cam_source': os.environ.get('CAM_SOURCE', 'test'),
         'cam_source_params': os.environ.get('CAM_SOURCE_PARAMS', 'device=/dev/video0'),
         'custom_pipeline': os.environ.get('CUSTOM_PIPELINE', ''),
-        'fps': int(os.environ.get('FPS', '15')),
+        'fps': int(os.environ.get('FPS', '10')),
         'width': int(os.environ.get('WIDTH', '1280')),
         'height': int(os.environ.get('HEIGHT', '720')),
         'caps': os.environ.get('CAPS', 'video/x-raw,width={width},height={height},framerate={fps}/1'),

modules/obscam/app/pipelines.py

@@ -0,0 +1,56 @@
+# Copyright (c) 2021 Avanade
+# Author: Thor Schueler
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+
+# 
+# Just keeping some interesting pipelines I played with...
+#
+
+test_video_pipeline = '''
+webrtcbin name=sendrecv bundle-policy=max-bundle
+ videotestsrc ! {custom}  videoconvert ! queue ! vp8enc deadline=1 ! rtpvp8pay !
+ queue ! application/x-rtp,media=video,encoding-name=VP8,payload=97 ! tee name=videotee ! sendrecv.
+ audiotestsrc is-live=true wave=red-noise ! audioconvert ! audioresample ! queue ! opusenc ! rtpopuspay !
+ queue ! application/x-rtp,media=audio,encoding-name=OPUS,payload=96 ! tee name=audiotee ! sendrecv.
+''' # test source with video and audio.
+    # not used anymore. This was prior to the dynamic multi-client handling.
+
+test_video_pipeline = '''
+tee name=videotee ! queue ! fakesink
+videotestsrc ! {custom} videoconvert ! queue ! vp8enc deadline=1 ! rtpvp8pay ! queue ! application/x-rtp,media=video,encoding-name=VP8,payload=97 ! videotee.
+tee name=audiotee ! queue ! fakesink
+audiotestsrc is-live=true wave=ticks apply-tick-ramp=true tick-interval=200000000 freq=5000 volume=0.4 marker-tick-period=10 sine-periods-per-tick=20 !  queue ! opusenc ! rtpopuspay ! queue leaky=1 max-size-time=16000000 max-size-buffers=0 max-size-bytes=0 ! application/x-rtp,media=audio,encoding-name=OPUS,payload=96 ! audiotee.
+''' # test source with video and audio.
+    # I had problems getting the audio reliably to start. 
+
+test_video_pipeline = '''
+tee name=audiotee ! queue ! fakesink
+audiotestsrc is-live=true wave=ticks apply-tick-ramp=true tick-interval=200000000 freq=5000 volume=0.4 marker-tick-period=10 sine-periods-per-tick=20 ! audioconvert ! queue ! opusenc ! rtpopuspay ! queue ! application/x-rtp,media=audio,encoding-name=OPUS,payload=96 ! audiotee.
+''' # test source with video and audio.
+    # audio only pipeline
+
+test_video_pipeline = '''
+tee name=videotee ! queue ! fakesink 
+videotestsrc ! {custom} videoconvert ! queue ! vp8enc deadline=1 ! rtpvp8pay ! queue ! application/x-rtp,media=video,encoding-name=VP8,payload=97 ! videotee. 
+''' # test source with video and audio.
+    # video only pipeline
+
+