更新依赖库aler9 到2.1.0

client.go

@@ -1,8 +1,8 @@
 package rtsp
 
 import (
-	"github.com/aler9/gortsplib"
+	"github.com/aler9/gortsplib/v2"
-	"github.com/aler9/gortsplib/pkg/url"
+	"github.com/aler9/gortsplib/v2/pkg/url"
 	"go.uber.org/zap"
 	"m7s.live/engine/v4"
 )
@@ -28,14 +28,15 @@ func (p *RTSPPuller) Connect() error {
 		}
 	}
 	p.Client = &gortsplib.Client{
-		OnPacketRTP: func(ctx *gortsplib.ClientOnPacketRTPCtx) {
+		// OnPacketRTP: func(ctx *gortsplib.ClientOnPacketRTPCtx) {
-			if p.RTSPPublisher.Tracks[ctx.TrackID] != nil {
+		// 	if p.RTSPPublisher.Tracks[ctx.TrackID] != nil {
-				p.RTSPPublisher.Tracks[ctx.TrackID].WriteRTPPack(ctx.Packet)
+		// 		p.RTSPPublisher.Tracks[ctx.TrackID].WriteRTPPack(ctx.Packet)
-			}
+		// 	}
-		},
+		// },
 		ReadBufferCount: rtspConfig.ReadBufferSize,
 		Transport:       &p.Transport,
 	}
