apps/plugin-rtmp
1
0
Fork 0
mirror of https://github.com/Monibuca/plugin-rtmp.git synced 2025-10-05 23:47:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

适配引擎变更

Browse Source
This commit is contained in:
dexter
2022-02-08 19:32:02 +08:00
parent abb285fe5d
commit e3bed2dacb
3 changed files with 21 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netStream.go
View File

@@ -14,7 +14,7 @@ import (
var gstreamid = uint32(64)
func (cfg *RTMPConfig) ServeTCP(conn *net.TCPConn) {
func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
nc := NetConnection{
TCPConn: conn,
Reader: bufio.NewReader(conn),
@@ -87,8 +87,7 @@ func (cfg *RTMPConfig) ServeTCP(conn *net.TCPConn) {
}
case "publish":
pm := msg.MsgData.(*PublishMessage)
nc.Config = config.Publish
if nc.Publish(nc.appName+"/"+pm.PublishingName, &nc) {
if nc.Publish(nc.appName+"/"+pm.PublishingName, &nc, config.Publish) {
absTs := make(map[uint32]uint32)
vt := nc.Stream.NewVideoTrack()
at := nc.Stream.NewAudioTrack()
@@ -135,7 +134,7 @@ func (cfg *RTMPConfig) ServeTCP(conn *net.TCPConn) {
vt, at := subscriber.WaitVideoTrack(), subscriber.WaitAudioTrack()
if vt != nil {
frame := vt.DecoderConfiguration
err = nc.sendAVMessage(0, frame.AVCC, false, true)
err = nc.sendAVMessage(0, net.Buffers(frame.AVCC), false, true)
subscriber.OnVideo = func(frame *engine.VideoFrame) error {
return nc.sendAVMessage(frame.DeltaTime, frame.AVCC, false, false)
}
@@ -144,7 +143,7 @@ func (cfg *RTMPConfig) ServeTCP(conn *net.TCPConn) {
subscriber.OnAudio = func(frame *engine.AudioFrame) (err error) {
if at.CodecID == codec.CodecID_AAC {
frame := at.DecoderConfiguration
err = nc.sendAVMessage(0, frame.AVCC, true, true)
err = nc.sendAVMessage(0, net.Buffers{frame.AVCC}, true, true)
} else {
err = nc.sendAVMessage(0, frame.AVCC, true, true)
}