Merge pull request #2 from bluenviron/main

pull in changes from main fork

.github/DISCUSSION_TEMPLATE/questions.yml

@@ -0,0 +1,16 @@
+body:
+
+  - type: textarea
+    attributes:
+      label: Question
+    validations:
+      required: true
+
+  - type: markdown
+    attributes:
+      value: |
+        Note: If you are asking for help because you're having trouble doing something, provide enough informations to replicate the problem. In particular, include in the question:
+
+        * the server version you are using
+        * precise instructions on how to replicate the problem
+        * server logs with setting `logLevel` set to `debug`

.github/ISSUE_TEMPLATE/config.yml

@@ -2,5 +2,5 @@ blank_issues_enabled: false
 
 contact_links:
   - name: Question
-    url: https://github.com/bluenviron/mediamtx/discussions/new
+    url: https://github.com/bluenviron/mediamtx/discussions/new?category=questions
     about: Ask the community for help

apidocs/openapi.yaml

@@ -53,6 +53,8 @@ components:
           type: string
         runOnConnectRestart:
           type: boolean
+        runOnDisconnect:
+          type: string
 
         # RTSP
         rtsp:
@@ -175,6 +177,20 @@ components:
         srtAddress:
           type: string
 
+        # Record
+        record:
+          type: boolean
+        recordPath:
+          type: string
+        recordFormat:
+          type: string
+        recordPartDuration:
+          type: string
+        recordSegmentDuration:
+          type: string
+        recordDeleteAfter:
+          type: string
+
         # Paths
         paths:
           type: object
@@ -196,7 +212,11 @@ components:
         sourceOnDemandCloseAfter:
           type: string
         maxReaders:
-          type: number
+          type: integer
+        srtReadPassphrase:
+          type: string
+        record:
+          type: boolean
 
         # Authentication
         publishUser:
@@ -221,6 +241,8 @@ components:
           type: boolean
         fallback:
           type: string
+        srtPublishPassphrase:
+          type: string
 
         # RTSP
         sourceProtocol:
@@ -302,7 +324,7 @@ components:
         rpiCameraTextOverlay:
           type: string
 
-        # External commands
+        # Hooks
         runOnInit:
           type: string
         runOnInitRestart:
@@ -319,10 +341,16 @@ components:
           type: string
         runOnReadyRestart:
           type: boolean
+        runOnNotReady:
+          type: string
         runOnRead:
           type: string
         runOnReadRestart:
           type: boolean
+        runOnUnread:
+          type: string
+        runOnRecordSegmentComplete:
+          type: string
 
     Path:
       type: object
@@ -335,6 +363,7 @@ components:
           $ref: '#/components/schemas/PathConf'
         source:
           $ref: '#/components/schemas/PathSourceOrReader'
+          nullable: true
         ready:
           type: boolean
         readyTime:
@@ -691,13 +720,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -747,13 +776,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -803,13 +832,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -859,13 +888,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -937,13 +966,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -993,13 +1022,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -1073,13 +1102,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -1151,13 +1180,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -1229,13 +1258,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':
@@ -1307,13 +1336,13 @@ paths:
         in: query
         description: page number.
         schema:
-          type: number
+          type: integer
           default: 0
       - name: itemsPerPage
         in: query
         description: items per page.
         schema:
-          type: number
+          type: integer
           default: 100
       responses:
         '200':

go.mod

