Merge pull request #1 from mask-pp/bug_fix

实现metadata函数
This commit is contained in:
dexter
2020-08-15 22:14:07 -05:00
committed by GitHub

91
main.go
View File

@@ -39,51 +39,54 @@ func HDLHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasSuffix(stringPath, ".flv") { if strings.HasSuffix(stringPath, ".flv") {
stringPath = strings.TrimRight(stringPath, ".flv") stringPath = strings.TrimRight(stringPath, ".flv")
} }
if s := FindStream(stringPath); s != nil { //atomic.AddInt32(&hdlId, 1)
//atomic.AddInt32(&hdlId, 1) w.Header().Set("Access-Control-Allow-Origin", "*")
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(avformat.FLVHeader) p := Subscriber{
var metadata avformat.SendPacket Sign: sign,
metadata.AVPacket = new(avformat.AVPacket) OnData: func(packet *avformat.SendPacket) error {
metadata.Type = avformat.FLV_TAG_TYPE_SCRIPT return avformat.WriteFLVTag(w, packet)
var buffer bytes.Buffer },
amf.WriteString(&buffer, "onMetaData") MetaData: func(stream *Stream) error {
WriteEcmaArray(&buffer, amf.Object{ var metadata avformat.SendPacket
"MetaDataCreator": "monibuca", metadata.AVPacket = new(avformat.AVPacket)
"hasVideo": true, metadata.Type = avformat.FLV_TAG_TYPE_SCRIPT
"hasAudio": s.AudioInfo.SoundFormat>0, var buffer bytes.Buffer
"hasMatadata": true, if _, err := amf.WriteString(&buffer, "onMetaData"); err != nil {
"canSeekToEnd": false, return err
"duration": 0, }
"hasKeyFrames": 0,
"videocodecid": int(s.VideoInfo.CodecID), if _, err := WriteEcmaArray(&buffer, amf.Object{
"framerate": 0, "MetaDataCreator": "monibuca",
"videodatarate": 0, "hasVideo": true,
"audiocodecid": int(s.AudioInfo.SoundFormat), "hasAudio": stream.AudioInfo.SoundFormat > 0,
"filesize": 0, "hasMatadata": true,
"width": s.VideoInfo.SPSInfo.Width, "canSeekToEnd": false,
"height": s.VideoInfo.SPSInfo.Height, "duration": 0,
"audiosamplerate": s.AudioInfo.SoundRate, "hasKeyFrames": 0,
"audiosamplesize": int(s.AudioInfo.SoundSize), "videocodecid": int(stream.VideoInfo.CodecID),
"stereo": s.AudioInfo.SoundType == 1, "framerate": 0,
}) "videodatarate": 0,
metadata.Payload = buffer.Bytes() "audiocodecid": int(stream.AudioInfo.SoundFormat),
avformat.WriteFLVTag(w, &metadata) "filesize": 0,
p := Subscriber{ "width": stream.VideoInfo.SPSInfo.Width,
Sign: sign, "height": stream.VideoInfo.SPSInfo.Height,
OnData: func(packet *avformat.SendPacket) error { "audiosamplerate": stream.AudioInfo.SoundRate,
return avformat.WriteFLVTag(w, packet) "audiosamplesize": int(stream.AudioInfo.SoundSize),
}, "stereo": stream.AudioInfo.SoundType == 1,
SubscriberInfo: SubscriberInfo{ }); err != nil {
ID: r.RemoteAddr, Type: "FLV", return err
}, }
} metadata.Payload = buffer.Bytes()
p.Subscribe(stringPath) return avformat.WriteFLVTag(w, &metadata)
} else { },
w.WriteHeader(404) 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)