Code Cleanup, rename outputbc to execbc, using buffered Writer

This commit is contained in:
Michael Reif
2024-01-06 09:32:47 +01:00
parent f65b18842a
commit cc6b8277c9
7 changed files with 98 additions and 66 deletions
+60
View File
@@ -0,0 +1,60 @@
package execbc
import (
"io"
"net"
"os/exec"
"sync"
"github.com/AlexxIT/go2rtc/pkg/core"
)
type Client struct {
medias []*core.Media
sender *core.Sender
conn net.Conn
send int
pipeCloser io.WriteCloser
commandArgs []string
cmd *exec.Cmd
}
var lock = &sync.Mutex{}
var singleInstance *Client
func NewClient(commandArgs []string) (*Client, error) {
return &Client{commandArgs: commandArgs}, nil
}
func (c *Client) Dial() error {
media := &core.Media{
Kind: core.KindAudio,
Direction: core.DirectionSendonly,
Codecs: []*core.Codec{
{Name: core.CodecPCMA, ClockRate: 8000},
},
}
c.medias = append(c.medias, media)
cmdName := c.commandArgs[0]
args := c.commandArgs[1:]
cmd := *exec.Command(cmdName, args...)
pipeCloser, error := PipeCloser(&cmd)
if error != nil {
return error
}
c.pipeCloser = pipeCloser
c.cmd = &cmd
return nil
}
func (c Client) Open() (err error) {
c.cmd.Run()
return
}
func (c Client) Close() (err error) {
return c.pipeCloser.Close()
}
+62
View File
@@ -0,0 +1,62 @@
package execbc
import (
"encoding/json"
"github.com/AlexxIT/go2rtc/pkg/core"
"github.com/pion/rtp"
)
func (c *Client) GetMedias() []*core.Media {
return c.medias
}
func (c *Client) GetTrack(media *core.Media, codec *core.Codec) (*core.Receiver, error) {
return nil, core.ErrCantGetTrack
}
func (c *Client) AddTrack(media *core.Media, _ *core.Codec, track *core.Receiver) error {
if c.sender == nil {
c.sender = core.NewSender(media, track.Codec)
c.sender.Handler = func(packet *rtp.Packet) {
c.pipeCloser.Write(packet.Payload)
c.send += len(packet.Payload)
}
}
c.sender.HandleRTP(track)
return nil
}
func (c *Client) Start() (err error) {
if err = c.Open(); err != nil {
return
}
return
}
func (c *Client) Stop() (err error) {
if c.sender != nil {
c.sender.Close()
}
if c.conn != nil {
_ = c.Close()
return c.conn.Close()
}
return nil
}
func (c *Client) MarshalJSON() ([]byte, error) {
info := &core.Info{
Type: "Command Backchannel PCMA",
Medias: c.medias,
Send: c.send,
}
if c.sender != nil {
info.Senders = []*core.Sender{c.sender}
}
return json.Marshal(info)
}
+29
View File
@@ -0,0 +1,29 @@
package execbc
import (
"bufio"
"io"
"os/exec"
"github.com/AlexxIT/go2rtc/pkg/core"
)
type pipeCloser struct {
io.Writer
io.Closer
cmd *exec.Cmd
}
func PipeCloser(cmd *exec.Cmd) (io.WriteCloser, error) {
stdin, err := cmd.StdinPipe()
if err != nil {
return nil, err
}
return pipeCloser{bufio.NewWriterSize(stdin, 640), stdin, cmd}, nil
}
func (p pipeCloser) Close() (err error) {
return core.Any(p.Closer.Close(), p.cmd.Process.Kill(), p.cmd.Wait())
}