Skip to content

Commit

Permalink
Merge pull request #859 from 'reifl/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexxIT committed Apr 29, 2024
2 parents 732fe47 + 249ae49 commit 7a0646f
Show file tree
Hide file tree
Showing 5 changed files with 165 additions and 0 deletions.
21 changes: 21 additions & 0 deletions internal/execbc/init.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package execbc

import (
"github.com/AlexxIT/go2rtc/internal/streams"
"github.com/AlexxIT/go2rtc/pkg/core"
"github.com/AlexxIT/go2rtc/pkg/execbc"
"github.com/AlexxIT/go2rtc/pkg/shell"
)

func Init() {
streams.HandleFunc("execbc", handle)
}

func handle(url string) (core.Producer, error) {
args := shell.QuoteSplit(url[7:])
con, err := execbc.NewClient(args)
if err != nil {
return nil, err
}
return con, nil
}
2 changes: 2 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/AlexxIT/go2rtc/internal/dvrip"
"github.com/AlexxIT/go2rtc/internal/echo"
"github.com/AlexxIT/go2rtc/internal/exec"
"github.com/AlexxIT/go2rtc/internal/execbc"
"github.com/AlexxIT/go2rtc/internal/expr"
"github.com/AlexxIT/go2rtc/internal/ffmpeg"
"github.com/AlexxIT/go2rtc/internal/gopro"
Expand Down Expand Up @@ -80,6 +81,7 @@ func main() {
bubble.Init() // bubble source
expr.Init() // expr source
gopro.Init() // gopro source
execbc.Init() // Local Backchannel

// 6. Helper modules

Expand Down
53 changes: 53 additions & 0 deletions pkg/execbc/client.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
package execbc

import (
"io"
"net"
"os/exec"

"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
}

func NewClient(commandArgs []string) (*Client, error) {
c := &Client{commandArgs: commandArgs}
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 nil, error
}
c.pipeCloser = pipeCloser
c.cmd = &cmd
return c, nil
}

func (c Client) Open() (err error) {
c.cmd.Run()
return
}

func (c Client) Close() (err error) {
return c.pipeCloser.Close()
}
62 changes: 62 additions & 0 deletions pkg/execbc/consumer.go
Original file line number Diff line number Diff line change
@@ -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)
}
27 changes: 27 additions & 0 deletions pkg/execbc/pipe.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package execbc

import (
"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{stdin, stdin, cmd}, nil
}

func (p pipeCloser) Close() (err error) {
return core.Any(p.Closer.Close(), p.cmd.Process.Kill(), p.cmd.Wait())
}

0 comments on commit 7a0646f

Please sign in to comment.