apps/plugin-hdl
1
0
Fork 0
mirror of https://github.com/Monibuca/plugin-hdl.git synced 2025-10-06 01:07:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

引擎升级

Browse Source
This commit is contained in:
dexter
2022-03-13 00:11:40 +08:00
parent 13e8d4e6a2
commit 9ebd3a523b
2 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
main.go
View File

@@ -68,25 +68,7 @@ type HDLSubscriber struct {
func (sub *HDLSubscriber) OnEvent(event any) { func (sub *HDLSubscriber) OnEvent(event any) {
switch v := event.(type) { switch v := event.(type) {
case HaveFLV: case ISubscriber:
flvTag := v.GetFLV()
if _, err := flvTag.WriteTo(sub); err != nil {
sub.Stop()
}
default:
sub.Subscriber.OnEvent(event)
}
}
func (*HDLConfig) ServeHTTP(w http.ResponseWriter, r *http.Request) {
streamPath := strings.TrimSuffix(strings.TrimPrefix(r.URL.Path, "/hdl/"), ".flv")
w.Header().Set("Transfer-Encoding", "chunked")
w.Header().Set("Content-Type", "video/x-flv")
sub := &HDLSubscriber{}
sub.ID = r.RemoteAddr
sub.SetParentCtx(r.Context())
sub.SetIO(w)
if err := plugin.Subscribe(streamPath, sub); err == nil {
at, vt := sub.AudioTrack, sub.VideoTrack at, vt := sub.AudioTrack, sub.VideoTrack
hasVideo := at != nil hasVideo := at != nil
hasAudio := vt != nil hasAudio := vt != nil
@@ -124,10 +106,27 @@ func (*HDLConfig) ServeHTTP(w http.ResponseWriter, r *http.Request) {
metaData["height"] = vt.SPSInfo.Height metaData["height"] = vt.SPSInfo.Height
} }
// 写入FLV头 // 写入FLV头
w.Write([]byte{'F', 'L', 'V', 0x01, flags, 0, 0, 0, 9, 0, 0, 0, 0}) sub.Write([]byte{'F', 'L', 'V', 0x01, flags, 0, 0, 0, 9, 0, 0, 0, 0})
codec.WriteFLVTag(w, codec.FLV_TAG_TYPE_SCRIPT, 0, net.Buffers{buffer.Bytes()}) codec.WriteFLVTag(sub, codec.FLV_TAG_TYPE_SCRIPT, 0, net.Buffers{buffer.Bytes()})
sub.PlayBlock(sub) case HaveFLV:
} else { flvTag := v.GetFLV()
if _, err := flvTag.WriteTo(sub); err != nil {
sub.Stop()
}
default:
sub.Subscriber.OnEvent(event)
}
}
func (*HDLConfig) ServeHTTP(w http.ResponseWriter, r *http.Request) {
streamPath := strings.TrimSuffix(strings.TrimPrefix(r.URL.Path, "/hdl/"), ".flv")
w.Header().Set("Transfer-Encoding", "chunked")
w.Header().Set("Content-Type", "video/x-flv")
sub := &HDLSubscriber{}
sub.ID = r.RemoteAddr
sub.SetParentCtx(r.Context())
sub.SetIO(w)
if err := plugin.SubscribeBlock(streamPath, sub); err != nil {
http.Error(w, err.Error(), http.StatusBadRequest) http.Error(w, err.Error(), http.StatusBadRequest)
} }
} }

6
pull.go
View File

@@ -10,13 +10,11 @@ import (
"go.uber.org/zap" "go.uber.org/zap"
. "m7s.live/engine/v4" . "m7s.live/engine/v4"
"m7s.live/engine/v4/codec" "m7s.live/engine/v4/codec"
"m7s.live/engine/v4/log"
"m7s.live/engine/v4/util" "m7s.live/engine/v4/util"
) )
func (puller *HDLPuller) Connect() (err error) { func (puller *HDLPuller) Connect() (err error) {
plugin.Info("connect", zap.String("remoteURL", puller.RemoteURL))
log.Info("connect", zap.String("remoteURL", puller.RemoteURL))
if strings.HasPrefix(puller.RemoteURL, "http") { if strings.HasPrefix(puller.RemoteURL, "http") {
var res *http.Response var res *http.Response
if res, err = http.Get(puller.RemoteURL); err == nil { if res, err = http.Get(puller.RemoteURL); err == nil {
@@ -29,7 +27,7 @@ func (puller *HDLPuller) Connect() (err error) {
} }
} }
if err != nil { if err != nil {
log.Error("connect", zap.Error(err)) puller.Error("connect", zap.Error(err))
} }
return return
} }