@@ -4,11 +4,12 @@ go 1.20
 
 require (
 	code.cloudfoundry.org/bytefmt v0.0.0
-	github.com/abema/go-mp4 v0.13.0
+	github.com/abema/go-mp4 v1.1.0
 	github.com/alecthomas/kong v0.8.0
-	github.com/bluenviron/gohlslib v1.0.2
-	github.com/bluenviron/gortsplib/v4 v4.0.2-0.20230911215322-4ede58cda208
-	github.com/bluenviron/mediacommon v1.2.0
+	github.com/aler9/writerseeker v1.1.0
+	github.com/bluenviron/gohlslib v1.0.3
+	github.com/bluenviron/gortsplib/v4 v4.2.0
+	github.com/bluenviron/mediacommon v1.4.1-0.20230924203439-7ac007e2ac2d
 	github.com/datarhei/gosrt v0.5.4
 	github.com/fsnotify/fsnotify v1.6.0
 	github.com/gin-gonic/gin v1.9.1
@@ -18,19 +19,18 @@ require (
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
 	github.com/notedit/rtmp v0.0.2
 	github.com/pion/ice/v2 v2.3.11
-	github.com/pion/interceptor v0.1.19
+	github.com/pion/interceptor v0.1.20
 	github.com/pion/rtcp v1.2.10
-	github.com/pion/rtp v1.8.1
+	github.com/pion/rtp v1.8.2
 	github.com/pion/sdp/v3 v3.0.6
-	github.com/pion/webrtc/v3 v3.2.20
+	github.com/pion/webrtc/v3 v3.2.21
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/crypto v0.13.0
 	golang.org/x/term v0.12.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	github.com/aler9/writerseeker v1.1.0 // indirect
 	github.com/asticode/go-astikit v0.30.0 // indirect
 	github.com/asticode/go-astits v1.13.0 // indirect
 	github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c // indirect

go.sum

@@ -1,5 +1,5 @@
-github.com/abema/go-mp4 v0.13.0 h1:gjEZLt7g0ePpYA5sUDrI2r8X+WuI8o+USkgG5wMgmkI=
-github.com/abema/go-mp4 v0.13.0/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws=
+github.com/abema/go-mp4 v1.1.0 h1:wr2uc6ENLtYNw/nRmjIYkAc6ZuAUe88FAUYAeZhcAgE=
+github.com/abema/go-mp4 v1.1.0/go.mod h1:vPl9t5ZK7K0x68jh12/+ECWBCXoWuIDtNgPtU2f04ws=
 github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0=
 github.com/alecthomas/kong v0.8.0 h1:ryDCzutfIqJPnNn0omnrgHLbAggDQM2VWHikE1xqK7s=
 github.com/alecthomas/kong v0.8.0/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=
@@ -12,12 +12,12 @@ github.com/asticode/go-astits v1.13.0 h1:XOgkaadfZODnyZRR5Y0/DWkA9vrkLLPLeeOvDwf
 github.com/asticode/go-astits v1.13.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
 github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c h1:8XZeJrs4+ZYhJeJ2aZxADI2tGADS15AzIF8MQ8XAhT4=
 github.com/benburkert/openpgp v0.0.0-20160410205803-c2471f86866c/go.mod h1:x1vxHcL/9AVzuk5HOloOEPrtJY0MaalYr78afXZ+pWI=
-github.com/bluenviron/gohlslib v1.0.2 h1:LDA/CubL525e9rLWw+G/9GbFS6iXwozmOg8KJBT4qF4=
-github.com/bluenviron/gohlslib v1.0.2/go.mod h1:oam0wsI2XqcHLTG6NM8HRvxAQsa3hIA0MLRiTOE7CB8=
-github.com/bluenviron/gortsplib/v4 v4.0.2-0.20230911215322-4ede58cda208 h1:w1aishvJ4U2TuM1SsFmWoKuFNogqhla3eh2Qn6AyRtE=
-github.com/bluenviron/gortsplib/v4 v4.0.2-0.20230911215322-4ede58cda208/go.mod h1:l6LO4TlHC3YdLIbEn89GeeSgzHaJlpAFF7NLZ7h4A+A=
-github.com/bluenviron/mediacommon v1.2.0 h1:5tz92r2S4gPSiTlycepjXFZCgwGfVL2htCeVsoBac+U=
-github.com/bluenviron/mediacommon v1.2.0/go.mod h1:/vlOVSebDwzdRtQONOKLua0fOSJg1tUDHpP+h9a0uqM=
+github.com/bluenviron/gohlslib v1.0.3 h1:FMHevlIrrZ67uzCXmlTSGflsfYREEtHb8L9BDyf7lJc=
+github.com/bluenviron/gohlslib v1.0.3/go.mod h1:R/aIsSxLI61N0CVMjtcHqJouK6+Ddd5YIihcCr7IFIw=
+github.com/bluenviron/gortsplib/v4 v4.2.0 h1:EbIMqkFxFo/iG5Hkld+Flew9R8ORKnuxlgUyFdpd5Rk=
+github.com/bluenviron/gortsplib/v4 v4.2.0/go.mod h1:wz9d4Tn2qS/mexc+BnvNeWzlNOpyaHzNK6SXxtg4mfM=
+github.com/bluenviron/mediacommon v1.4.1-0.20230924203439-7ac007e2ac2d h1:VbzIg0t5HKfyLbuzWeNU64JdOtTUp981Fx9ljdMRGpM=
+github.com/bluenviron/mediacommon v1.4.1-0.20230924203439-7ac007e2ac2d/go.mod h1:/vlOVSebDwzdRtQONOKLua0fOSJg1tUDHpP+h9a0uqM=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
@@ -124,8 +124,8 @@ github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ
 github.com/pion/ice/v2 v2.3.11 h1:rZjVmUwyT55cmN8ySMpL7rsS8KYsJERsrxJLLxpKhdw=
 github.com/pion/ice/v2 v2.3.11/go.mod h1:hPcLC3kxMa+JGRzMHqQzjoSj3xtE9F+eoncmXLlCL4E=
 github.com/pion/interceptor v0.1.18/go.mod h1:tpvvF4cPM6NGxFA1DUMbhabzQBxdWMATDGEUYOR9x6I=
-github.com/pion/interceptor v0.1.19 h1:tq0TGBzuZQqipyBhaC1mVUCfCh8XjDKUuibq9rIl5t4=
-github.com/pion/interceptor v0.1.19/go.mod h1:VANhFxdJezB8mwToMMmrmyHyP9gym6xLqIUch31xryg=
+github.com/pion/interceptor v0.1.20 h1:gORAnvlXu1f4Bx+TcXe8UJ37Jqb/tkNQ6E83NNqYZh0=
+github.com/pion/interceptor v0.1.20/go.mod h1:wkbPYAak5zKsfpVDYMtEfWEy8D4zL+rpxCxPImLOg3Y=
 github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
 github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
 github.com/pion/mdns v0.0.8 h1:HhicWIg7OX5PVilyBO6plhMetInbzkVJAhbdJiAeVaI=
@@ -134,8 +134,9 @@ github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
 github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
 github.com/pion/rtcp v1.2.10 h1:nkr3uj+8Sp97zyItdN60tE/S6vk4al5CPRR6Gejsdjc=
 github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL1I=
-github.com/pion/rtp v1.8.1 h1:26OxTc6lKg/qLSGir5agLyj0QKaOv8OP5wps2SFnVNQ=
 github.com/pion/rtp v1.8.1/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/rtp v1.8.2 h1:oKMM0K1/QYQ5b5qH+ikqDSZRipP5mIxPJcgcvw5sH0w=
+github.com/pion/rtp v1.8.2/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
 github.com/pion/sctp v1.8.5/go.mod h1:SUFFfDpViyKejTAdwD1d/HQsCu+V/40cCs2nZIvC3s0=
 github.com/pion/sctp v1.8.8 h1:5EdnnKI4gpyR1a1TwbiS/wxEgcUWBHsc7ILAjARJB+U=
 github.com/pion/sctp v1.8.8/go.mod h1:igF9nZBrjh5AtmKc7U30jXltsFHicFCXSmWA2GWRaWs=
@@ -155,8 +156,8 @@ github.com/pion/transport/v3 v3.0.1 h1:gDTlPJwROfSfz6QfSi0ZmeCSkFcnWWiiR9ES0ouAN
 github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0=
 github.com/pion/turn/v2 v2.1.3 h1:pYxTVWG2gpC97opdRc5IGsQ1lJ9O/IlNhkzj7MMrGAA=
 github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY=
-github.com/pion/webrtc/v3 v3.2.20 h1:BQJiXQsJq9LgLp3op7rLy1y8d2WD+LtiS9cpY0uQ22A=
-github.com/pion/webrtc/v3 v3.2.20/go.mod h1:vVURQTBOG5BpWKOJz3nlr23NfTDeyKVmubRNqzQp+Tg=
+github.com/pion/webrtc/v3 v3.2.21 h1:c8fy5JcqJkAQBwwy3Sk9huQLTBUSqaggyRlv9Lnh2zY=
+github.com/pion/webrtc/v3 v3.2.21/go.mod h1:vVURQTBOG5BpWKOJz3nlr23NfTDeyKVmubRNqzQp+Tg=
 github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=