Browse Source

适配3.3

v4
dexter 3 years ago
parent
commit
e20d912b6e
  1. 2
      go.mod
  2. 2
      go.sum
  3. 12
      main.go

2
go.mod

@ -3,7 +3,7 @@ module github.com/Monibuca/plugin-webrtc/v3
go 1.13 go 1.13
require ( require (
github.com/Monibuca/engine/v3 v3.2.8 github.com/Monibuca/engine/v3 v3.3.0
github.com/Monibuca/utils/v3 v3.0.2 github.com/Monibuca/utils/v3 v3.0.2
github.com/pion/rtcp v1.2.6 github.com/pion/rtcp v1.2.6
github.com/pion/webrtc/v3 v3.0.32 github.com/pion/webrtc/v3 v3.0.32

2
go.sum

@ -4,6 +4,8 @@ github.com/Monibuca/engine/v3 v3.1.0 h1:/U1YV6dYu4nYdLUHJgDhXzbmp1/X0Vwi8xrx1Wfy
github.com/Monibuca/engine/v3 v3.1.0/go.mod h1:yz6cssED2VlYu+g/LrxseBB9pcvsLM/o2QXa4gVY650= github.com/Monibuca/engine/v3 v3.1.0/go.mod h1:yz6cssED2VlYu+g/LrxseBB9pcvsLM/o2QXa4gVY650=
github.com/Monibuca/engine/v3 v3.2.8 h1:FbITEYfRanr30NW+7W1ue0No2kmnolND7bWZtb6+xvE= github.com/Monibuca/engine/v3 v3.2.8 h1:FbITEYfRanr30NW+7W1ue0No2kmnolND7bWZtb6+xvE=
github.com/Monibuca/engine/v3 v3.2.8/go.mod h1:odyqD/VTQDN4qgzajsgn7kW7MWDIzTHt+j+BcI8i+4g= github.com/Monibuca/engine/v3 v3.2.8/go.mod h1:odyqD/VTQDN4qgzajsgn7kW7MWDIzTHt+j+BcI8i+4g=
github.com/Monibuca/engine/v3 v3.3.0 h1:7zwYsLEHdeVZy6+JjVlaDhl/asr0HG6jirBL4uynj0s=
github.com/Monibuca/engine/v3 v3.3.0/go.mod h1:odyqD/VTQDN4qgzajsgn7kW7MWDIzTHt+j+BcI8i+4g=
github.com/Monibuca/utils/v3 v3.0.0 h1:i8qCXQPQpRPgjuXKu5C2PYiL5LYzB6GW4xE162mB2ug= github.com/Monibuca/utils/v3 v3.0.0 h1:i8qCXQPQpRPgjuXKu5C2PYiL5LYzB6GW4xE162mB2ug=
github.com/Monibuca/utils/v3 v3.0.0/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE= github.com/Monibuca/utils/v3 v3.0.0/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=
github.com/Monibuca/utils/v3 v3.0.1/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE= github.com/Monibuca/utils/v3 v3.0.1/go.mod h1:RpNS95gapWs6gimwh8Xn2x72FN5tO7Powabj7dTFyvE=

12
main.go

@ -272,12 +272,12 @@ func run() {
return return
} }
var lastTimeStampV uint32 var lastTimeStampV uint32
sub.OnVideo = func(pack engine.VideoPack) { sub.OnVideo = func(ts uint32, pack *engine.VideoPack) {
var s uint32 = 40 var s uint32 = 40
if lastTimeStampV > 0 { if lastTimeStampV > 0 {
s = pack.Timestamp - lastTimeStampV s = ts - lastTimeStampV
} }
lastTimeStampV = pack.Timestamp lastTimeStampV = ts
if pack.IDR { if pack.IDR {
err = videoTrack.WriteSample(media.Sample{ err = videoTrack.WriteSample(media.Sample{
Data: vt.ExtraData.NALUs[0], Data: vt.ExtraData.NALUs[0],
@ -326,12 +326,12 @@ func run() {
return return
} }
var lastTimeStampA uint32 var lastTimeStampA uint32
sub.OnAudio = func(pack engine.AudioPack) { sub.OnAudio = func(ts uint32, pack *engine.AudioPack) {
var s uint32 var s uint32
if lastTimeStampA > 0 { if lastTimeStampA > 0 {
s = pack.Timestamp - lastTimeStampA s = ts - lastTimeStampA
} }
lastTimeStampA = pack.Timestamp lastTimeStampA = ts
audioTrack.WriteSample(media.Sample{ audioTrack.WriteSample(media.Sample{
Data: pack.Raw, Duration: time.Millisecond * time.Duration(s), Data: pack.Raw, Duration: time.Millisecond * time.Duration(s),
}) })

Loading…
Cancel
Save