apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-09-30 05:42:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update rtmp server

Browse Source
This commit is contained in:
Ingo Oppermann
2025-08-06 15:59:25 +02:00
parent e633aa78e9
commit c960227f1b
6 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -12,7 +12,7 @@ require (
github.com/atrox/haikunatorgo/v2 v2.0.1 github.com/atrox/haikunatorgo/v2 v2.0.1
github.com/caddyserver/certmagic v0.23.0 github.com/caddyserver/certmagic v0.23.0
github.com/datarhei/gosrt v0.9.0 github.com/datarhei/gosrt v0.9.0
github.com/datarhei/joy4 v0.0.0-20240603190808-b1407345907e github.com/datarhei/joy4 v0.0.0-20250806135534-393d6bb11439
github.com/dolthub/swiss v0.2.1 github.com/dolthub/swiss v0.2.1
github.com/fujiwara/shapeio v1.0.0 github.com/fujiwara/shapeio v1.0.0
github.com/go-playground/validator/v10 v10.27.0 github.com/go-playground/validator/v10 v10.27.0

4
go.sum
View File

@@ -50,8 +50,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.7 h1:zbFlGlXEAKlwXpmvle3d8Oe3YnkKIK4xSRTd3
github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/cpuguy83/go-md2man/v2 v2.0.7/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/datarhei/gosrt v0.9.0 h1:FW8A+F8tBiv7eIa57EBHjtTJKFX+OjvLogF/tFXoOiA= github.com/datarhei/gosrt v0.9.0 h1:FW8A+F8tBiv7eIa57EBHjtTJKFX+OjvLogF/tFXoOiA=
github.com/datarhei/gosrt v0.9.0/go.mod h1:rqTRK8sDZdN2YBgp1EEICSV4297mQk0oglwvpXhaWdk= github.com/datarhei/gosrt v0.9.0/go.mod h1:rqTRK8sDZdN2YBgp1EEICSV4297mQk0oglwvpXhaWdk=
github.com/datarhei/joy4 v0.0.0-20240603190808-b1407345907e h1:Qc/0D4xvXrazFkoi/4UGqO15yQ1JN5I8h7RwdzCLgTY= github.com/datarhei/joy4 v0.0.0-20250806135534-393d6bb11439 h1:8HMGWtglP1I23Qd4PLLeDthkLY2Ye67ePW5zY61v+Hs=
github.com/datarhei/joy4 v0.0.0-20240603190808-b1407345907e/go.mod h1:Jcw/6jZDQQmPx8A7INEkXmuEF7E9jjBbSTfVSLwmiQw= github.com/datarhei/joy4 v0.0.0-20250806135534-393d6bb11439/go.mod h1:Jcw/6jZDQQmPx8A7INEkXmuEF7E9jjBbSTfVSLwmiQw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

18
vendor/github.com/datarhei/joy4/av/pubsub/queue.go generated vendored
View File

@@ -46,7 +46,6 @@ func (self *Queue) SetMaxGopCount(n int) {
self.lock.Lock() self.lock.Lock()
self.maxgopcount = n self.maxgopcount = n
self.lock.Unlock() self.lock.Unlock()
return
} }
func (self *Queue) WriteHeader(streams []av.CodecData) error { func (self *Queue) WriteHeader(streams []av.CodecData) error {
@@ -85,6 +84,22 @@ func (self *Queue) WritePacket(pkt av.Packet) (err error) {
self.lock.Lock() self.lock.Lock()
self.buf.Push(pkt) self.buf.Push(pkt)
if self.videoidx == -1 { // audio only stream
if pkt.IsKeyFrame {
self.curgopcount++
}
for self.curgopcount >= self.maxgopcount && self.buf.Count > 1 {
pkt := self.buf.Pop()
if pkt.IsKeyFrame {
self.curgopcount--
}
if self.curgopcount < self.maxgopcount {
break
}
}
} else { // video only or video+audio stream
if pkt.Idx == int8(self.videoidx) && pkt.IsKeyFrame { if pkt.Idx == int8(self.videoidx) && pkt.IsKeyFrame {
self.curgopcount++ self.curgopcount++
} }
@@ -98,6 +113,7 @@ func (self *Queue) WritePacket(pkt av.Packet) (err error) {
break break
} }
} }
}
self.cond.Broadcast() self.cond.Broadcast()

5
vendor/github.com/datarhei/joy4/format/aac/aac.go generated vendored
View File

@@ -3,11 +3,12 @@ package aac
import ( import (
"bufio" "bufio"
"fmt" "fmt"
"io"
"time"
"github.com/datarhei/joy4/av" "github.com/datarhei/joy4/av"
"github.com/datarhei/joy4/av/avutil" "github.com/datarhei/joy4/av/avutil"
"github.com/datarhei/joy4/codec/aacparser" "github.com/datarhei/joy4/codec/aacparser"
"io"
"time"
) )
type Muxer struct { type Muxer struct {

3
vendor/github.com/datarhei/joy4/format/flv/flv.go generated vendored
View File

@@ -279,15 +279,18 @@ func (prober *Prober) TagToPacket(tag flvio.Tag, timestamp int32) (pkt av.Packet
case flvio.AAC_RAW: case flvio.AAC_RAW:
ok = true ok = true
pkt.Data = tag.Data pkt.Data = tag.Data
pkt.IsKeyFrame = true
} }
case flvio.SOUND_SPEEX: case flvio.SOUND_SPEEX:
ok = true ok = true
pkt.Data = tag.Data pkt.Data = tag.Data
pkt.IsKeyFrame = true
case flvio.SOUND_NELLYMOSER: case flvio.SOUND_NELLYMOSER:
ok = true ok = true
pkt.Data = tag.Data pkt.Data = tag.Data
pkt.IsKeyFrame = true
} }
} }

2
vendor/modules.txt vendored
View File

@@ -78,7 +78,7 @@ github.com/datarhei/gosrt/crypto
github.com/datarhei/gosrt/net github.com/datarhei/gosrt/net
github.com/datarhei/gosrt/packet github.com/datarhei/gosrt/packet
github.com/datarhei/gosrt/rand github.com/datarhei/gosrt/rand
# github.com/datarhei/joy4 v0.0.0-20240603190808-b1407345907e # github.com/datarhei/joy4 v0.0.0-20250806135534-393d6bb11439
## explicit; go 1.14 ## explicit; go 1.14
github.com/datarhei/joy4/av github.com/datarhei/joy4/av
github.com/datarhei/joy4/av/avutil github.com/datarhei/joy4/av/avutil