webrtc-streamer 0.8.14 → 0.8.17

package/.vscode/c_cpp_properties.json

@@ -6,6 +6,7 @@
                 "${workspaceFolder}/inc",
                 "${workspaceFolder}/live555helper/inc",
                 "${workspaceFolder}/live/*/include",
+                "${workspaceFolder}/prometheus-cpp/core/include",                
                 "${workspaceFolder}/../webrtc/src/**"
             ],
             "intelliSenseMode": "linux-gcc-x64",

package/README.md

@@ -65,6 +65,8 @@ Usage:
   -s, --stun [=arg(=0.0.0.0:3478)]
                                 Use an external STUN server
   -R, --udp-range arg           Set the webrtc udp port range
+  -e, --extra-host arg          Add extra ICE candidate address (for 
+                                Docker/NAT)  
   -W, --trials arg              Set the webrtc trials fields
   -a, --audio-layer [=arg(=)]   Specify audio capture layer to use (omit
                                 value for dummy audio)
@@ -149,18 +151,22 @@ The container entry point is the webrtc-streamer application, then you can:
 - run the container registering a RTSP url:
 
   ```sh
-  docker run -p 8000:8000 -it mpromonet/webrtc-streamer -n raspicam -u rtsp://pi2.local:8554/unicast
+  docker run --name webrtc -d -p 8000:8000 -it mpromonet/webrtc-streamer -n raspicam -u rtsp://pi2.local:8554/unicast
   ```
 - run the container giving config.json file:
 
   ```sh
-  docker run -p 8000:8000 -v $PWD/config.json:/usr/local/share/webrtc-streamer/config.json mpromonet/webrtc-streamer
+  docker run --name webrtc -d -p 8000:8000 -v $PWD/config.json:/usr/local/share/webrtc-streamer/config.json mpromonet/webrtc-streamer
   ```
 
 - run the container using network host:
 
   ```sh
-  docker run --net host mpromonet/webrtc-streamer
+  docker run --name webrtc -d --net host mpromonet/webrtc-streamer
+  ```
+- run the container adding extrahost
+  ```sh
+  docker run --name webrtc -d -p 8000:8000 --add-host host.docker.internal:host-gateway mpromonet/webrtc-streamer -e host.docker.internal
   ```
 
 ## Using embedded STUN/TURN server behind a NAT
@@ -395,7 +401,9 @@ dependencies above:
 3. Build WebRTC Streamer
 
    ```sh
-   cmake . && make
+   export PATH=$PATH:`realpath ../webrtc/src/third_party/llvm-build/Release+Asserts/bin`
+   cmake -DCMAKE_C_COMPILER=clang . 
+   make
    ```
 
 It is possible to specify cmake parameters `WEBRTCROOT` &

package/docs/class-diagram.md

