From 6c50f90a01faa9a81ef8709a80d09dfd1ae204ae Mon Sep 17 00:00:00 2001 From: "Baik S. Hyun" Date: Mon, 26 Apr 2021 10:54:32 +0900 Subject: [PATCH] add util package --- av/avutil/avutil.go | 4 ++++ format/format.go | 19 +++++++++---------- util/util.go | 13 +++++++++++++ 3 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 util/util.go diff --git a/av/avutil/avutil.go b/av/avutil/avutil.go index 6e5cb5d..c1f5f04 100644 --- a/av/avutil/avutil.go +++ b/av/avutil/avutil.go @@ -10,6 +10,7 @@ import ( "strings" "gitlab.com/ics_cinnamon/joy4/av" + "gitlab.com/ics_cinnamon/joy4/util" ) type HandlerDemuxer struct { @@ -126,6 +127,8 @@ func (self *Handlers) NewAudioDecoder(codec av.AudioCodecData) (dec av.AudioDeco } func (self *Handlers) Open(uri string) (demuxer av.DemuxCloser, err error) { + util.PrintCallTrace(0) + listen := false if strings.HasPrefix(uri, "listen:") { uri = uri[len("listen:"):] @@ -270,6 +273,7 @@ var DefaultHandlers = &Handlers{} func Open(url string) (demuxer av.DemuxCloser, err error) { fmt.Println("avutil Open!") + util.PrintCallTrace(1) return DefaultHandlers.Open(url) } diff --git a/format/format.go b/format/format.go index 50795b1..85bdb9a 100644 --- a/format/format.go +++ b/format/format.go @@ -1,20 +1,19 @@ package format import ( + "fmt" + "gitlab.com/ics_cinnamon/joy4/av/avutil" "gitlab.com/ics_cinnamon/joy4/format/aac" - "gitlab.com/ics_cinnamon/joy4/format/flv" - "gitlab.com/ics_cinnamon/joy4/format/mp4" - "gitlab.com/ics_cinnamon/joy4/format/rtmp" - "gitlab.com/ics_cinnamon/joy4/format/rtsp" - "gitlab.com/ics_cinnamon/joy4/format/ts" ) func RegisterAll() { - avutil.DefaultHandlers.Add(mp4.Handler) - avutil.DefaultHandlers.Add(ts.Handler) - avutil.DefaultHandlers.Add(rtmp.Handler) - avutil.DefaultHandlers.Add(rtsp.Handler) - avutil.DefaultHandlers.Add(flv.Handler) + //avutil.DefaultHandlers.Add(mp4.Handler) + //avutil.DefaultHandlers.Add(ts.Handler) + //avutil.DefaultHandlers.Add(rtmp.Handler) + //avutil.DefaultHandlers.Add(rtsp.Handler) + //avutil.DefaultHandlers.Add(flv.Handler) avutil.DefaultHandlers.Add(aac.Handler) + + fmt.Println("Handler Regi Done!") } diff --git a/util/util.go b/util/util.go new file mode 100644 index 0000000..ef7e19b --- /dev/null +++ b/util/util.go @@ -0,0 +1,13 @@ +package util + +import ( + "fmt" + "runtime" +) + +func PrintCallTrace(depth int) { + funcname, file, line, ok := runtime.Caller(depth) + if ok { + fmt.Printf("[%s:%d %s]\n", file, line, runtime.FuncForPC(funcname).Name()) + } +}