diff --git a/go.mod b/go.mod index 8abcc0f2..38e5eb11 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( go.uber.org/zap v1.26.0 - m7s.live/engine/v4 v4.14.7 + m7s.live/engine/v4 v4.15.2-0.20240307124820-0280cfa65521 m7s.live/plugin/debug/v4 v4.0.3 m7s.live/plugin/fmp4/v4 v4.0.6 m7s.live/plugin/gb28181/v4 v4.4.4 @@ -17,10 +17,10 @@ require ( m7s.live/plugin/preview/v4 v4.1.4 m7s.live/plugin/record/v4 v4.4.6 m7s.live/plugin/room/v4 v4.1.0 - m7s.live/plugin/rtmp/v4 v4.3.0 - m7s.live/plugin/rtsp/v4 v4.3.4 + m7s.live/plugin/rtmp/v4 v4.3.1-0.20240307124858-efe5c2b0ee20 + m7s.live/plugin/rtsp/v4 v4.3.5-0.20240228010654-14ef344d0848 m7s.live/plugin/snap/v4 v4.0.8 - m7s.live/plugin/webrtc/v4 v4.2.5 + m7s.live/plugin/webrtc/v4 v4.2.6-0.20240228010952-272f6e1bc8bd m7s.live/plugin/webtransport/v4 v4.0.10 ) @@ -99,12 +99,12 @@ require ( golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.19.0 // indirect - golang.org/x/sync v0.3.0 // indirect + golang.org/x/sync v0.5.0 // indirect golang.org/x/sys v0.15.0 // indirect golang.org/x/term v0.15.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.13.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - m7s.live/plugin/ps/v4 v4.1.5-0.20231213072312-25570d9571b3 // indirect + m7s.live/plugin/ps/v4 v4.1.5-0.20240228014109-36ba11968b92 // indirect ) diff --git a/go.sum b/go.sum index 528de35c..1b29d691 100644 --- a/go.sum +++ b/go.sum @@ -326,6 +326,8 @@ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= +golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= +golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -436,6 +438,10 @@ 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.14.7 h1:dAR34ADfJ89aCndkukLM4ee4HjQd/D0B+Ee2pV/Vhzg= m7s.live/engine/v4 v4.14.7/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g= +m7s.live/engine/v4 v4.15.1 h1:oRIz4f+7sjFqBAHWKsePUvUj+vPItt9GVjYygl6GqaU= +m7s.live/engine/v4 v4.15.1/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g= +m7s.live/engine/v4 v4.15.2-0.20240307124820-0280cfa65521 h1:BDesxbDba3bVdDERQlI3iN86CHRXVN6/X1A0gkfL6OQ= +m7s.live/engine/v4 v4.15.2-0.20240307124820-0280cfa65521/go.mod h1:FRtMPBGzNE6kCLgY0wuS3H7d1btKocRiVe9fAkDtP1g= m7s.live/plugin/debug/v4 v4.0.3 h1:lwqKkySXhu47kon/YeF+h5UXXac6c9seb2L6Y8X5ktM= m7s.live/plugin/debug/v4 v4.0.3/go.mod h1:muzikl1KrHfbT/+2aHzKg9qDGfpArViQAtpcfFrST88= m7s.live/plugin/fmp4/v4 v4.0.6 h1:X4FXfYuI1OCgaJzyJUNySDRPNPHzLJ5StgX/IxljQIA= @@ -458,17 +464,27 @@ m7s.live/plugin/preview/v4 v4.1.4 h1:ij5X5AYyD3vTOpla8DfVIcQi62HNZTHMppTgr7fFEh4 m7s.live/plugin/preview/v4 v4.1.4/go.mod h1:iYhWqFbTvTNDFplbTOrE5X9M6ED7gCKkKMuM5QmBocg= m7s.live/plugin/ps/v4 v4.1.5-0.20231213072312-25570d9571b3 h1:Ibo6vCb8VpqnpIQ2/3PFIr35BMku/2/j44f8cms77AM= m7s.live/plugin/ps/v4 v4.1.5-0.20231213072312-25570d9571b3/go.mod h1:RAb507iNmPG43I5kUA6ewF1fTRHDRsKbIVkIdLdKeeI= +m7s.live/plugin/ps/v4 v4.1.5-0.20240228014109-36ba11968b92 h1:0MWqnsyQ69RKTCogkrpCajnGJZrW2KIaUxHxYigTyzo= +m7s.live/plugin/ps/v4 v4.1.5-0.20240228014109-36ba11968b92/go.mod h1:a4Z6Bd8Fhclz4uFg2Bct+pYFGzUHe9SLrEq2PDl4fSY= m7s.live/plugin/record/v4 v4.4.6 h1:uXhJIudBQ8T3hsNkkOgEbtWsC8feiIT1o/+Ij1SWU0A= m7s.live/plugin/record/v4 v4.4.6/go.mod h1:4fSAA/AYCNsFA0Ii0UVuBqsbhoTXC1s3lC/en5qabjg= m7s.live/plugin/room/v4 v4.1.0 h1:7avMuCnYHX1z9jmoPaGl4tdw5DKFDWiAgFK0+RWVqzA= m7s.live/plugin/room/v4 v4.1.0/go.mod h1:4GBdAHUYtdp+nkHcGIClI8xkIUo/VTrD9Y0YMlTE7HU= m7s.live/plugin/rtmp/v4 v4.3.0 h1:zXnN5D0cdFWAZWEiz451WhlLdpgB6y2R3nS3f/cFspI= m7s.live/plugin/rtmp/v4 v4.3.0/go.mod h1:UqI1l1+3Y2zg2oOUkfVJ719hcv10bMYVAlg5e+gqy2E= +m7s.live/plugin/rtmp/v4 v4.3.1-0.20240228010619-887c9bb6c3b7 h1:I0/OKyTbzRKo2r5flVzvpO9/BChFfe0QowNwXWRKugU= +m7s.live/plugin/rtmp/v4 v4.3.1-0.20240228010619-887c9bb6c3b7/go.mod h1:6yihulC3KwZaT28qIHHgD68/aP7S6LpA2x3L8mMq6+w= +m7s.live/plugin/rtmp/v4 v4.3.1-0.20240307124858-efe5c2b0ee20 h1:ugC5795EjCm0sNFUYp7NzmfZGy46Rz1/PY240DFSpOQ= +m7s.live/plugin/rtmp/v4 v4.3.1-0.20240307124858-efe5c2b0ee20/go.mod h1:6yihulC3KwZaT28qIHHgD68/aP7S6LpA2x3L8mMq6+w= m7s.live/plugin/rtsp/v4 v4.3.4 h1:dwRCdmXEFORzvVhPHfIV+5Pdlhx/OMjk5xmaKDpRDXw= m7s.live/plugin/rtsp/v4 v4.3.4/go.mod h1:s6tETQjq/peipACzpkPjXsZfHw+Vq7D1lyHnqSl8DRs= +m7s.live/plugin/rtsp/v4 v4.3.5-0.20240228010654-14ef344d0848 h1:vjI/Pc9kOcvXClq6i3i0U93GdZ73OLWCJ5PsJq9q2f0= +m7s.live/plugin/rtsp/v4 v4.3.5-0.20240228010654-14ef344d0848/go.mod h1:eU4T50gY67EqNRQqUNeEgCi4W9Pa6tGxltHuOJTFwio= m7s.live/plugin/snap/v4 v4.0.8 h1:65t4Wd9wiBdD1/ucCSVma5/LhEg/6XbC4yqf95uvCxI= m7s.live/plugin/snap/v4 v4.0.8/go.mod h1:gVOKn5v2wpKQrklES+nQsaMo6T6ZjfEME7Nz3G51D74= m7s.live/plugin/webrtc/v4 v4.2.5 h1:0swsCn+eSMHZX04PKjAAmLXsyzADuA+hKF+p/LTAFKQ= m7s.live/plugin/webrtc/v4 v4.2.5/go.mod h1:m6B864s2X6r6ZGnky9yL3uJafPCeZfMH6w9cnz4BYcc= +m7s.live/plugin/webrtc/v4 v4.2.6-0.20240228010952-272f6e1bc8bd h1:a7TVZ2Fuw9B29ORpHM1Xp8o0JWWTrXURHP4fjKEquU4= +m7s.live/plugin/webrtc/v4 v4.2.6-0.20240228010952-272f6e1bc8bd/go.mod h1:JbKoTZcUF1qPIFFKaQNM1CBi7IYIBtwJbu1ov8wur7Y= m7s.live/plugin/webtransport/v4 v4.0.10 h1:qacHR9Jsfrx98vngTLwtNtbdh3U2XcPe1BQqUdnDDA4= m7s.live/plugin/webtransport/v4 v4.0.10/go.mod h1:OBTNwQ4TLMaWV4C6Q2un1YKEJaMwk26qdgfI3hX1+qw= diff --git a/test/type.go b/test/type.go index 1f66c518..a7f85d3e 100644 --- a/test/type.go +++ b/test/type.go @@ -92,9 +92,9 @@ func (s *UnitTestSubsciber) OnEvent(event any) { func (pub *UnitTestPublisher) OnEvent(event any) { switch event.(type) { case IPublisher: - pub.VideoTrack = track.NewH264(pub.Stream) + pub.VideoTrack = track.NewH264(pub) pub.VideoTrack.WriteAnnexB(0, 0, spspps) - pub.AudioTrack = track.NewAAC(pub.Stream) + pub.AudioTrack = track.NewAAC(pub) go pub.WriteAudio() go pub.WriteVideo() }