1
0
Fork 0
forked from External/mediamtx

Compare commits

..

1 commit

Author SHA1 Message Date
dependabot[bot]
f4c335bf19
build(deps): bump github.com/pion/rtp
Bumps [github.com/pion/rtp](https://github.com/pion/rtp) from 1.8.7-0.20240429002300-bc5124c9d0d0 to 1.8.7.
- [Release notes](https://github.com/pion/rtp/releases)
- [Changelog](https://github.com/pion/rtp/blob/master/.goreleaser.yml)
- [Commits](https://github.com/pion/rtp/commits/v1.8.7)

---
updated-dependencies:
- dependency-name: github.com/pion/rtp
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-07-15 17:12:27 +00:00
6 changed files with 6 additions and 51 deletions

View file

@ -1,17 +0,0 @@
## build ergo binary
FROM docker.io/golang:1.22-alpine AS build-env
RUN apk upgrade -U --force-refresh --no-cache
RUN apk add --no-cache --purge --clean-protected -l -u make git
# copy ergo source
WORKDIR /go/src/cef.icu/mediamtx
COPY . .
RUN go generate ./...
RUN CGO_ENABLED=0 go build .
WORKDIR /mediamtx
RUN mkdir conf && cp /go/src/cef.icu/mediamtx/mediamtx .
EXPOSE 8189/udp 8198/tcp 1935/tcp 8889/tcp 9997/tcp
ENTRYPOINT ["/mediamtx/mediamtx"]

4
go.mod
View file

@ -11,7 +11,7 @@ require (
github.com/bluenviron/gohlslib v1.4.0
github.com/bluenviron/gortsplib/v4 v4.10.2
github.com/bluenviron/mediacommon v1.12.1
github.com/datarhei/gosrt v0.7.0
github.com/datarhei/gosrt v0.6.1-0.20240708145230-390712a1b3f7
github.com/fsnotify/fsnotify v1.7.0
github.com/gin-gonic/gin v1.10.0
github.com/golang-jwt/jwt/v5 v5.2.1
@ -24,7 +24,7 @@ require (
github.com/pion/interceptor v0.1.29
github.com/pion/logging v0.2.2
github.com/pion/rtcp v1.2.14
github.com/pion/rtp v1.8.7-0.20240429002300-bc5124c9d0d0
github.com/pion/rtp v1.8.7
github.com/pion/sdp/v3 v3.0.9
github.com/pion/webrtc/v3 v3.2.22
github.com/stretchr/testify v1.9.0

8
go.sum
View file

@ -37,8 +37,8 @@ github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJ
github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
github.com/datarhei/gosrt v0.7.0 h1:1/IY66HVVgqGA9zkmL5l6jUFuI8t/76WkuamSkJqHqs=
github.com/datarhei/gosrt v0.7.0/go.mod h1:wTDoyog1z4au8Fd/QJBQAndzvccuxjqUL/qMm0EyJxE=
github.com/datarhei/gosrt v0.6.1-0.20240708145230-390712a1b3f7 h1:Tyvgum9NHQi/iDoYUQhuxjUnu/s4tJXNdYCeUZma5Z0=
github.com/datarhei/gosrt v0.6.1-0.20240708145230-390712a1b3f7/go.mod h1:wTDoyog1z4au8Fd/QJBQAndzvccuxjqUL/qMm0EyJxE=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -149,8 +149,8 @@ github.com/pion/rtcp v1.2.12/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9
github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE=
github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
github.com/pion/rtp v1.8.7-0.20240429002300-bc5124c9d0d0 h1:yPAphilskTN7U3URvBVxlVr0PzheMeWqo7PaOqh//Hg=
github.com/pion/rtp v1.8.7-0.20240429002300-bc5124c9d0d0/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
github.com/pion/rtp v1.8.7 h1:qslKkG8qxvQ7hqaxkmL7Pl0XcUm+/Er7nMnu6Vq+ZxM=
github.com/pion/rtp v1.8.7/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.16 h1:PKrMs+o9EMLRvFfXq59WFsC+V8mN1wnKzqrv+3D/gYY=
github.com/pion/sctp v1.8.16/go.mod h1:P6PbDVA++OJMrVNg2AL3XtYHV4uD6dvfyOovCgMs0PE=

View file

@ -180,10 +180,6 @@ type Path struct {
RunOnUnread string `json:"runOnUnread"`
RunOnRecordSegmentCreate string `json:"runOnRecordSegmentCreate"`
RunOnRecordSegmentComplete string `json:"runOnRecordSegmentComplete"`
// Custom hooks
HTTPOnReady string `json:"httpOnReady"`
HTTPOnNotReady string `json:"httpOnNotReady"`
}
func (pconf *Path) setDefaults() {

View file

@ -1,13 +1,10 @@
package hooks
import (
"bytes"
"encoding/json"
"github.com/bluenviron/mediamtx/internal/conf"
"github.com/bluenviron/mediamtx/internal/defs"
"github.com/bluenviron/mediamtx/internal/externalcmd"
"github.com/bluenviron/mediamtx/internal/logger"
"net/http"
)
// OnReadyParams are the parameters of OnReady.
@ -44,16 +41,6 @@ func OnReady(params OnReadyParams) func() {
})
}
if params.Conf.HTTPOnReady != "" {
obj := map[string]any{
"query": params.Query,
"desc": params.Desc,
"env": params.ExternalCmdEnv,
}
jsonValue, _ := json.Marshal(obj)
http.Post(params.Conf.HTTPOnReady, "application/json", bytes.NewBuffer(jsonValue))
}
return func() {
if onReadyCmd != nil {
onReadyCmd.Close()
@ -69,15 +56,5 @@ func OnReady(params OnReadyParams) func() {
env,
nil)
}
if params.Conf.HTTPOnNotReady != "" {
obj := map[string]any{
"query": params.Query,
"desc": params.Desc,
"env": params.ExternalCmdEnv,
}
jsonValue, _ := json.Marshal(obj)
http.Post(params.Conf.HTTPOnNotReady, "application/json", bytes.NewBuffer(jsonValue))
}
}
}

View file

@ -437,7 +437,6 @@ const sendOffer = (offer) => {
return res.text()
.then((sdp) => onRemoteAnswer(sdp));
})
.then((sdp) => onRemoteAnswer(sdp))
.catch((err) => {
onError(err.toString());
});