From 6ca41c929f67d3183e352c43e35b328abd391fc2 Mon Sep 17 00:00:00 2001 From: Santiago Lo Coco Date: Wed, 20 Nov 2024 23:26:13 +0100 Subject: [PATCH] Update config files and refactor --- .gitignore | 1 + README.md | 4 +- docker-compose.yml | 1 - mediamtx/mediamtx.template.yml | 58 ++++++++++ mediamtx/mediamtx_1.yml | 198 ++++----------------------------- mediamtx/mediamtx_2.yml | 198 ++++----------------------------- 6 files changed, 105 insertions(+), 355 deletions(-) create mode 100644 .gitignore create mode 100644 mediamtx/mediamtx.template.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..bd58bb4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +creation \ No newline at end of file diff --git a/README.md b/README.md index 2785a96..db79d48 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ - Create a scene collection named `Profile2` and a profile named `Profile2`. - Add scenes and configure the input sources (e.g., HDMI cards) for each scene collection. - For each profile, go to `Settings` -> `Stream`, set `Service` to WHIP, and enter the endpoint for each MediaMTX server: - - Profile1: `http://localhost:8100/mystream/whip` - - Profile2: `http://localhost:8200/mystream/whip` + - Profile1: `http://192.168.137.1:8100/mystream/whip` + - Profile2: `http://192.168.137.1:8200/mystream/whip` ## IP address configuration diff --git a/docker-compose.yml b/docker-compose.yml index 246b1fe..1a547f6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,6 @@ services: mediamtx-1: &default container_name: mediamtx-1 environment: - - MTX_PROTOCOLS=tcp - MTX_WEBRTCADDITIONALHOSTS=192.168.137.1 image: bluenviron/mediamtx ports: diff --git a/mediamtx/mediamtx.template.yml b/mediamtx/mediamtx.template.yml new file mode 100644 index 0000000..05c03b1 --- /dev/null +++ b/mediamtx/mediamtx.template.yml @@ -0,0 +1,58 @@ +webrtcAddress: :{{WEBRTC_PORT}} +webrtcLocalUDPAddress: :{{WEBRTC_LISTENER_PORT}} +webrtcLocalTCPAddress: '' + +webrtcEncryption: no +webrtcAllowOrigin: '*' +webrtcTrustedProxies: [] +webrtcIPsFromInterfaces: yes +webrtcIPsFromInterfacesList: [] +webrtcAdditionalHosts: [] +webrtcICEServers2: [] + +logLevel: debug +logDestinations: [stdout] +logFile: mediamtx.log + +readTimeout: 10s +writeTimeout: 10s +writeQueueSize: 512 +udpMaxPayloadSize: 1472 + +runOnConnectRestart: no + +api: no +metrics: no +pprof: no +playback: no +rtsp: no +rtmp: no +hls: no +srt: no +webrtc: yes + +authMethod: internal +authInternalUsers: +- user: any + pass: + ips: [] + permissions: + - action: publish + path: + - action: read + path: + - action: playback + path: + +pathDefaults: + source: publisher + sourceFingerprint: + sourceOnDemand: no + sourceOnDemandStartTimeout: 10s + sourceOnDemandCloseAfter: 10s + maxReaders: 0 + srtReadPassphrase: + fallback: + +paths: + all_others: diff --git a/mediamtx/mediamtx_1.yml b/mediamtx/mediamtx_1.yml index 13788dd..b2d0582 100644 --- a/mediamtx/mediamtx_1.yml +++ b/mediamtx/mediamtx_1.yml @@ -1,3 +1,15 @@ +webrtcAddress: :8100 +webrtcLocalUDPAddress: :8101 +webrtcLocalTCPAddress: '' + +webrtcEncryption: no +webrtcAllowOrigin: '*' +webrtcTrustedProxies: [] +webrtcIPsFromInterfaces: yes +webrtcIPsFromInterfacesList: [] +webrtcAdditionalHosts: [] +webrtcICEServers2: [] + logLevel: debug logDestinations: [stdout] logFile: mediamtx.log @@ -7,13 +19,19 @@ writeTimeout: 10s writeQueueSize: 512 udpMaxPayloadSize: 1472 -runOnConnect: runOnConnectRestart: no -runOnDisconnect: +api: no +metrics: no +pprof: no +playback: no +rtsp: no +rtmp: no +hls: no +srt: no +webrtc: yes authMethod: internal - authInternalUsers: - user: any pass: @@ -26,117 +44,6 @@ authInternalUsers: - action: playback path: -- user: any - pass: - ips: ['127.0.0.1', '::1'] - permissions: - - action: api - - action: metrics - - action: pprof - -authHTTPAddress: -authHTTPExclude: -- action: api -- action: metrics -- action: pprof - -authJWTJWKS: - - -api: no -apiAddress: :9997 -apiEncryption: no -apiServerKey: server.key -apiServerCert: server.crt -apiAllowOrigin: '*' -apiTrustedProxies: [] - - -metrics: no -metricsAddress: :9998 -metricsEncryption: no -metricsServerKey: server.key -metricsServerCert: server.crt -metricsAllowOrigin: '*' -metricsTrustedProxies: [] - - -pprof: no -pprofAddress: :9999 -pprofEncryption: no -pprofServerKey: server.key -pprofServerCert: server.crt -pprofAllowOrigin: '*' -pprofTrustedProxies: [] - - -playback: no -playbackAddress: :9996 -playbackEncryption: no -playbackServerKey: server.key -playbackServerCert: server.crt -playbackAllowOrigin: '*' -playbackTrustedProxies: [] - - -rtsp: no -protocols: [udp, multicast, tcp] -encryption: "no" -rtspAddress: :8102 -rtspsAddress: :8322 -rtpAddress: :8000 -rtcpAddress: :8001 -multicastIPRange: 224.1.0.0/16 -multicastRTPPort: 8002 -multicastRTCPPort: 8003 -serverKey: server.key -serverCert: server.crt -rtspAuthMethods: [basic] - - -rtmp: no -rtmpAddress: :1935 -rtmpEncryption: "no" -rtmpsAddress: :1936 -rtmpServerKey: server.key -rtmpServerCert: server.crt - - -hls: no -hlsAddress: :8888 -hlsEncryption: no -hlsServerKey: server.key -hlsServerCert: server.crt -hlsAllowOrigin: '*' -hlsTrustedProxies: [] -hlsAlwaysRemux: no -hlsVariant: lowLatency -hlsSegmentCount: 7 -hlsSegmentDuration: 1s -hlsPartDuration: 200ms -hlsSegmentMaxSize: 50M -hlsDirectory: '' - - -webrtc: yes -webrtcAddress: :8100 -webrtcEncryption: no -webrtcServerKey: server.key -webrtcServerCert: server.crt -webrtcAllowOrigin: '*' -webrtcTrustedProxies: [] -webrtcLocalUDPAddress: :8101 -webrtcLocalTCPAddress: '' -webrtcIPsFromInterfaces: yes -webrtcIPsFromInterfacesList: [] -webrtcAdditionalHosts: [] -webrtcICEServers2: [] - - -srt: no -srtAddress: :8890 - - pathDefaults: source: publisher sourceFingerprint: @@ -146,67 +53,6 @@ pathDefaults: maxReaders: 0 srtReadPassphrase: fallback: - record: no - recordPath: ./recordings/%path/%Y-%m-%d_%H-%M-%S-%f - recordFormat: fmp4 - recordPartDuration: 1s - recordSegmentDuration: 1h - recordDeleteAfter: 24h - overridePublisher: yes - srtPublishPassphrase: - rtspTransport: automatic - rtspAnyPort: no - rtspRangeType: - rtspRangeStart: - sourceRedirect: - rpiCameraCamID: 0 - rpiCameraWidth: 1920 - rpiCameraHeight: 1080 - rpiCameraHFlip: false - rpiCameraVFlip: false - rpiCameraBrightness: 0 - rpiCameraContrast: 1 - rpiCameraSaturation: 1 - rpiCameraSharpness: 1 - rpiCameraExposure: normal - rpiCameraAWB: auto - rpiCameraAWBGains: [0, 0] - rpiCameraDenoise: "off" - rpiCameraShutter: 0 - rpiCameraMetering: centre - rpiCameraGain: 0 - rpiCameraEV: 0 - rpiCameraROI: - rpiCameraHDR: false - rpiCameraTuningFile: - rpiCameraMode: - rpiCameraFPS: 30 - rpiCameraIDRPeriod: 60 - rpiCameraBitrate: 1000000 - rpiCameraProfile: main - rpiCameraLevel: '4.1' - rpiCameraAfMode: continuous - rpiCameraAfRange: normal - rpiCameraAfSpeed: normal - rpiCameraLensPosition: 0.0 - rpiCameraAfWindow: - rpiCameraTextOverlayEnable: false - rpiCameraTextOverlay: '%Y-%m-%d %H:%M:%S - MediaMTX' - runOnInit: - runOnInitRestart: no - runOnDemand: - runOnDemandRestart: no - runOnDemandStartTimeout: 10s - runOnDemandCloseAfter: 10s - runOnUnDemand: - runOnReady: - runOnReadyRestart: no - runOnNotReady: - runOnRead: - runOnReadRestart: no - runOnUnread: - runOnRecordSegmentCreate: - runOnRecordSegmentComplete: paths: - all_others: \ No newline at end of file + all_others: diff --git a/mediamtx/mediamtx_2.yml b/mediamtx/mediamtx_2.yml index 99fc5df..7778f7c 100644 --- a/mediamtx/mediamtx_2.yml +++ b/mediamtx/mediamtx_2.yml @@ -1,3 +1,15 @@ +webrtcAddress: :8200 +webrtcLocalUDPAddress: :8201 +webrtcLocalTCPAddress: '' + +webrtcEncryption: no +webrtcAllowOrigin: '*' +webrtcTrustedProxies: [] +webrtcIPsFromInterfaces: yes +webrtcIPsFromInterfacesList: [] +webrtcAdditionalHosts: [] +webrtcICEServers2: [] + logLevel: debug logDestinations: [stdout] logFile: mediamtx.log @@ -7,13 +19,19 @@ writeTimeout: 10s writeQueueSize: 512 udpMaxPayloadSize: 1472 -runOnConnect: runOnConnectRestart: no -runOnDisconnect: +api: no +metrics: no +pprof: no +playback: no +rtsp: no +rtmp: no +hls: no +srt: no +webrtc: yes authMethod: internal - authInternalUsers: - user: any pass: @@ -26,117 +44,6 @@ authInternalUsers: - action: playback path: -- user: any - pass: - ips: ['127.0.0.1', '::1'] - permissions: - - action: api - - action: metrics - - action: pprof - -authHTTPAddress: -authHTTPExclude: -- action: api -- action: metrics -- action: pprof - -authJWTJWKS: - - -api: no -apiAddress: :9997 -apiEncryption: no -apiServerKey: server.key -apiServerCert: server.crt -apiAllowOrigin: '*' -apiTrustedProxies: [] - - -metrics: no -metricsAddress: :9998 -metricsEncryption: no -metricsServerKey: server.key -metricsServerCert: server.crt -metricsAllowOrigin: '*' -metricsTrustedProxies: [] - - -pprof: no -pprofAddress: :9999 -pprofEncryption: no -pprofServerKey: server.key -pprofServerCert: server.crt -pprofAllowOrigin: '*' -pprofTrustedProxies: [] - - -playback: no -playbackAddress: :9996 -playbackEncryption: no -playbackServerKey: server.key -playbackServerCert: server.crt -playbackAllowOrigin: '*' -playbackTrustedProxies: [] - - -rtsp: no -protocols: [udp, multicast, tcp] -encryption: "no" -rtspAddress: :8554 -rtspsAddress: :8322 -rtpAddress: :8000 -rtcpAddress: :8001 -multicastIPRange: 224.1.0.0/16 -multicastRTPPort: 8002 -multicastRTCPPort: 8003 -serverKey: server.key -serverCert: server.crt -rtspAuthMethods: [basic] - - -rtmp: no -rtmpAddress: :1935 -rtmpEncryption: "no" -rtmpsAddress: :1936 -rtmpServerKey: server.key -rtmpServerCert: server.crt - - -hls: no -hlsAddress: :8888 -hlsEncryption: no -hlsServerKey: server.key -hlsServerCert: server.crt -hlsAllowOrigin: '*' -hlsTrustedProxies: [] -hlsAlwaysRemux: no -hlsVariant: lowLatency -hlsSegmentCount: 7 -hlsSegmentDuration: 1s -hlsPartDuration: 200ms -hlsSegmentMaxSize: 50M -hlsDirectory: '' - - -webrtc: yes -webrtcAddress: :8200 -webrtcEncryption: no -webrtcServerKey: server.key -webrtcServerCert: server.crt -webrtcAllowOrigin: '*' -webrtcTrustedProxies: [] -webrtcLocalUDPAddress: :8201 -webrtcLocalTCPAddress: '' -webrtcIPsFromInterfaces: yes -webrtcIPsFromInterfacesList: [] -webrtcAdditionalHosts: [] -webrtcICEServers2: [] - - -srt: no -srtAddress: :8890 - - pathDefaults: source: publisher sourceFingerprint: @@ -146,67 +53,6 @@ pathDefaults: maxReaders: 0 srtReadPassphrase: fallback: - record: no - recordPath: ./recordings/%path/%Y-%m-%d_%H-%M-%S-%f - recordFormat: fmp4 - recordPartDuration: 1s - recordSegmentDuration: 1h - recordDeleteAfter: 24h - overridePublisher: yes - srtPublishPassphrase: - rtspTransport: automatic - rtspAnyPort: no - rtspRangeType: - rtspRangeStart: - sourceRedirect: - rpiCameraCamID: 0 - rpiCameraWidth: 1920 - rpiCameraHeight: 1080 - rpiCameraHFlip: false - rpiCameraVFlip: false - rpiCameraBrightness: 0 - rpiCameraContrast: 1 - rpiCameraSaturation: 1 - rpiCameraSharpness: 1 - rpiCameraExposure: normal - rpiCameraAWB: auto - rpiCameraAWBGains: [0, 0] - rpiCameraDenoise: "off" - rpiCameraShutter: 0 - rpiCameraMetering: centre - rpiCameraGain: 0 - rpiCameraEV: 0 - rpiCameraROI: - rpiCameraHDR: false - rpiCameraTuningFile: - rpiCameraMode: - rpiCameraFPS: 30 - rpiCameraIDRPeriod: 60 - rpiCameraBitrate: 1000000 - rpiCameraProfile: main - rpiCameraLevel: '4.1' - rpiCameraAfMode: continuous - rpiCameraAfRange: normal - rpiCameraAfSpeed: normal - rpiCameraLensPosition: 0.0 - rpiCameraAfWindow: - rpiCameraTextOverlayEnable: false - rpiCameraTextOverlay: '%Y-%m-%d %H:%M:%S - MediaMTX' - runOnInit: - runOnInitRestart: no - runOnDemand: - runOnDemandRestart: no - runOnDemandStartTimeout: 10s - runOnDemandCloseAfter: 10s - runOnUnDemand: - runOnReady: - runOnReadyRestart: no - runOnNotReady: - runOnRead: - runOnReadRestart: no - runOnUnread: - runOnRecordSegmentCreate: - runOnRecordSegmentComplete: paths: - all_others: \ No newline at end of file + all_others: