kerberos-io/agent
1
0
Fork 0
mirror of https://github.com/kerberos-io/agent.git synced 2026-10-19 17:38:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Cedric Verstraeten
2023-11-30 17:34:03 +01:00
parent dae2c1b5c4
commit df38784a8d
2 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
machinery/src/capture/Joy4.go
+25 -30
View File
@@ -133,7 +133,7 @@ func (j *Joy4) Connect(ctx context.Context) (err error) {
// Start the RTSP client, and start reading packets.
func (j *Joy4) Start(ctx context.Context, queue *packets.Queue, communication *models.Communication) (err error) {
log.Log.Debug("RTSPClient(JOY4).Start(): started")
start := false
loop:
for {
// This will check if we need to stop the thread,
@@ -153,39 +153,34 @@ loop:
// Could be that a decode is throwing errors.
if len(avpkt.Data) > 0 {
avpkt.Data = avpkt.Data[4:]
if avpkt.IsKeyFrame {
start = true
// Add SPS and PPS to the packet.
stream := j.Streams[avpkt.Idx]
annexbNALUStartCode := func() []byte { return []byte{0x00, 0x00, 0x00, 0x01} }
avpkt.Data = append(annexbNALUStartCode(), avpkt.Data...)
avpkt.Data = append(stream.PPS, avpkt.Data...)
avpkt.Data = append(annexbNALUStartCode(), avpkt.Data...)
avpkt.Data = append(stream.SPS, avpkt.Data...)
avpkt.Data = append(annexbNALUStartCode(), avpkt.Data...)
pkt := packets.Packet{
IsKeyFrame: avpkt.IsKeyFrame,
Idx: int8(avpkt.Idx),
CompositionTime: avpkt.CompositionTime,
Time: avpkt.Time,
Data: avpkt.Data,
}
if start {
// Conver to packet.
pkt := packets.Packet{
IsKeyFrame: avpkt.IsKeyFrame,
Idx: int8(avpkt.Idx),
CompositionTime: avpkt.CompositionTime,
Time: avpkt.Time,
Data: avpkt.Data,
}
pkt.Data = pkt.Data[4:]
if pkt.IsKeyFrame {
stream := j.Streams[avpkt.Idx]
annexbNALUStartCode := func() []byte { return []byte{0x00, 0x00, 0x00, 0x01} }
pkt.Data = append(annexbNALUStartCode(), pkt.Data...)
pkt.Data = append(stream.PPS, pkt.Data...)
pkt.Data = append(annexbNALUStartCode(), pkt.Data...)
pkt.Data = append(stream.SPS, pkt.Data...)
pkt.Data = append(annexbNALUStartCode(), pkt.Data...)
}
queue.WritePacket(pkt)
queue.WritePacket(pkt)
if pkt.IsKeyFrame {
// Increment packets, so we know the device
// is not blocking.
r := communication.PackageCounter.Load().(int64)
log.Log.Info("RTSPClient(JOY4).Start(): packet size " + strconv.Itoa(len(pkt.Data)))
communication.PackageCounter.Store((r + 1) % 1000)
communication.LastPacketTimer.Store(time.Now().Unix())
}
if pkt.IsKeyFrame {
// Increment packets, so we know the device
// is not blocking.
r := communication.PackageCounter.Load().(int64)
log.Log.Info("RTSPClient(JOY4).Start(): packet size " + strconv.Itoa(len(pkt.Data)))
communication.PackageCounter.Store((r + 1) % 1000)
communication.LastPacketTimer.Store(time.Now().Unix())
}
// This will check if we need to stop the thread,
machinery/src/capture/main.go
+6 -6
View File
@@ -20,20 +20,20 @@ import (
)
type Capture struct {
RTSPClient *Golibrtsp
RTSPSubClient *Golibrtsp
RTSPClient *Joy4
RTSPSubClient *Joy4
}
func (c *Capture) SetMainClient(rtspUrl string, withBackChannel bool) *Golibrtsp {
c.RTSPClient = &Golibrtsp{
func (c *Capture) SetMainClient(rtspUrl string, withBackChannel bool) *Joy4 {
c.RTSPClient = &Joy4{
Url: rtspUrl,
WithBackChannel: withBackChannel,
}
return c.RTSPClient
}
func (c *Capture) SetSubClient(rtspUrl string, withBackChannel bool) *Golibrtsp {
c.RTSPSubClient = &Golibrtsp{
func (c *Capture) SetSubClient(rtspUrl string, withBackChannel bool) *Joy4 {
c.RTSPSubClient = &Joy4{
Url: rtspUrl,
WithBackChannel: withBackChannel,
}