@@ -0,0 +1,103 @@
+# webrtc-streamer class diagram
+
+```mermaid
+classDiagram
+	direction LR
+
+	class CapturerFactory {
+		<<factory>>
+		+GetVideoCaptureDeviceList()
+		+GetAudioCaptureDeviceList()
+		+GetAudioPlayoutDeviceList()
+		+CreateVideoSource(videourl, opts, publishFilter, peerConnectionFactory, videoDecoderFactory)
+		+CreateAudioSource(audiourl, opts, publishFilter, peerConnectionFactory, audioDecoderFactory, audioDeviceModule)
+	}
+
+	class PeerConnectionManager {
+		+InitializePeerConnection()
+		+CreateVideoSource(videourl, opts)
+		+CreateAudioSource(audiourl, opts)
+		+AddStreams(peerConnection, videourl, audiourl, options)
+	}
+
+	class PeerConnectionObserver
+	class PeerConnectionFactoryInterface
+	class PeerConnectionInterface
+
+	%% VIDEO SIDE
+	class VideoTrackSourceInterface
+	class VideoTrackSource
+	class VideoSourceInterfaceFrame
+
+	class TrackSource {
+		<<template>>
+		+Create(videourl, opts, videoDecoderFactory)
+		+GetStats(stats)
+	}
+
+	class VideoSource {
+		+AddOrUpdateSink(sink, wants)
+		+RemoveSink(sink)
+	}
+
+	class VideoDecoder {
+		+AddOrUpdateSink(sink, wants)
+		+RemoveSink(sink)
+		+Decoded(decodedImage)
+		+PostFrame(content, ts, frameType)
+	}
+
+	class DesktopCapturer
+	class ScreenCapturer
+	class WindowCapturer
+	class VcmCapturer
+	class V4l2Capturer
+	class LiveVideoSource
+	class RTSPVideoCapturer
+	class FileVideoCapturer
+	class RTPVideoCapturer
+	class RtmpVideoSource
+
+	VideoTrackSourceInterface <|.. VideoTrackSource
+	VideoTrackSource <|-- TrackSource
+	VideoSourceInterfaceFrame <|.. VideoSource
+	VideoSourceInterfaceFrame <|.. VideoDecoder
+	VideoSource <|-- DesktopCapturer
+	DesktopCapturer <|-- ScreenCapturer
+	DesktopCapturer <|-- WindowCapturer
+	VideoSource <|-- VcmCapturer
+	VideoSource <|-- V4l2Capturer
+	VideoDecoder <|-- LiveVideoSource
+	LiveVideoSource <|-- RTSPVideoCapturer
+	LiveVideoSource <|-- FileVideoCapturer
+	LiveVideoSource <|-- RTPVideoCapturer
+	VideoDecoder <|-- RtmpVideoSource
+
+	%% AUDIO SIDE
+	class AudioSourceInterface
+	class LiveAudioSource {
+		+AddSink(sink)
+		+RemoveSink(sink)
+		+onNewSession(...)
+		+onData(...)
+	}
+	class RTSPAudioSource
+	class FileAudioSource
+
+	AudioSourceInterface <|.. LiveAudioSource
+	LiveAudioSource <|-- RTSPAudioSource
+	LiveAudioSource <|-- FileAudioSource
+
+	PeerConnectionManager o-- PeerConnectionFactoryInterface : owns
+	PeerConnectionManager *-- PeerConnectionObserver : manages
+	PeerConnectionObserver o-- PeerConnectionInterface : observes
+	PeerConnectionManager ..> CapturerFactory : uses
+
+	CapturerFactory ..> TrackSource : creates
+	TrackSource *-- VideoSourceInterfaceFrame : owns source
+	CapturerFactory ..> VideoTrackSourceInterface : returns
+	CapturerFactory ..> AudioSourceInterface : returns
+	PeerConnectionManager ..> AudioSourceInterface : attaches stream
+
+	class VideoSourceInterfaceFrame["VideoSourceInterface<VideoFrame>"]
+```

package/html/admin.html

@@ -35,6 +35,9 @@
 	    { headerName: "PeerId" , field: "peerid",  cellClass: "cell", headerClass: "cell" },
 	    { headerName: "StreamId", field: "streamid",  cellClass: "cell", headerClass: "cell" },
 	    { headerName: "Size", field: "size",  cellClass: "cell", headerClass: "cell" },
+	    { headerName: "Duration (s)", field: "duration_ms", cellClass: "cell", headerClass: "cell", valueFormatter: (p) => p.value != null ? (p.value / 1000).toFixed(1) + " s" : "" },
+	    { headerName: "Bytes Sent", field: "bytes_sent", cellClass: "cell", headerClass: "cell", valueFormatter: (p) => p.value != null ? (p.value / 1024).toFixed(1) + " kB" : "" },
+	    { headerName: "BW Sent", field: "bandwidth_sent_bps", cellClass: "cell", headerClass: "cell", valueFormatter: (p) => p.value != null ? (p.value / 1000).toFixed(1) + " kbps" : "" },
 	    { headerName: "Ice State", field: "ice_state",  cellClass: "cell", headerClass: "cell" },
 	    { headerName: "Nb Candidates", field: "nbCandidates",  cellClass: "cell", headerClass: "cell" },		
 	    { headerName: "PC State", field: "pc_state",  cellClass: "cell", headerClass: "cell" },
@@ -89,7 +92,7 @@
 				});
 			}
 			
-			rowData.push({peerid: Object.keys(item)[0] , streamid, size:frameHeight+"x"+frameWidth, action:"hangup", nbCandidates: Object.values(item)[0].candidateList.length, ... Object.values(item)[0] })
+			rowData.push({peerid: Object.keys(item)[0] , streamid, size:frameHeight+"x"+frameWidth, action:"hangup", nbCandidates: Object.values(item)[0]?.candidateList?.length, ... Object.values(item)[0] })
 		});
 		gridOptions.api.setRowData(rowData);		
 	}