Fix support 2 way audio for Reolink Doorbell #331
This commit is contained in:
@@ -0,0 +1,35 @@
|
|||||||
|
package pcm
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/AlexxIT/go2rtc/pkg/core"
|
||||||
|
"github.com/pion/rtp"
|
||||||
|
)
|
||||||
|
|
||||||
|
func RepackBackchannel(handler core.HandlerFunc) core.HandlerFunc {
|
||||||
|
var buf []byte
|
||||||
|
var seq uint16
|
||||||
|
|
||||||
|
return func(packet *rtp.Packet) {
|
||||||
|
buf = append(buf, packet.Payload...)
|
||||||
|
if len(buf) < 1024 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
pkt := &rtp.Packet{
|
||||||
|
Header: rtp.Header{
|
||||||
|
Version: 2,
|
||||||
|
Marker: true, // should be true
|
||||||
|
PayloadType: packet.PayloadType, // will be owerwriten
|
||||||
|
SequenceNumber: seq,
|
||||||
|
Timestamp: 0, // should be always zero
|
||||||
|
SSRC: packet.SSRC,
|
||||||
|
},
|
||||||
|
Payload: buf[:1024],
|
||||||
|
}
|
||||||
|
|
||||||
|
handler(pkt)
|
||||||
|
|
||||||
|
buf = buf[1024:]
|
||||||
|
seq++
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -6,6 +6,7 @@ import (
|
|||||||
"github.com/AlexxIT/go2rtc/pkg/h264"
|
"github.com/AlexxIT/go2rtc/pkg/h264"
|
||||||
"github.com/AlexxIT/go2rtc/pkg/h265"
|
"github.com/AlexxIT/go2rtc/pkg/h265"
|
||||||
"github.com/AlexxIT/go2rtc/pkg/mjpeg"
|
"github.com/AlexxIT/go2rtc/pkg/mjpeg"
|
||||||
|
"github.com/AlexxIT/go2rtc/pkg/pcm"
|
||||||
"github.com/pion/rtp"
|
"github.com/pion/rtp"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -60,6 +61,12 @@ func (c *Conn) AddTrack(media *core.Media, codec *core.Codec, track *core.Receiv
|
|||||||
sender := core.NewSender(media, codec)
|
sender := core.NewSender(media, codec)
|
||||||
// important to send original codec for valid IsRTP check
|
// important to send original codec for valid IsRTP check
|
||||||
sender.Handler = c.packetWriter(track.Codec, channel, codec.PayloadType)
|
sender.Handler = c.packetWriter(track.Codec, channel, codec.PayloadType)
|
||||||
|
|
||||||
|
// https://github.com/AlexxIT/go2rtc/issues/331
|
||||||
|
if c.mode == core.ModeActiveProducer && track.Codec.Name == core.CodecPCMA {
|
||||||
|
sender.Handler = pcm.RepackBackchannel(sender.Handler)
|
||||||
|
}
|
||||||
|
|
||||||
sender.HandleRTP(track)
|
sender.HandleRTP(track)
|
||||||
|
|
||||||
c.senders = append(c.senders, sender)
|
c.senders = append(c.senders, sender)
|
||||||
|
|||||||
Reference in New Issue
Block a user