Skip to content

Commit

Permalink
Code refactoring after #1195
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexxIT committed Jun 16, 2024
1 parent 5d57959 commit 906f554
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 11 deletions.
25 changes: 15 additions & 10 deletions internal/streams/dot.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,27 +67,32 @@ type node struct {

var codecKeys = []string{"codec_name", "sample_rate", "channels", "profile", "level"}

func (n *node) name() string {
if name, ok := n.Codec["codec_name"].(string); ok {
return name
}
return "unknown"
}

func (n *node) codec() []byte {
b := make([]byte, 0, 128)
for _, k := range codecKeys {
if v := n.Codec[k]; v != nil {
b = fmt.Appendf(b, "%s=%v\n", k, v)
}
}
return b[:len(b)-1]
}

func (n *node) appendDOT(dot []byte, group string) ([]byte, error) {
codecName, ok := n.Codec["codec_name"]
if !ok {
return nil, fmt.Errorf("codec_name not found in Codec map")
if l := len(b); l > 0 {
return b[:l-1]
}
return b
}

dot = fmt.Appendf(dot, "%d [group=%s, label=%q, title=%q];\n", n.ID, group, codecName, n.codec())
func (n *node) appendDOT(dot []byte, group string) []byte {
dot = fmt.Appendf(dot, "%d [group=%s, label=%q, title=%q];\n", n.ID, group, n.name(), n.codec())
//for _, sink := range n.Childs {
// dot = fmt.Appendf(dot, "%d -> %d;\n", n.ID, sink)
//}
return dot, nil
return dot
}

type conn struct {
Expand Down Expand Up @@ -116,7 +121,7 @@ func (c *conn) appendDOT(dot []byte, group string) []byte {

for _, recv := range c.Receivers {
dot = fmt.Appendf(dot, "%d -> %d [label=%q];\n", c.ID, recv.ID, humanBytes(recv.Bytes))
dot, _ = recv.appendDOT(dot, "node") // TODO: handle error for debug purposes
dot = recv.appendDOT(dot, "node")
}
for _, send := range c.Senders {
dot = fmt.Appendf(dot, "%d -> %d [label=%q];\n", send.Parent, c.ID, humanBytes(send.Bytes))
Expand Down
8 changes: 7 additions & 1 deletion pkg/core/codec.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,14 @@ func FFmpegCodecName(name string) string {
return "vp9"
case CodecAV1:
return "av1"
case CodecELD:
return "aac/eld"
case CodecFLAC:
return "flac"
case CodecMP3:
return "mp3"
}
return ""
return name
}

func (c *Codec) String() (s string) {
Expand Down

0 comments on commit 906f554

Please sign in to comment.