From 244da930a16780783cfedd019190537b10bd4a05 Mon Sep 17 00:00:00 2001 From: Alessandro Ros Date: Mon, 17 Feb 2025 14:54:58 +0100 Subject: [PATCH] switch to mediacommon/v2 (#4259) --- go.mod | 8 ++--- go.sum | 16 +++++----- internal/auth/manager.go | 4 +-- internal/auth/manager_test.go | 6 ++-- internal/conf/conf.go | 6 ++-- internal/conf/rtsp_auth_methods.go | 8 ++--- internal/core/api_test.go | 6 ++-- internal/core/metrics_test.go | 4 +-- internal/formatprocessor/h264.go | 2 +- internal/formatprocessor/h264_test.go | 2 +- internal/formatprocessor/h265.go | 2 +- internal/formatprocessor/h265_test.go | 2 +- internal/formatprocessor/mpeg4_video.go | 2 +- internal/formatprocessor/opus.go | 2 +- internal/playback/muxer.go | 2 +- internal/playback/muxer_fmp4.go | 4 +-- internal/playback/muxer_mp4.go | 4 +-- internal/playback/on_get.go | 2 +- internal/playback/on_get_test.go | 6 ++-- internal/playback/on_list.go | 2 +- internal/playback/on_list_test.go | 2 +- internal/playback/segment_fmp4.go | 2 +- internal/playback/segment_fmp4_test.go | 4 +-- internal/protocols/mpegts/from_stream.go | 22 ++++++------- internal/protocols/mpegts/to_stream.go | 4 +-- internal/protocols/mpegts/to_stream_test.go | 2 +- internal/protocols/rtmp/from_stream.go | 10 +++--- .../message/msg_audio_ex_sequence_start.go | 2 +- .../protocols/rtmp/message/reader_test.go | 2 +- internal/protocols/rtmp/reader.go | 10 +++--- internal/protocols/rtmp/reader_test.go | 4 +-- internal/protocols/rtmp/writer.go | 8 ++--- internal/protocols/rtmp/writer_test.go | 2 +- internal/protocols/webrtc/from_stream.go | 2 +- internal/recorder/format_fmp4.go | 32 +++++++++---------- internal/recorder/format_fmp4_part.go | 4 +-- internal/recorder/format_fmp4_segment.go | 4 +-- internal/recorder/format_fmp4_track.go | 2 +- internal/recorder/format_mpegts.go | 24 +++++++------- internal/recorder/recorder_instance.go | 2 +- internal/recorder/recorder_test.go | 6 ++-- internal/servers/rtsp/conn.go | 2 +- internal/servers/rtsp/server.go | 2 +- internal/servers/rtsp/server_test.go | 4 +-- internal/servers/srt/conn.go | 2 +- internal/servers/srt/server_test.go | 6 ++-- internal/staticsources/hls/source_test.go | 6 ++-- internal/staticsources/rpicamera/camera.go | 2 +- internal/staticsources/rtsp/source_test.go | 4 +-- internal/staticsources/srt/source.go | 2 +- internal/staticsources/srt/source_test.go | 4 +-- internal/staticsources/udp/source.go | 2 +- internal/staticsources/udp/source_test.go | 6 ++-- internal/test/formats.go | 2 +- 54 files changed, 142 insertions(+), 142 deletions(-) diff --git a/go.mod b/go.mod index 973c1068..a6704d5d 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/abema/go-mp4 v1.4.1 github.com/alecthomas/kong v1.8.1 github.com/asticode/go-astits v1.13.0 - github.com/bluenviron/gohlslib/v2 v2.1.3 - github.com/bluenviron/gortsplib/v4 v4.12.3 - github.com/bluenviron/mediacommon v1.14.0 + github.com/bluenviron/gohlslib/v2 v2.1.4-0.20250210133907-d3dddacbb9fc + github.com/bluenviron/gortsplib/v4 v4.12.4-0.20250214103455-885a9975ef10 + github.com/bluenviron/mediacommon/v2 v2.0.0 github.com/datarhei/gosrt v0.8.0 github.com/fsnotify/fsnotify v1.8.0 github.com/gin-contrib/pprof v1.5.2 @@ -89,7 +89,7 @@ require ( github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect golang.org/x/arch v0.12.0 // indirect golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.34.0 // indirect + golang.org/x/net v0.35.0 // indirect golang.org/x/sync v0.11.0 // indirect golang.org/x/text v0.22.0 // indirect golang.org/x/time v0.9.0 // indirect diff --git a/go.sum b/go.sum index 4aa2d817..f942213f 100644 --- a/go.sum +++ b/go.sum @@ -31,12 +31,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/v2 v2.1.3 h1:pysG7F76uCdjSVApwaOjKhiugGab/4t9wZOUKFn5s64= -github.com/bluenviron/gohlslib/v2 v2.1.3/go.mod h1:l99DjPGFms1XR3cxSZ+BIdFgMjJ5cFt/2Z/h+rrdIYQ= -github.com/bluenviron/gortsplib/v4 v4.12.3 h1:3EzbyGb5+MIOJQYiWytRegFEP4EW5paiyTrscQj63WE= -github.com/bluenviron/gortsplib/v4 v4.12.3/go.mod h1:SkZPdaMNr+IvHt2PKRjUXxZN6FDutmSZn4eT0GmF0sk= -github.com/bluenviron/mediacommon v1.14.0 h1:lWCwOBKNKgqmspRpwpvvg3CidYm+XOc2+z/Jw7LM5dQ= -github.com/bluenviron/mediacommon v1.14.0/go.mod h1:z5LP9Tm1ZNfQV5Co54PyOzaIhGMusDfRKmh42nQSnyo= +github.com/bluenviron/gohlslib/v2 v2.1.4-0.20250210133907-d3dddacbb9fc h1:t1i9foTQ+RfFT5Ke9HV845zWtz2vtWQCWV8ZXvpzM4g= +github.com/bluenviron/gohlslib/v2 v2.1.4-0.20250210133907-d3dddacbb9fc/go.mod h1:soTVqoidOT+L08hUSDreM7DebNyjjViUiEvpWlr7EIs= +github.com/bluenviron/gortsplib/v4 v4.12.4-0.20250214103455-885a9975ef10 h1:nQI+hp8j2uSSHTumlqG4JcgwdpK+jy8Hj19Z96HRmPo= +github.com/bluenviron/gortsplib/v4 v4.12.4-0.20250214103455-885a9975ef10/go.mod h1:87/zjOqku9cRSk7q6tZ4R8N7evB29E11GnwLVUk7sAQ= +github.com/bluenviron/mediacommon/v2 v2.0.0 h1:JinZ9v2x6QeAOzA0cDA6aFe8vQuCrU8OyWEhG2iNzwY= +github.com/bluenviron/mediacommon/v2 v2.0.0/go.mod h1:iHEz1SFIet6zBwAQoh1a92vTQ3dV3LpVFbom6/SLz3k= github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk= github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= @@ -260,8 +260,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0= -golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k= +golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8= +golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= diff --git a/internal/auth/manager.go b/internal/auth/manager.go index 297fd574..200a7b2f 100644 --- a/internal/auth/manager.go +++ b/internal/auth/manager.go @@ -108,7 +108,7 @@ type Manager struct { JWTJWKS string JWTClaimKey string ReadTimeout time.Duration - RTSPAuthMethods []auth.ValidateMethod + RTSPAuthMethods []auth.VerifyMethod mutex sync.RWMutex jwtHTTPClient *http.Client @@ -189,7 +189,7 @@ func (m *Manager) authenticateWithUser( if u.User != "any" { if req.RTSPRequest != nil && rtspAuthHeader != nil && rtspAuthHeader.Method == headers.AuthMethodDigest { - err := auth.Validate( + err := auth.Verify( req.RTSPRequest, string(u.User), string(u.Pass), diff --git a/internal/auth/manager_test.go b/internal/auth/manager_test.go index f53a5334..a8f2f486 100644 --- a/internal/auth/manager_test.go +++ b/internal/auth/manager_test.go @@ -159,7 +159,7 @@ func TestAuthInternalRTSPDigest(t *testing.T) { }, }, HTTPAddress: "", - RTSPAuthMethods: []auth.ValidateMethod{auth.ValidateMethodDigestMD5}, + RTSPAuthMethods: []auth.VerifyMethod{auth.VerifyMethodDigestMD5}, } u, err := base.ParseURL("rtsp://127.0.0.1:8554/mypath") @@ -173,7 +173,7 @@ func TestAuthInternalRTSPDigest(t *testing.T) { if ca == "ok" { var s *auth.Sender s, err = auth.NewSender( - auth.GenerateWWWAuthenticate([]auth.ValidateMethod{auth.ValidateMethodDigestMD5}, "IPCAM", "mynonce"), + auth.GenerateWWWAuthenticate([]auth.VerifyMethod{auth.VerifyMethodDigestMD5}, "IPCAM", "mynonce"), "myuser", "mypass", ) @@ -217,7 +217,7 @@ func TestAuthInternalCredentialsInBearer(t *testing.T) { }, }, HTTPAddress: "", - RTSPAuthMethods: []auth.ValidateMethod{auth.ValidateMethodDigestMD5}, + RTSPAuthMethods: []auth.VerifyMethod{auth.VerifyMethodDigestMD5}, } req := &Request{ diff --git a/internal/conf/conf.go b/internal/conf/conf.go index 8946f6dc..5ef13499 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -47,7 +47,7 @@ func firstThatExists(paths []string) string { return "" } -func contains(list []auth.ValidateMethod, item auth.ValidateMethod) bool { +func contains(list []auth.VerifyMethod, item auth.VerifyMethod) bool { for _, i := range list { if i == item { return true @@ -371,7 +371,7 @@ func (conf *Conf) setDefaults() { conf.MulticastRTCPPort = 8003 conf.RTSPServerKey = "server.key" conf.RTSPServerCert = "server.crt" - conf.RTSPAuthMethods = RTSPAuthMethods{auth.ValidateMethodBasic} + conf.RTSPAuthMethods = RTSPAuthMethods{auth.VerifyMethodBasic} // RTMP server conf.RTMP = true @@ -624,7 +624,7 @@ func (conf *Conf) Validate(l logger.Writer) error { l.Log(logger.Warn, "parameter 'authMethods' is deprecated and has been replaced with 'rtspAuthMethods'") conf.RTSPAuthMethods = *conf.AuthMethods } - if contains(conf.RTSPAuthMethods, auth.ValidateMethodDigestMD5) { + if contains(conf.RTSPAuthMethods, auth.VerifyMethodDigestMD5) { if conf.AuthMethod != AuthMethodInternal { return fmt.Errorf("when RTSP digest is enabled, the only supported auth method is 'internal'") } diff --git a/internal/conf/rtsp_auth_methods.go b/internal/conf/rtsp_auth_methods.go index 3ef676dd..da305a90 100644 --- a/internal/conf/rtsp_auth_methods.go +++ b/internal/conf/rtsp_auth_methods.go @@ -10,7 +10,7 @@ import ( ) // RTSPAuthMethods is the rtspAuthMethods parameter. -type RTSPAuthMethods []auth.ValidateMethod +type RTSPAuthMethods []auth.VerifyMethod // MarshalJSON implements json.Marshaler. func (d RTSPAuthMethods) MarshalJSON() ([]byte, error) { @@ -18,7 +18,7 @@ func (d RTSPAuthMethods) MarshalJSON() ([]byte, error) { for i, v := range d { switch v { - case auth.ValidateMethodBasic: + case auth.VerifyMethodBasic: out[i] = "basic" default: @@ -43,10 +43,10 @@ func (d *RTSPAuthMethods) UnmarshalJSON(b []byte) error { for _, v := range in { switch v { case "basic": - *d = append(*d, auth.ValidateMethodBasic) + *d = append(*d, auth.VerifyMethodBasic) case "digest": - *d = append(*d, auth.ValidateMethodDigestMD5) + *d = append(*d, auth.VerifyMethodDigestMD5) default: return fmt.Errorf("invalid authentication method: '%s'", v) diff --git a/internal/core/api_test.go b/internal/core/api_test.go index aed17024..a3396f64 100644 --- a/internal/core/api_test.go +++ b/internal/core/api_test.go @@ -17,7 +17,7 @@ import ( "github.com/bluenviron/gortsplib/v4" "github.com/bluenviron/gortsplib/v4/pkg/description" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" srt "github.com/datarhei/gosrt" "github.com/google/uuid" "github.com/pion/rtp" @@ -551,7 +551,7 @@ func TestAPIProtocolListGet(t *testing.T) { w := mpegts.NewWriter(bw, []*mpegts.Track{track}) require.NoError(t, err) - err = w.WriteH2642(track, 0, 0, [][]byte{{1}}) + err = w.WriteH264(track, 0, 0, [][]byte{{1}}) require.NoError(t, err) err = bw.Flush() @@ -1055,7 +1055,7 @@ func TestAPIProtocolKick(t *testing.T) { w := mpegts.NewWriter(bw, []*mpegts.Track{track}) require.NoError(t, err) - err = w.WriteH2642(track, 0, 0, [][]byte{{1}}) + err = w.WriteH264(track, 0, 0, [][]byte{{1}}) require.NoError(t, err) err = bw.Flush() diff --git a/internal/core/metrics_test.go b/internal/core/metrics_test.go index fe28b143..dece1965 100644 --- a/internal/core/metrics_test.go +++ b/internal/core/metrics_test.go @@ -15,7 +15,7 @@ import ( "github.com/bluenviron/gortsplib/v4" "github.com/bluenviron/gortsplib/v4/pkg/description" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" srt "github.com/datarhei/gosrt" "github.com/pion/rtp" pwebrtc "github.com/pion/webrtc/v4" @@ -301,7 +301,7 @@ webrtc_sessions_bytes_sent 0 w := mpegts.NewWriter(bw, []*mpegts.Track{track}) require.NoError(t, err) - err = w.WriteH2642(track, 0, 0, [][]byte{ + err = w.WriteH264(track, 0, 0, [][]byte{ test.FormatH264.SPS, test.FormatH264.PPS, {0x05, 1}, // IDR diff --git a/internal/formatprocessor/h264.go b/internal/formatprocessor/h264.go index 4da80ca2..5d716bd6 100644 --- a/internal/formatprocessor/h264.go +++ b/internal/formatprocessor/h264.go @@ -7,7 +7,7 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/format" "github.com/bluenviron/gortsplib/v4/pkg/format/rtph264" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" "github.com/pion/rtp" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/formatprocessor/h264_test.go b/internal/formatprocessor/h264_test.go index a5d18495..5c78400d 100644 --- a/internal/formatprocessor/h264_test.go +++ b/internal/formatprocessor/h264_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" "github.com/pion/rtp" "github.com/stretchr/testify/require" diff --git a/internal/formatprocessor/h265.go b/internal/formatprocessor/h265.go index 79dd7e81..246d4854 100644 --- a/internal/formatprocessor/h265.go +++ b/internal/formatprocessor/h265.go @@ -7,7 +7,7 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/format" "github.com/bluenviron/gortsplib/v4/pkg/format/rtph265" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" "github.com/pion/rtp" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/formatprocessor/h265_test.go b/internal/formatprocessor/h265_test.go index dd478d24..174e22a6 100644 --- a/internal/formatprocessor/h265_test.go +++ b/internal/formatprocessor/h265_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" "github.com/pion/rtp" "github.com/stretchr/testify/require" diff --git a/internal/formatprocessor/mpeg4_video.go b/internal/formatprocessor/mpeg4_video.go index 796b4dd7..7bd9a112 100644 --- a/internal/formatprocessor/mpeg4_video.go +++ b/internal/formatprocessor/mpeg4_video.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/format" "github.com/bluenviron/gortsplib/v4/pkg/format/rtpmpeg4video" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4video" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video" "github.com/pion/rtp" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/formatprocessor/opus.go b/internal/formatprocessor/opus.go index eed02057..0ffb97ef 100644 --- a/internal/formatprocessor/opus.go +++ b/internal/formatprocessor/opus.go @@ -6,7 +6,7 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/format" "github.com/bluenviron/gortsplib/v4/pkg/format/rtpsimpleaudio" - "github.com/bluenviron/mediacommon/pkg/codecs/opus" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus" "github.com/pion/rtp" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/playback/muxer.go b/internal/playback/muxer.go index 35c9faa8..8019a2aa 100644 --- a/internal/playback/muxer.go +++ b/internal/playback/muxer.go @@ -1,6 +1,6 @@ package playback -import "github.com/bluenviron/mediacommon/pkg/formats/fmp4" +import "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" type muxer interface { writeInit(init *fmp4.Init) diff --git a/internal/playback/muxer_fmp4.go b/internal/playback/muxer_fmp4.go index 5e1c1d44..668a3eb3 100644 --- a/internal/playback/muxer_fmp4.go +++ b/internal/playback/muxer_fmp4.go @@ -4,8 +4,8 @@ import ( "io" "time" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4/seekablebuffer" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" ) const ( diff --git a/internal/playback/muxer_mp4.go b/internal/playback/muxer_mp4.go index d7338b22..a68d214d 100644 --- a/internal/playback/muxer_mp4.go +++ b/internal/playback/muxer_mp4.go @@ -3,8 +3,8 @@ package playback import ( "io" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" - "github.com/bluenviron/mediacommon/pkg/formats/pmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/pmp4" ) type muxerMP4Track struct { diff --git a/internal/playback/on_get.go b/internal/playback/on_get.go index c8ac4441..211f88bc 100644 --- a/internal/playback/on_get.go +++ b/internal/playback/on_get.go @@ -9,7 +9,7 @@ import ( "strconv" "time" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/recordstore" diff --git a/internal/playback/on_get_test.go b/internal/playback/on_get_test.go index 09196652..8542b9fd 100644 --- a/internal/playback/on_get_test.go +++ b/internal/playback/on_get_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4/seekablebuffer" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" diff --git a/internal/playback/on_list.go b/internal/playback/on_list.go index ce52ac23..4d8714a8 100644 --- a/internal/playback/on_list.go +++ b/internal/playback/on_list.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/recordstore" "github.com/gin-gonic/gin" diff --git a/internal/playback/on_list_test.go b/internal/playback/on_list_test.go index daa22217..afa17814 100644 --- a/internal/playback/on_list_test.go +++ b/internal/playback/on_list_test.go @@ -13,7 +13,7 @@ import ( "time" "github.com/abema/go-mp4" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" diff --git a/internal/playback/segment_fmp4.go b/internal/playback/segment_fmp4.go index 97e70051..fbbebf00 100644 --- a/internal/playback/segment_fmp4.go +++ b/internal/playback/segment_fmp4.go @@ -9,7 +9,7 @@ import ( "time" "github.com/abema/go-mp4" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediamtx/internal/recordstore" ) diff --git a/internal/playback/segment_fmp4_test.go b/internal/playback/segment_fmp4_test.go index 6314f939..62325fcd 100644 --- a/internal/playback/segment_fmp4_test.go +++ b/internal/playback/segment_fmp4_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediamtx/internal/test" ) diff --git a/internal/protocols/mpegts/from_stream.go b/internal/protocols/mpegts/from_stream.go index d32efef8..4503b3fd 100644 --- a/internal/protocols/mpegts/from_stream.go +++ b/internal/protocols/mpegts/from_stream.go @@ -7,10 +7,10 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/description" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/ac3" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" - mcmpegts "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/ac3" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" + mcmpegts "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" srt "github.com/datarhei/gosrt" "github.com/bluenviron/mediamtx/internal/logger" @@ -55,7 +55,7 @@ func FromStream( case *format.H265: //nolint:dupl track := &mcmpegts.Track{Codec: &mcmpegts.CodecH265{}} - var dtsExtractor *h265.DTSExtractor2 + var dtsExtractor *h265.DTSExtractor addTrack( media, @@ -73,7 +73,7 @@ func FromStream( if !randomAccess { return nil } - dtsExtractor = h265.NewDTSExtractor2() + dtsExtractor = h265.NewDTSExtractor() } dts, err := dtsExtractor.Extract(tunit.AU, tunit.PTS) @@ -82,7 +82,7 @@ func FromStream( } sconn.SetWriteDeadline(time.Now().Add(writeTimeout)) - err = (*w).WriteH2652( + err = (*w).WriteH265( track, tunit.PTS, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP dts, @@ -96,7 +96,7 @@ func FromStream( case *format.H264: //nolint:dupl track := &mcmpegts.Track{Codec: &mcmpegts.CodecH264{}} - var dtsExtractor *h264.DTSExtractor2 + var dtsExtractor *h264.DTSExtractor addTrack( media, @@ -108,13 +108,13 @@ func FromStream( return nil } - idrPresent := h264.IDRPresent(tunit.AU) + idrPresent := h264.IsRandomAccess(tunit.AU) if dtsExtractor == nil { if !idrPresent { return nil } - dtsExtractor = h264.NewDTSExtractor2() + dtsExtractor = h264.NewDTSExtractor() } dts, err := dtsExtractor.Extract(tunit.AU, tunit.PTS) @@ -123,7 +123,7 @@ func FromStream( } sconn.SetWriteDeadline(time.Now().Add(writeTimeout)) - err = (*w).WriteH2642( + err = (*w).WriteH264( track, tunit.PTS, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP dts, diff --git a/internal/protocols/mpegts/to_stream.go b/internal/protocols/mpegts/to_stream.go index d40c5b1e..ef95633b 100644 --- a/internal/protocols/mpegts/to_stream.go +++ b/internal/protocols/mpegts/to_stream.go @@ -7,7 +7,7 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/description" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" @@ -27,7 +27,7 @@ func ToStream( var medias []*description.Media //nolint:prealloc var unsupportedTracks []int - td := mpegts.NewTimeDecoder2() + td := mpegts.NewTimeDecoder() for i, track := range r.Tracks() { //nolint:dupl var medi *description.Media diff --git a/internal/protocols/mpegts/to_stream_test.go b/internal/protocols/mpegts/to_stream_test.go index b2614402..beb634f9 100644 --- a/internal/protocols/mpegts/to_stream_test.go +++ b/internal/protocols/mpegts/to_stream_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/asticode/go-astits" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/test" "github.com/stretchr/testify/require" diff --git a/internal/protocols/rtmp/from_stream.go b/internal/protocols/rtmp/from_stream.go index 724dd1c1..431b5099 100644 --- a/internal/protocols/rtmp/from_stream.go +++ b/internal/protocols/rtmp/from_stream.go @@ -7,9 +7,9 @@ import ( "time" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg1audio" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg1audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" @@ -39,7 +39,7 @@ func setupVideo( videoMedia := strea.Desc().FindFormat(&videoFormatH264) if videoFormatH264 != nil { - var videoDTSExtractor *h264.DTSExtractor2 + var videoDTSExtractor *h264.DTSExtractor strea.AddReader( reader, @@ -72,7 +72,7 @@ func setupVideo( return nil } - videoDTSExtractor = h264.NewDTSExtractor2() + videoDTSExtractor = h264.NewDTSExtractor() } else if !idrPresent && !nonIDRPresent { return nil } diff --git a/internal/protocols/rtmp/message/msg_audio_ex_sequence_start.go b/internal/protocols/rtmp/message/msg_audio_ex_sequence_start.go index 2eb1963d..a36adb08 100644 --- a/internal/protocols/rtmp/message/msg_audio_ex_sequence_start.go +++ b/internal/protocols/rtmp/message/msg_audio_ex_sequence_start.go @@ -3,7 +3,7 @@ package message import ( "fmt" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/rawmessage" ) diff --git a/internal/protocols/rtmp/message/reader_test.go b/internal/protocols/rtmp/message/reader_test.go index 1b557bca..10222912 100644 --- a/internal/protocols/rtmp/message/reader_test.go +++ b/internal/protocols/rtmp/message/reader_test.go @@ -8,7 +8,7 @@ import ( "github.com/abema/go-mp4" "github.com/stretchr/testify/require" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/amf0" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/bytecounter" ) diff --git a/internal/protocols/rtmp/reader.go b/internal/protocols/rtmp/reader.go index 0d6762bd..69dddae1 100644 --- a/internal/protocols/rtmp/reader.go +++ b/internal/protocols/rtmp/reader.go @@ -8,11 +8,11 @@ import ( "github.com/abema/go-mp4" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/ac3" - "github.com/bluenviron/mediacommon/pkg/codecs/av1" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/ac3" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/av1" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/h264conf" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/message" diff --git a/internal/protocols/rtmp/reader_test.go b/internal/protocols/rtmp/reader_test.go index cd90eb54..886b1488 100644 --- a/internal/protocols/rtmp/reader_test.go +++ b/internal/protocols/rtmp/reader_test.go @@ -7,8 +7,8 @@ import ( "github.com/abema/go-mp4" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/amf0" diff --git a/internal/protocols/rtmp/writer.go b/internal/protocols/rtmp/writer.go index 9b6942fd..e36bed6b 100644 --- a/internal/protocols/rtmp/writer.go +++ b/internal/protocols/rtmp/writer.go @@ -4,9 +4,9 @@ import ( "time" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg1audio" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg1audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/amf0" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/h264conf" @@ -176,7 +176,7 @@ func (w *Writer) WriteH264(pts time.Duration, dts time.Duration, au [][]byte) er ChunkStreamID: message.VideoChunkStreamID, MessageStreamID: 0x1000000, Codec: message.CodecH264, - IsKeyFrame: h264.IDRPresent(au), + IsKeyFrame: h264.IsRandomAccess(au), Type: message.VideoTypeAU, Payload: avcc, DTS: dts, diff --git a/internal/protocols/rtmp/writer_test.go b/internal/protocols/rtmp/writer_test.go index b6b4ad18..e687e919 100644 --- a/internal/protocols/rtmp/writer_test.go +++ b/internal/protocols/rtmp/writer_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/protocols/rtmp/amf0" diff --git a/internal/protocols/webrtc/from_stream.go b/internal/protocols/webrtc/from_stream.go index 78935234..fa958715 100644 --- a/internal/protocols/webrtc/from_stream.go +++ b/internal/protocols/webrtc/from_stream.go @@ -12,7 +12,7 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/format/rtplpcm" "github.com/bluenviron/gortsplib/v4/pkg/format/rtpvp8" "github.com/bluenviron/gortsplib/v4/pkg/format/rtpvp9" - "github.com/bluenviron/mediacommon/pkg/codecs/g711" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/g711" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/stream" "github.com/bluenviron/mediamtx/internal/unit" diff --git a/internal/recorder/format_fmp4.go b/internal/recorder/format_fmp4.go index ae7adef1..cd7ec4f1 100644 --- a/internal/recorder/format_fmp4.go +++ b/internal/recorder/format_fmp4.go @@ -6,18 +6,18 @@ import ( "time" rtspformat "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/ac3" - "github.com/bluenviron/mediacommon/pkg/codecs/av1" - "github.com/bluenviron/mediacommon/pkg/codecs/g711" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" - "github.com/bluenviron/mediacommon/pkg/codecs/jpeg" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg1audio" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4video" - "github.com/bluenviron/mediacommon/pkg/codecs/opus" - "github.com/bluenviron/mediacommon/pkg/codecs/vp9" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/ac3" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/av1" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/g711" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/jpeg" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg1audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/opus" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/vp9" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/formatprocessor" @@ -291,7 +291,7 @@ func (f *formatFMP4) initialize() bool { } track := addTrack(forma, codec) - var dtsExtractor *h265.DTSExtractor2 + var dtsExtractor *h265.DTSExtractor f.ri.rec.Stream.AddReader( f.ri, @@ -336,7 +336,7 @@ func (f *formatFMP4) initialize() bool { if !randomAccess { return nil } - dtsExtractor = h265.NewDTSExtractor2() + dtsExtractor = h265.NewDTSExtractor() } dts, err := dtsExtractor.Extract(tunit.AU, tunit.PTS) @@ -372,7 +372,7 @@ func (f *formatFMP4) initialize() bool { } track := addTrack(forma, codec) - var dtsExtractor *h264.DTSExtractor2 + var dtsExtractor *h264.DTSExtractor f.ri.rec.Stream.AddReader( f.ri, @@ -410,7 +410,7 @@ func (f *formatFMP4) initialize() bool { if !randomAccess { return nil } - dtsExtractor = h264.NewDTSExtractor2() + dtsExtractor = h264.NewDTSExtractor() } dts, err := dtsExtractor.Extract(tunit.AU, tunit.PTS) diff --git a/internal/recorder/format_fmp4_part.go b/internal/recorder/format_fmp4_part.go index 08fa2f36..5b2178ce 100644 --- a/internal/recorder/format_fmp4_part.go +++ b/internal/recorder/format_fmp4_part.go @@ -6,8 +6,8 @@ import ( "path/filepath" "time" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4/seekablebuffer" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" "github.com/bluenviron/mediamtx/internal/logger" "github.com/bluenviron/mediamtx/internal/recordstore" diff --git a/internal/recorder/format_fmp4_segment.go b/internal/recorder/format_fmp4_segment.go index 49a2a989..94e01ec3 100644 --- a/internal/recorder/format_fmp4_segment.go +++ b/internal/recorder/format_fmp4_segment.go @@ -8,8 +8,8 @@ import ( "time" "github.com/abema/go-mp4" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4/seekablebuffer" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4/seekablebuffer" "github.com/bluenviron/mediamtx/internal/logger" ) diff --git a/internal/recorder/format_fmp4_track.go b/internal/recorder/format_fmp4_track.go index 7b02da2c..4809569e 100644 --- a/internal/recorder/format_fmp4_track.go +++ b/internal/recorder/format_fmp4_track.go @@ -1,7 +1,7 @@ package recorder import ( - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" ) type formatFMP4Track struct { diff --git a/internal/recorder/format_mpegts.go b/internal/recorder/format_mpegts.go index 4541cdf3..60c2b674 100644 --- a/internal/recorder/format_mpegts.go +++ b/internal/recorder/format_mpegts.go @@ -8,11 +8,11 @@ import ( "time" rtspformat "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/ac3" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4video" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/ac3" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4video" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/logger" @@ -85,7 +85,7 @@ func (f *formatMPEGTS) initialize() bool { case *rtspformat.H265: //nolint:dupl track := addTrack(forma, &mpegts.CodecH265{}) - var dtsExtractor *h265.DTSExtractor2 + var dtsExtractor *h265.DTSExtractor f.ri.rec.Stream.AddReader( f.ri, @@ -103,7 +103,7 @@ func (f *formatMPEGTS) initialize() bool { if !randomAccess { return nil } - dtsExtractor = h265.NewDTSExtractor2() + dtsExtractor = h265.NewDTSExtractor() } dts, err := dtsExtractor.Extract(tunit.AU, tunit.PTS) @@ -117,7 +117,7 @@ func (f *formatMPEGTS) initialize() bool { true, randomAccess, func() error { - return f.mw.WriteH2652( + return f.mw.WriteH265( track, tunit.PTS, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP dts, @@ -129,7 +129,7 @@ func (f *formatMPEGTS) initialize() bool { case *rtspformat.H264: //nolint:dupl track := addTrack(forma, &mpegts.CodecH264{}) - var dtsExtractor *h264.DTSExtractor2 + var dtsExtractor *h264.DTSExtractor f.ri.rec.Stream.AddReader( f.ri, @@ -141,13 +141,13 @@ func (f *formatMPEGTS) initialize() bool { return nil } - randomAccess := h264.IDRPresent(tunit.AU) + randomAccess := h264.IsRandomAccess(tunit.AU) if dtsExtractor == nil { if !randomAccess { return nil } - dtsExtractor = h264.NewDTSExtractor2() + dtsExtractor = h264.NewDTSExtractor() } dts, err := dtsExtractor.Extract(tunit.AU, tunit.PTS) @@ -161,7 +161,7 @@ func (f *formatMPEGTS) initialize() bool { true, randomAccess, func() error { - return f.mw.WriteH2642( + return f.mw.WriteH264( track, tunit.PTS, // no conversion is needed since clock rate is 90khz in both MPEG-TS and RTSP dts, diff --git a/internal/recorder/recorder_instance.go b/internal/recorder/recorder_instance.go index 78ac940f..19ef08a6 100644 --- a/internal/recorder/recorder_instance.go +++ b/internal/recorder/recorder_instance.go @@ -4,7 +4,7 @@ import ( "strings" "time" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/logger" diff --git a/internal/recorder/recorder_test.go b/internal/recorder/recorder_test.go index a5b76b3d..b0fc3a1b 100644 --- a/internal/recorder/recorder_test.go +++ b/internal/recorder/recorder_test.go @@ -9,9 +9,9 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/description" rtspformat "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/h265" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" - "github.com/bluenviron/mediacommon/pkg/formats/fmp4" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h265" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/formats/fmp4" "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/conf" diff --git a/internal/servers/rtsp/conn.go b/internal/servers/rtsp/conn.go index c2857b1a..396b533a 100644 --- a/internal/servers/rtsp/conn.go +++ b/internal/servers/rtsp/conn.go @@ -31,7 +31,7 @@ type connParent interface { type conn struct { isTLS bool rtspAddress string - authMethods []rtspauth.ValidateMethod + authMethods []rtspauth.VerifyMethod readTimeout conf.Duration runOnConnect string runOnConnectRestart bool diff --git a/internal/servers/rtsp/server.go b/internal/servers/rtsp/server.go index 7cdafb21..6229b279 100644 --- a/internal/servers/rtsp/server.go +++ b/internal/servers/rtsp/server.go @@ -60,7 +60,7 @@ type serverParent interface { // Server is a RTSP server. type Server struct { Address string - AuthMethods []auth.ValidateMethod + AuthMethods []auth.VerifyMethod ReadTimeout conf.Duration WriteTimeout conf.Duration WriteQueueSize int diff --git a/internal/servers/rtsp/server_test.go b/internal/servers/rtsp/server_test.go index ecec3230..8660b9a4 100644 --- a/internal/servers/rtsp/server_test.go +++ b/internal/servers/rtsp/server_test.go @@ -84,7 +84,7 @@ func TestServerPublish(t *testing.T) { s := &Server{ Address: "127.0.0.1:8557", - AuthMethods: []rtspauth.ValidateMethod{rtspauth.ValidateMethodBasic}, + AuthMethods: []rtspauth.VerifyMethod{rtspauth.VerifyMethodBasic}, ReadTimeout: conf.Duration(10 * time.Second), WriteTimeout: conf.Duration(10 * time.Second), WriteQueueSize: 512, @@ -202,7 +202,7 @@ func TestServerRead(t *testing.T) { s := &Server{ Address: "127.0.0.1:8557", - AuthMethods: []rtspauth.ValidateMethod{rtspauth.ValidateMethodBasic}, + AuthMethods: []rtspauth.VerifyMethod{rtspauth.VerifyMethodBasic}, ReadTimeout: conf.Duration(10 * time.Second), WriteTimeout: conf.Duration(10 * time.Second), WriteQueueSize: 512, diff --git a/internal/servers/srt/conn.go b/internal/servers/srt/conn.go index 19867c5d..80de7068 100644 --- a/internal/servers/srt/conn.go +++ b/internal/servers/srt/conn.go @@ -10,7 +10,7 @@ import ( "time" "github.com/bluenviron/gortsplib/v4/pkg/description" - mcmpegts "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + mcmpegts "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" srt "github.com/datarhei/gosrt" "github.com/google/uuid" diff --git a/internal/servers/srt/server_test.go b/internal/servers/srt/server_test.go index 2795b353..1d738be6 100644 --- a/internal/servers/srt/server_test.go +++ b/internal/servers/srt/server_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/bluenviron/gortsplib/v4/pkg/description" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" "github.com/bluenviron/mediamtx/internal/externalcmd" @@ -115,7 +115,7 @@ func TestServerPublish(t *testing.T) { w := mpegts.NewWriter(bw, []*mpegts.Track{track}) require.NoError(t, err) - err = w.WriteH2642(track, 0, 0, [][]byte{ + err = w.WriteH264(track, 0, 0, [][]byte{ test.FormatH264.SPS, test.FormatH264.PPS, {0x05, 1}, // IDR @@ -148,7 +148,7 @@ func TestServerPublish(t *testing.T) { path.stream.StartReader(reader) defer path.stream.RemoveReader(reader) - err = w.WriteH2642(track, 0, 0, [][]byte{ + err = w.WriteH264(track, 0, 0, [][]byte{ {5, 2}, }) require.NoError(t, err) diff --git a/internal/staticsources/hls/source_test.go b/internal/staticsources/hls/source_test.go index a52d5b3b..b286fdc3 100644 --- a/internal/staticsources/hls/source_test.go +++ b/internal/staticsources/hls/source_test.go @@ -6,8 +6,8 @@ import ( "net/http" "testing" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" "github.com/gin-gonic/gin" "github.com/stretchr/testify/require" @@ -63,7 +63,7 @@ func TestSource(t *testing.T) { err := w.WriteMPEG4Audio(track2, 1*90000, [][]byte{{1, 2, 3, 4}}) require.NoError(t, err) - err = w.WriteH2642(track1, 2*90000, 2*90000, [][]byte{ + err = w.WriteH264(track1, 2*90000, 2*90000, [][]byte{ {7, 1, 2, 3}, // SPS {8}, // PPS }) diff --git a/internal/staticsources/rpicamera/camera.go b/internal/staticsources/rpicamera/camera.go index 9db131f4..b549a4ae 100644 --- a/internal/staticsources/rpicamera/camera.go +++ b/internal/staticsources/rpicamera/camera.go @@ -10,7 +10,7 @@ import ( "strconv" "time" - "github.com/bluenviron/mediacommon/pkg/codecs/h264" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/h264" ) type camera struct { diff --git a/internal/staticsources/rtsp/source_test.go b/internal/staticsources/rtsp/source_test.go index b3b4a971..272af473 100644 --- a/internal/staticsources/rtsp/source_test.go +++ b/internal/staticsources/rtsp/source_test.go @@ -55,7 +55,7 @@ func TestSource(t *testing.T) { Handler: &testServer{ onDescribe: func(ctx *gortsplib.ServerHandlerOnDescribeCtx, ) (*base.Response, *gortsplib.ServerStream, error) { - err2 := auth.Validate(ctx.Request, "testuser", "testpass", nil, "IPCAM", nonce) + err2 := auth.Verify(ctx.Request, "testuser", "testpass", nil, "IPCAM", nonce) if err2 != nil { return &base.Response{ //nolint:nilerr StatusCode: base.StatusUnauthorized, @@ -184,7 +184,7 @@ func TestRTSPSourceNoPassword(t *testing.T) { s := gortsplib.Server{ Handler: &testServer{ onDescribe: func(ctx *gortsplib.ServerHandlerOnDescribeCtx) (*base.Response, *gortsplib.ServerStream, error) { - err2 := auth.Validate(ctx.Request, "testuser", "", nil, "IPCAM", nonce) + err2 := auth.Verify(ctx.Request, "testuser", "", nil, "IPCAM", nonce) if err2 != nil { return &base.Response{ //nolint:nilerr StatusCode: base.StatusUnauthorized, diff --git a/internal/staticsources/srt/source.go b/internal/staticsources/srt/source.go index 6458619b..7a740602 100644 --- a/internal/staticsources/srt/source.go +++ b/internal/staticsources/srt/source.go @@ -5,7 +5,7 @@ import ( "time" "github.com/bluenviron/gortsplib/v4/pkg/description" - mcmpegts "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + mcmpegts "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" srt "github.com/datarhei/gosrt" "github.com/bluenviron/mediamtx/internal/conf" diff --git a/internal/staticsources/srt/source_test.go b/internal/staticsources/srt/source_test.go index 4b331376..42a1cfb4 100644 --- a/internal/staticsources/srt/source_test.go +++ b/internal/staticsources/srt/source_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" srt "github.com/datarhei/gosrt" "github.com/stretchr/testify/require" @@ -39,7 +39,7 @@ func TestSource(t *testing.T) { w := mpegts.NewWriter(bw, []*mpegts.Track{track}) require.NoError(t, err) - err = w.WriteH2642(track, 0, 0, [][]byte{{ // IDR + err = w.WriteH264(track, 0, 0, [][]byte{{ // IDR 5, 1, }}) require.NoError(t, err) diff --git a/internal/staticsources/udp/source.go b/internal/staticsources/udp/source.go index 88f0d4a3..fc7a0cb0 100644 --- a/internal/staticsources/udp/source.go +++ b/internal/staticsources/udp/source.go @@ -8,7 +8,7 @@ import ( "github.com/bluenviron/gortsplib/v4/pkg/description" "github.com/bluenviron/gortsplib/v4/pkg/multicast" - mcmpegts "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + mcmpegts "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" "github.com/bluenviron/mediamtx/internal/conf" "github.com/bluenviron/mediamtx/internal/defs" diff --git a/internal/staticsources/udp/source_test.go b/internal/staticsources/udp/source_test.go index 985346d7..fd98edd3 100644 --- a/internal/staticsources/udp/source_test.go +++ b/internal/staticsources/udp/source_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/bluenviron/mediacommon/pkg/formats/mpegts" + "github.com/bluenviron/mediacommon/v2/pkg/formats/mpegts" "github.com/stretchr/testify/require" "github.com/bluenviron/mediamtx/internal/conf" @@ -41,12 +41,12 @@ func TestSource(t *testing.T) { w := mpegts.NewWriter(bw, []*mpegts.Track{track}) require.NoError(t, err) - err = w.WriteH2642(track, 0, 0, [][]byte{{ // IDR + err = w.WriteH264(track, 0, 0, [][]byte{{ // IDR 5, 1, }}) require.NoError(t, err) - err = w.WriteH2642(track, 0, 0, [][]byte{{ // non-IDR + err = w.WriteH264(track, 0, 0, [][]byte{{ // non-IDR 5, 2, }}) require.NoError(t, err) diff --git a/internal/test/formats.go b/internal/test/formats.go index f88bf3d9..a945e2c0 100644 --- a/internal/test/formats.go +++ b/internal/test/formats.go @@ -2,7 +2,7 @@ package test import ( "github.com/bluenviron/gortsplib/v4/pkg/format" - "github.com/bluenviron/mediacommon/pkg/codecs/mpeg4audio" + "github.com/bluenviron/mediacommon/v2/pkg/codecs/mpeg4audio" ) // FormatH264 is a dummy H264 format.