🐛 FIX: 外推时streamPath设定

This commit is contained in:
dexter
2022-11-17 17:03:48 +08:00
parent c25b86e483
commit 5a09e907ec
2 changed files with 7 additions and 2 deletions

View File

@@ -102,7 +102,8 @@ func (pusher *RTMPPusher) Push() error {
if response, ok := msg.MsgData.(*ResponseCreateStreamMessage); ok { if response, ok := msg.MsgData.(*ResponseCreateStreamMessage); ok {
pusher.StreamID = response.StreamId pusher.StreamID = response.StreamId
URL, _ := url.Parse(pusher.RemoteURL) URL, _ := url.Parse(pusher.RemoteURL)
ps := strings.Split(URL.Path, "/") _, streamPath, _ := strings.Cut(URL.Path, "/")
_, streamPath, _ = strings.Cut(streamPath, "/")
pusher.Args = URL.Query() pusher.Args = URL.Query()
pusher.SendMessage(RTMP_MSG_AMF0_COMMAND, &PublishMessage{ pusher.SendMessage(RTMP_MSG_AMF0_COMMAND, &PublishMessage{
CURDStreamMessage{ CURDStreamMessage{
@@ -112,7 +113,7 @@ func (pusher *RTMPPusher) Push() error {
}, },
response.StreamId, response.StreamId,
}, },
ps[len(ps)-1], streamPath,
"live", "live",
}) })
} else if response, ok := msg.MsgData.(*ResponsePublishMessage); ok { } else if response, ok := msg.MsgData.(*ResponsePublishMessage); ok {

View File

@@ -166,10 +166,14 @@ func (config *RTMPConfig) ServeTCP(conn *net.TCPConn) {
case RTMP_MSG_AUDIO: case RTMP_MSG_AUDIO:
if r, ok := receivers[msg.MessageStreamID]; ok { if r, ok := receivers[msg.MessageStreamID]; ok {
r.ReceiveAudio(msg) r.ReceiveAudio(msg)
} else {
RTMPPlugin.Warn("ReceiveAudio", zap.Uint32("MessageStreamID", msg.MessageStreamID))
} }
case RTMP_MSG_VIDEO: case RTMP_MSG_VIDEO:
if r, ok := receivers[msg.MessageStreamID]; ok { if r, ok := receivers[msg.MessageStreamID]; ok {
r.ReceiveVideo(msg) r.ReceiveVideo(msg)
} else {
RTMPPlugin.Warn("ReceiveVideo", zap.Uint32("MessageStreamID", msg.MessageStreamID))
} }
} }
} else { } else {