适配3.0变化

This commit is contained in:
langhuihui
2021-02-14 14:30:10 +08:00
parent 2a3b608076
commit 8533f178e1

90
main.go
View File

@@ -6,9 +6,9 @@ import (
"net/http" "net/http"
"regexp" "regexp"
. "github.com/Monibuca/engine/v2" . "github.com/Monibuca/engine/v3"
"github.com/Monibuca/engine/v2/avformat" "github.com/Monibuca/utils/v3"
"github.com/Monibuca/utils" "github.com/Monibuca/utils/v3/codec"
. "github.com/logrusorgru/aurora" . "github.com/logrusorgru/aurora"
amf "github.com/zhangpeihao/goamf" amf "github.com/zhangpeihao/goamf"
) )
@@ -24,7 +24,6 @@ var streamPathReg = regexp.MustCompile("/(hdl/)?((.+)(\\.flv)|(.+))")
func init() { func init() {
InstallPlugin(&PluginConfig{ InstallPlugin(&PluginConfig{
Name: "HDL", Name: "HDL",
Type: PLUGIN_SUBSCRIBER,
Config: &config, Config: &config,
Run: run, Run: run,
}) })
@@ -32,73 +31,82 @@ func init() {
func run() { func run() {
if config.ListenAddr != "" || config.ListenAddrTLS != "" { if config.ListenAddr != "" || config.ListenAddrTLS != "" {
Print(Green("HDL start at "), BrightBlue(config.ListenAddr), BrightBlue(config.ListenAddrTLS)) utils.Print(Green("HDL start at "), BrightBlue(config.ListenAddr), BrightBlue(config.ListenAddrTLS))
utils.ListenAddrs(config.ListenAddr, config.ListenAddrTLS, config.CertFile, config.KeyFile, http.HandlerFunc(HDLHandler)) utils.ListenAddrs(config.ListenAddr, config.ListenAddrTLS, config.CertFile, config.KeyFile, http.HandlerFunc(HDLHandler))
} else { } else {
Print(Green("HDL start reuse gateway port")) utils.Print(Green("HDL start reuse gateway port"))
http.HandleFunc("/hdl/", HDLHandler) http.HandleFunc("/hdl/", HDLHandler)
} }
} }
func HDLHandler(w http.ResponseWriter, r *http.Request) { func HDLHandler(w http.ResponseWriter, r *http.Request) {
sign := r.URL.Query().Get("sign") sign := r.URL.Query().Get("sign")
if err := AuthHooks.Trigger(sign); err != nil { // if err := AuthHooks.Trigger(sign); err != nil {
w.WriteHeader(403) // w.WriteHeader(403)
// return
// }
utils.CORS(w, r)
parts := streamPathReg.FindStringSubmatch(r.RequestURI)
if len(parts) == 0 {
w.WriteHeader(404)
return return
} }
parts := streamPathReg.FindStringSubmatch(r.RequestURI)
stringPath := parts[3] stringPath := parts[3]
if stringPath == "" { if stringPath == "" {
stringPath = parts[5] stringPath = parts[5]
} }
//atomic.AddInt32(&hdlId, 1)
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Transfer-Encoding", "chunked") w.Header().Set("Transfer-Encoding", "chunked")
w.Header().Set("Content-Type", "video/x-flv") w.Header().Set("Content-Type", "video/x-flv")
w.Write(avformat.FLVHeader) w.Write(codec.FLVHeader)
p := Subscriber{ sub := Subscriber{Sign: sign, ID: r.RemoteAddr, Type: "FLV"}
Sign: sign, if err := sub.Subscribe(stringPath); err == nil {
OnData: func(packet *avformat.SendPacket) error {
return avformat.WriteFLVTag(w, packet)
},
MetaData: func(stream *Stream) error {
var metadata avformat.SendPacket
metadata.AVPacket = new(avformat.AVPacket)
metadata.Type = avformat.FLV_TAG_TYPE_SCRIPT
var buffer bytes.Buffer var buffer bytes.Buffer
if _, err := amf.WriteString(&buffer, "onMetaData"); err != nil { if _, err := amf.WriteString(&buffer, "onMetaData"); err != nil {
return err return err
} }
metaData := amf.Object{
if _, err := WriteEcmaArray(&buffer, amf.Object{ "MetaDataCreator": "m7s",
"MetaDataCreator": "monibuca", "hasVideo": sub.OriginVideoTrack != nil,
"hasVideo": true, "hasAudio": sub.OriginAudioTrack != nil,
"hasAudio": stream.AudioInfo.SoundFormat > 0,
"hasMatadata": true, "hasMatadata": true,
"canSeekToEnd": false, "canSeekToEnd": false,
"duration": 0, "duration": 0,
"hasKeyFrames": 0, "hasKeyFrames": 0,
"videocodecid": int(stream.VideoInfo.CodecID),
"framerate": 0, "framerate": 0,
"videodatarate": 0, "videodatarate": 0,
"audiocodecid": int(stream.AudioInfo.SoundFormat),
"filesize": 0, "filesize": 0,
"width": stream.VideoInfo.SPSInfo.Width, }
"height": stream.VideoInfo.SPSInfo.Height, if sub.OriginVideoTrack != nil {
"audiosamplerate": stream.AudioInfo.SoundRate, metaData["videocodecid"] = sub.OriginVideoTrack.CodecID
"audiosamplesize": int(stream.AudioInfo.SoundSize), metaData["width"] = sub.OriginVideoTrack.SPSInfo.Width
"stereo": stream.AudioInfo.SoundType == 1, metaData["height"] = sub.OriginVideoTrack.SPSInfo.Height
}); err != nil { sub.OnVideo = func(pack VideoPack) {
payload := codec.Nalu2RTMPTag(pack.Payload)
defer utils.RecycleSlice(payload)
codec.WriteFLVTag(w, codec.FLV_TAG_TYPE_VIDEO, pack.Timestamp, payload)
}
}
if sub.OriginAudioTrack != nil {
metaData["audiocodecid"] = int(sub.OriginAudioTrack.SoundFormat)
metaData["audiosamplerate"] = sub.OriginAudioTrack.SoundRate
metaData["audiosamplesize"] = int(sub.OriginAudioTrack.SoundSize)
metaData["stereo"] = sub.OriginAudioTrack.SoundType == 1
var aac byte
if sub.OriginAudioTrack.SoundFormat == 10 {
aac = sub.OriginAudioTrack.RtmpTag[0]
}
sub.OnAudio = func(pack AudioPack) {
payload := codec.Audio2RTMPTag(aac, pack.Payload)
defer utils.RecycleSlice(payload)
codec.WriteFLVTag(w, codec.FLV_TAG_TYPE_AUDIO, pack.Timestamp, payload)
}
}
if _, err := WriteEcmaArray(&buffer, metaData); err != nil {
return err return err
} }
metadata.Payload = buffer.Bytes() codec.WriteFLVTag(w, codec.FLV_TAG_TYPE_SCRIPT, 0, buffer.Bytes())
return avformat.WriteFLVTag(w, &metadata) sub.Play(r.Context(), sub.OriginAudioTrack, sub.OriginVideoTrack)
},
SubscriberInfo: SubscriberInfo{
ID: r.RemoteAddr, Type: "FLV",
},
} }
p.Subscribe(stringPath)
} }
func WriteEcmaArray(w amf.Writer, o amf.Object) (n int, err error) { func WriteEcmaArray(w amf.Writer, o amf.Object) (n int, err error) {
n, err = amf.WriteMarker(w, amf.AMF0_ECMA_ARRAY_MARKER) n, err = amf.WriteMarker(w, amf.AMF0_ECMA_ARRAY_MARKER)