+
 	// parse URL
 	u, err := url.Parse(p.RemoteURL)
 	if err != nil {
@@ -63,11 +64,21 @@ func (p *RTSPPuller) Pull() (err error) {
 		return
 	}
 	p.tracks = tracks
-	p.SetTracks()
+	err = p.SetTracks()
-	if err = p.SetupAndPlay(tracks, baseURL); err != nil {
+	if err != nil {
+		p.Error("SetTracks", zap.Error(err))
+		return
+	}
+	if err = p.SetupAll(tracks, baseURL); err != nil {
 		p.Error("SetupAndPlay", zap.Error(err))
 		return
 	}
+	p.OnPacketRTPAny(p.OnPacket)
+	_, err = p.Play(nil)
+	if err != nil {
+		p.Error("Play", zap.Error(err))
+		return
+	}
 	return p.Wait()
 }
 
@@ -81,9 +92,9 @@ type RTSPPusher struct {
 func (p *RTSPPusher) OnEvent(event any) {
 	switch v := event.(type) {
 	case engine.VideoRTP:
-		p.Client.WritePacketRTP(p.videoTrackId, &v.Packet)
+		p.Client.WritePacketRTP(p.videoTrack, &v.Packet)
 	case engine.AudioRTP:
-		p.Client.WritePacketRTP(p.audioTrackId, &v.Packet)
+		p.Client.WritePacketRTP(p.audioTrack, &v.Packet)
 	default:
 		p.RTSPSubscriber.OnEvent(event)
 	}
@@ -127,13 +138,12 @@ func (p *RTSPPusher) Push() (err error) {
 		p.Error("Announce", zap.Error(err))
 		return
 	}
-	for _, track := range p.tracks {
+	err = p.SetupAll(p.tracks, u)
-		_, err = p.Setup(track, u, 0, 0)
 	if err != nil {
 		p.Error("Setup", zap.Error(err))
 		return
 	}
-	}
+
 	if _, err = p.Record(); err != nil {
 		p.Error("Record", zap.Error(err))
 		return

go.mod

@@ -3,9 +3,10 @@ module m7s.live/plugin/rtsp/v4
 go 1.18
 
 require (
-	github.com/aler9/gortsplib v0.0.0-20221115222755-87d5a512b129
+	github.com/aler9/gortsplib/v2 v2.1.0
+	github.com/pion/rtp v1.7.13
 	go.uber.org/zap v1.23.0
-	m7s.live/engine/v4 v4.10.0
+	m7s.live/engine/v4 v4.11.0
 )
 
 require (
@@ -21,10 +22,10 @@ require (
 	github.com/lufia/plan9stats v0.0.0-20220913051719-115f729f3c8c // indirect
 	github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
 	github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
+	github.com/mcuadros/go-defaults v1.2.0 // indirect
 	github.com/onsi/ginkgo/v2 v2.2.0 // indirect
 	github.com/pion/randutil v0.1.0 // indirect
 	github.com/pion/rtcp v1.2.10 // indirect
-	github.com/pion/rtp v1.7.13 // indirect
 	github.com/pion/sdp/v3 v3.0.6 // indirect
 	github.com/pion/webrtc/v3 v3.1.49 // indirect
 	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect

go.sum

@@ -1,6 +1,6 @@
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/aler9/gortsplib v0.0.0-20221115222755-87d5a512b129 h1:CG96FPsxizdlpsRIsjU2xQR6G3QC0sPK+f+AeVEr0Tg=
+github.com/aler9/gortsplib/v2 v2.1.0 h1:HKQjFugTGH32FScSXPL2p4SGLpxGBRnyBSzR3GKYG9U=
-github.com/aler9/gortsplib v0.0.0-20221115222755-87d5a512b129/go.mod h1:BOWNZ/QBkY/eVcRqUzJbPFEsRJshwxaxBT01K260Jeo=
+github.com/aler9/gortsplib/v2 v2.1.0/go.mod h1:jZy239Qg+C9OSvJrPs2vIPalm9/pam1ljFir5DdydnA=
 github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
@@ -54,7 +54,6 @@ github.com/kelindar/process v0.0.0-20170730150328-69a29e249ec3/go.mod h1:+lTCLnZ
 github.com/kelindar/rate v1.0.0/go.mod h1:AjT4G+hTItNwt30lucEGZIz8y7Uk5zPho6vurIZ+1Es=
 github.com/kelindar/tcp v1.0.0/go.mod h1:JB5hj1cshLU60XrLij2BBxW3JQ4hOye8vqbyvuKb52k=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -70,6 +69,10 @@ github.com/marten-seemann/qtls-go1-18 v0.1.3 h1:R4H2Ks8P6pAtUagjFty2p7BVHn3XiwDA
 github.com/marten-seemann/qtls-go1-18 v0.1.3/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4=
 github.com/marten-seemann/qtls-go1-19 v0.1.1 h1:mnbxeq3oEyQxQXwI4ReCgW9DPoPR94sNlqWoDZnjRIE=
 github.com/marten-seemann/qtls-go1-19 v0.1.1/go.mod h1:5HTDWtVudo/WFsHKRNuOhWlbdjrfs5JHrYb0wIJqGpI=
+github.com/mcuadros/go-defaults v1.2.0 h1:FODb8WSf0uGaY8elWJAkoLL0Ri6AlZ1bFlenk56oZtc=
+github.com/mcuadros/go-defaults v1.2.0/go.mod h1:WEZtHEVIGYVDqkKSWBdWKUVdRyKlMfulPaGDWIVeCWY=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -121,7 +124,6 @@ github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkB
 github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/q191201771/naza v0.30.8 h1:Lhh29o65C4PmTDj2l+eKfsw9dddpgWZk4bFICtcnSaA=
 github.com/q191201771/naza v0.30.8/go.mod h1:n+dpJjQSh90PxBwxBNuifOwQttywvSIN5TkWSSYCeBk=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/shirou/gopsutil/v3 v3.22.10 h1:4KMHdfBRYXGF9skjDWiL4RA2N+E8dRdodU/bOZpPoVg=
 github.com/shirou/gopsutil/v3 v3.22.10/go.mod h1:QNza6r4YQoydyCfo6rH0blGfKahgibh4dQmV5xdFkQk=
@@ -255,8 +257,9 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -269,5 +272,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-m7s.live/engine/v4 v4.10.0 h1:U47ifoIC41lXisvG69Os4GtUTnYhAOzV/dZSj4OYVZg=
+m7s.live/engine/v4 v4.11.0 h1:YbL1H+FtVlTKfi3WE4bk3fcmf4HrkTKygupGUCLdjvo=
-m7s.live/engine/v4 v4.10.0/go.mod h1:znB5Ux7fJ/bIVKnbHrwoInztVn7z/4CrXwjc24b1exI=
+m7s.live/engine/v4 v4.11.0/go.mod h1:dx52RjysN9uocotAP2caLyb6j2uWwjcnstOy8C/U8sU=

main.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/aler9/gortsplib"
+	"github.com/aler9/gortsplib/v2"
 	"go.uber.org/zap"
 	. "m7s.live/engine/v4"
 	"m7s.live/engine/v4/config"

publisher.go

@@ -1,14 +1,10 @@
 package rtsp
 
 import (
-	"encoding/base64"
+	"github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio"
-	"encoding/hex"
+	"github.com/aler9/gortsplib/v2/pkg/format"
-	"errors"
+	"github.com/aler9/gortsplib/v2/pkg/media"
-	"fmt"
+	"github.com/pion/rtp"
-	"strconv"
-	"strings"
-
-	"github.com/aler9/gortsplib"
 	"go.uber.org/zap"
 	. "m7s.live/engine/v4"
 	"m7s.live/engine/v4/common"
@@ -17,131 +13,65 @@ import (
 
 type RTSPPublisher struct {
 	Publisher
-	Tracks []common.AVTrack `json:"-"`
+	Tracks map[*media.Media]common.AVTrack `json:"-"`
 	RTSPIO
 }
 
 func (p *RTSPPublisher) SetTracks() error {
-	p.Tracks = make([]common.AVTrack, len(p.tracks))
+	p.Tracks = make(map[*media.Media]common.AVTrack, len(p.tracks))
 	defer func() {
-		for i, track := range p.Tracks {
+		for _, track := range p.Tracks {
-			if track == nil {
+			p.Info("set track", zap.String("name", track.GetBase().Name))
-				p.Info("unknown track", zap.String("codec", p.tracks[i].String()))
-				continue
-			}
-			p.Info("set track", zap.Int("trackId", i), zap.String("name", track.GetBase().Name))
 		}
 	}()
-	for trackId, track := range p.tracks {
+	for _, track := range p.tracks {
-		md := track.MediaDescription()
+		for _, forma := range track.Formats {
-		v, ok := md.Attribute("rtpmap")
+			switch f := forma.(type) {
-		if !ok {
+			case *format.H264:
-			return errors.New("rtpmap attribute not found")
+				vt := NewH264(p.Stream, f.PayloadType())
+				p.Tracks[track] = vt
+				if len(f.SPS) > 0 {
+					vt.WriteSliceBytes(f.SPS)
 				}
-		v = strings.TrimSpace(v)
+				if len(f.PPS) > 0 {
-		vals := strings.Split(v, " ")
+					vt.WriteSliceBytes(f.PPS)
-		if len(vals) != 2 {
-			continue
 				}
-		fmtp := make(map[string]string)
+			case *format.H265:
-		if v, ok = md.Attribute("fmtp"); ok {
+				vt := NewH265(p.Stream, f.PayloadType())
-			if tmp := strings.SplitN(v, " ", 2); len(tmp) == 2 {
+				p.Tracks[track] = vt
-				for _, kv := range strings.Split(tmp[1], ";") {
+				if len(f.VPS) > 0 {
-					kv = strings.Trim(kv, " ")
+					vt.WriteSliceBytes(f.VPS)
-
-					if len(kv) == 0 {
-						continue
 				}
-					tmp := strings.SplitN(kv, "=", 2)
+				if len(f.SPS) > 0 {
-					if len(tmp) == 2 {
+					vt.WriteSliceBytes(f.SPS)
-						fmtp[strings.TrimSpace(tmp[0])] = tmp[1]
 				}
+				if len(f.PPS) > 0 {
+					vt.WriteSliceBytes(f.PPS)
 				}
+			case *format.MPEG4Audio:
+				at := NewAAC(p.Stream, f.PayloadType())
+				p.Tracks[track] = at
+				at.SizeLength = f.SizeLength
+				if f.Config.Type == mpeg4audio.ObjectTypeAACLC {
+					at.Mode = 1
 				}
-		}
+				at.SampleRate = uint32(f.Config.SampleRate)
-		timeScale := 0
+				at.Channels = uint8(f.Config.ChannelCount)
-		keyval := strings.Split(vals[1], "/")
+				asc, _ := f.Config.Marshal()
-		if i, err := strconv.Atoi(keyval[1]); err == nil {
-			timeScale = i
-		}
-		if len(keyval) >= 2 {
-			switch strings.ToLower(keyval[0]) {
-			case "h264":
-				vt := NewH264(p.Stream)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					vt.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = vt
-				t := track.(*gortsplib.TrackH264)
-				if len(t.SPS) > 0 {
-					vt.WriteSliceBytes(t.SPS)
-				}
-				if len(t.PPS) > 0 {
-					vt.WriteSliceBytes(t.PPS)
-				}
-			case "h265", "hevc":
-				vt := NewH265(p.Stream)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					vt.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = vt
-				if v, ok := fmtp["sprop-vps"]; ok {
-					vps, _ := base64.StdEncoding.DecodeString(v)
-					vt.WriteSliceBytes(vps)
-				}
-				if v, ok := fmtp["sprop-sps"]; ok {
-					sps, _ := base64.StdEncoding.DecodeString(v)
-					vt.WriteSliceBytes(sps)
-				}
-				if v, ok := fmtp["sprop-pps"]; ok {
-					pps, _ := base64.StdEncoding.DecodeString(v)
-					vt.WriteSliceBytes(pps)
-				}
-			case "pcma":
-				at := NewG711(p.Stream, true)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					at.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = at
-				at.SampleRate = uint32(timeScale)
-				if len(keyval) >= 3 {
-					x, _ := strconv.Atoi(keyval[2])
-					at.Channels = byte(x)
-				} else {
-					at.Channels = 1
-				}
-				at.AVCCHead = []byte{(byte(at.CodecID) << 4) | (1 << 1)}
-			case "pcmu":
-				at := NewG711(p.Stream, false)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					at.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = at
-				at.SampleRate = uint32(timeScale)
-				if len(keyval) >= 3 {
-					x, _ := strconv.Atoi(keyval[2])
-					at.Channels = byte(x)
-				} else {
-					at.Channels = 1
-				}
-				at.AVCCHead = []byte{(byte(at.CodecID) << 4) | (1 << 1)}
-			case "mpeg4-generic":
-				at := NewAAC(p.Stream)
-				if payloadType, err := strconv.Atoi(vals[0]); err == nil {
-					at.PayloadType = byte(payloadType)
-				}
-				p.Tracks[trackId] = at
-				if config, ok := fmtp["config"]; ok {
-					asc, _ := hex.DecodeString(config)
 				// 复用AVCC写入逻辑，解析出AAC的配置信息
 				at.WriteSequenceHead(append([]byte{0xAF, 0x00}, asc...))
-				} else {
+			case *format.G711:
-					RTSPPlugin.Warn("aac no config")
+				at := NewG711(p.Stream, !f.MULaw, f.PayloadType(), uint32(f.ClockRate()))
-				}
+				p.Tracks[track] = at
-			default:
+				at.AVCCHead = []byte{(byte(at.CodecID) << 4) | (1 << 1)}
-				return fmt.Errorf("unsupport codec:%s", keyval[0])
 			}
 		}
 	}
 	return nil
 }
+
+func (p *RTSPPublisher) OnPacket(m *media.Media, f format.Format, pack *rtp.Packet) {
+	if t, ok := p.Tracks[m]; ok {
+		t.WriteRTPPack(pack)
+	}
+}

server.go

@@ -1,16 +1,17 @@
 package rtsp
 
 import (
-	"github.com/aler9/gortsplib"
+	"github.com/aler9/gortsplib/v2"
-	"github.com/aler9/gortsplib/pkg/base"
+	"github.com/aler9/gortsplib/v2/pkg/base"
+	"github.com/aler9/gortsplib/v2/pkg/media"
 	. "m7s.live/engine/v4"
 )
 
 type RTSPIO struct {
-	tracks       gortsplib.Tracks
+	tracks     media.Medias
 	stream     *gortsplib.ServerStream
-	audioTrackId int
+	audioTrack *media.Media
-	videoTrackId int
+	videoTrack *media.Media
 }
 
 func (conf *RTSPConfig) OnConnOpen(ctx *gortsplib.ServerHandlerOnConnOpenCtx) {
@@ -88,6 +89,9 @@ func (conf *RTSPConfig) OnPlay(ctx *gortsplib.ServerHandlerOnPlayCtx) (*base.Res
 	return &resp, nil
 }
 func (conf *RTSPConfig) OnRecord(ctx *gortsplib.ServerHandlerOnRecordCtx) (*base.Response, error) {
+	if p, ok := conf.Load(ctx.Session); ok {
+		ctx.Session.OnPacketRTPAny(p.(*RTSPPublisher).OnPacket)
+	}
 	return &base.Response{
 		StatusCode: base.StatusOK,
 	}, nil
@@ -96,8 +100,8 @@ func (conf *RTSPConfig) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (*
 	p := &RTSPPublisher{}
 	p.SetIO(ctx.Conn.NetConn())
 	if err := RTSPPlugin.Publish(ctx.Path, p); err == nil {
-		p.tracks = ctx.Tracks
+		p.tracks = ctx.Medias
-		p.stream = gortsplib.NewServerStream(ctx.Tracks)
+		p.stream = gortsplib.NewServerStream(ctx.Medias)
 		if err = p.SetTracks(); err != nil {
 			return nil, err
 		}
@@ -112,14 +116,3 @@ func (conf *RTSPConfig) OnAnnounce(ctx *gortsplib.ServerHandlerOnAnnounceCtx) (*
 		StatusCode: base.StatusOK,
 	}, nil
 }
-
-func (conf *RTSPConfig) OnPacketRTP(ctx *gortsplib.ServerHandlerOnPacketRTPCtx) {
-	if p, ok := conf.Load(ctx.Session); ok {
-		switch v := p.(type) {
-		case *RTSPPublisher:
-			if v.Tracks[ctx.TrackID] != nil {
-				v.Tracks[ctx.TrackID].WriteRTPPack(ctx.Packet)
-			}
-		}
-	}
-}

subscriber.go

@@ -1,8 +1,10 @@
 package rtsp
 
 import (
-	"github.com/aler9/gortsplib"
+	"github.com/aler9/gortsplib/v2"
-	"github.com/aler9/gortsplib/pkg/mpeg4audio"
+	"github.com/aler9/gortsplib/v2/pkg/codecs/mpeg4audio"
+	"github.com/aler9/gortsplib/v2/pkg/format"
+	"github.com/aler9/gortsplib/v2/pkg/media"
 	. "m7s.live/engine/v4"
 	"m7s.live/engine/v4/codec"
 	"m7s.live/engine/v4/track"
@@ -21,17 +23,29 @@ func (s *RTSPSubscriber) OnEvent(event any) {
 		}
 		switch v.CodecID {
 		case codec.CodecID_H264:
-			vtrack := &gortsplib.TrackH264{
+			video := &media.Media{
-				PayloadType: v.PayloadType, SPS: v.ParamaterSets[0], PPS: v.ParamaterSets[1],
+				Type: media.TypeVideo,
+				Formats: []format.Format{&format.H264{
+					PacketizationMode: 1,
+					PayloadTyp:        v.PayloadType,
+					SPS:               v.ParamaterSets[0],
+					PPS:               v.ParamaterSets[1],
+				}},
 			}
-			s.videoTrackId = len(s.tracks)
+			s.videoTrack = video
-			s.tracks = append(s.tracks, vtrack)
+			s.tracks = append(s.tracks, video)
 		case codec.CodecID_H265:
-			vtrack := &gortsplib.TrackH265{
+			video := &media.Media{
-				PayloadType: v.PayloadType, VPS: v.ParamaterSets[0], SPS: v.ParamaterSets[1], PPS: v.ParamaterSets[2],
+				Type: media.TypeVideo,
+				Formats: []format.Format{&format.H265{
+					PayloadTyp: v.PayloadType,
+					VPS:        v.ParamaterSets[0],
+					SPS:        v.ParamaterSets[1],
+					PPS:        v.ParamaterSets[2],
+				}},
 			}
-			s.videoTrackId = len(s.tracks)
+			s.videoTrack = video
-			s.tracks = append(s.tracks, vtrack)
+			s.tracks = append(s.tracks, video)
 		}
 		s.AddTrack(v)
 	case *track.Audio:
@@ -40,27 +54,46 @@ func (s *RTSPSubscriber) OnEvent(event any) {
 		}
 		switch v.CodecID {
 		case codec.CodecID_AAC:
-			var mpegConf mpeg4audio.Config
+			audio := &media.Media{
-			mpegConf.Unmarshal(v.SequenceHead[2:])
+				Type: media.TypeAudio,
-			atrack := &gortsplib.TrackMPEG4Audio{
+				Formats: []format.Format{&format.MPEG4Audio{
-				PayloadType: v.PayloadType, Config: &mpegConf, SizeLength: 13, IndexLength: 3, IndexDeltaLength: 3,
+					PayloadTyp: v.PayloadType,
+					Config: &mpeg4audio.Config{
+						Type:         mpeg4audio.ObjectTypeAACLC,
+						SampleRate:   int(v.SampleRate),
+						ChannelCount: int(v.Channels),
+					},
+					SizeLength:       13,
+					IndexLength:      3,
+					IndexDeltaLength: 3,
+				}},
 			}
-			s.audioTrackId = len(s.tracks)
+			s.audioTrack = audio
-			s.tracks = append(s.tracks, atrack)
+			s.tracks = append(s.tracks, audio)
 		case codec.CodecID_PCMA:
-			s.audioTrackId = len(s.tracks)
+			audio := &media.Media{
-			s.tracks = append(s.tracks, &gortsplib.TrackPCMA{})
+				Type:    media.TypeAudio,
+				Formats: []format.Format{&format.G711{}},
+			}
+			s.audioTrack = audio
+			s.tracks = append(s.tracks, audio)
 		case codec.CodecID_PCMU:
-			s.audioTrackId = len(s.tracks)
+			audio := &media.Media{
-			s.tracks = append(s.tracks, &gortsplib.TrackPCMU{})
+				Type: media.TypeAudio,
+				Formats: []format.Format{&format.G711{
+					MULaw: true,
+				}},
+			}
+			s.audioTrack = audio
+			s.tracks = append(s.tracks, audio)
 		}
 		s.AddTrack(v)
 	case ISubscriber:
 		s.stream = gortsplib.NewServerStream(s.tracks)
 	case VideoRTP:
-		s.stream.WritePacketRTP(s.videoTrackId, &v.Packet)
+		s.stream.WritePacketRTP(s.videoTrack, &v.Packet)
 	case AudioRTP:
-		s.stream.WritePacketRTP(s.audioTrackId, &v.Packet)
+		s.stream.WritePacketRTP(s.audioTrack, &v.Packet)
 	default:
 		s.Subscriber.OnEvent(event)
 	}