ustreamer: try to build mpp fork

Dockerfile

@@ -37,7 +37,8 @@ RUN apk add --no-cache \
     bash \
     cmake \
     git \
-    libdrm-dev ninja-build meson v4l-utils-dev wget build-base bsd-compat-headers musl-dev alsa-lib-dev libopusenc-dev
+    libdrm-dev ninja-build meson v4l-utils-dev wget build-base bsd-compat-headers musl-dev alsa-lib-dev libopusenc-dev \
+    libevent-dev libbsd-dev libjpeg-turbo-dev
 
 RUN  mkdir -p ~/dev && cd ~/dev && \
     #git clone -b jellyfin-mpp --depth=1 https://github.com/nyanmisaka/mpp.git rkmpp && \
@@ -74,8 +75,17 @@ RUN mkdir -p ~/dev && cd ~/dev && \
     && \
     make -j $(nproc) && make install
 
+ADD ./ustreamer /root/ustreamer
 
-FROM pikvm/ustreamer:latest as ustreamer
+RUN cd /root/ustreamer && \
+    sed -i '/#include <drm_fourcc.h>/a #include <fcntl.h>' src/ustreamer/s2drm.h && \
+    export WITH_PTHREAD_NP=0 && \
+    make && cp ustreamer /
+#RUN mkdir -p ~/dev && cd ~/dev && \
+#    git clone https://github.com/datrixs/datrix-ustreamer ustreamer && \
+#    sed -i '/#include <drm_fourcc.h>/a #include <fcntl.h>' ustreamer/src/ustreamer/s2drm.h && \
+#    export WITH_PTHREAD_NP=0 && \
+#    cd ustreamer && make && cp ustreamer /
 
 FROM alpine
 RUN apk add --no-cache portaudio alsa-utils \
@@ -83,10 +93,11 @@ RUN apk add --no-cache portaudio alsa-utils \
 
 COPY --from=frontend /static /app/static
 COPY --from=backend /app/bin/kvm /app/kvm
-COPY --from=ustreamer /ustreamer/ustreamer /app/ustreamer
+COPY --from=ffmpeg /ustreamer /app/ustreamer
 COPY --from=ffmpeg /usr/lib/librga.* /usr/lib
 COPY --from=ffmpeg /usr/lib/librockchip_mpp.* /usr/lib
 COPY --from=ffmpeg /usr/bin/ffmpeg /app/ffmpeg
+COPY --from=ffmpeg /ustreamer /app/ustreamer
 COPY ./edid.hex /edid.hex
 #COPY ./edid-audio.hex /edid.hex
 #COPY ./edid-test.hex /edid.hex

cmd/kvm/main.go

@@ -3,10 +3,9 @@ package main
 import (
 	"fmt"
 	"rkkvm/config"
-	"rkkvm/external/ffmpeg"
+	"rkkvm/http/hw/rtc"
-	"rkkvm/external/process"
+	"rkkvm/http/hw/stream"
 	"rkkvm/http/route"
-	"rkkvm/http/rtc"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -31,7 +30,21 @@ func main() {
 		log.Println("Failed to parse log level, use default level: info")
 	}
 
-	webrtc, err := rtc.InitListener(cfg.WebRtc.Host, cfg.WebRtc.VideoPort, cfg.WebRtc.AudioPort)
+	if cfg.Stream.Source == config.StreamSourceMjpeg {
+		ustreamer := stream.Init(cfg.UStreamer.Path, strings.Split(cfg.UStreamer.Args, " "))
+		ustreamer.Start()
+		//go ustreamer.Watch()
+	} else if cfg.Stream.Source == config.StreamSourceH264 {
+		ffmpeg := stream.InitFFmpeg(cfg.Video.Path, cfg.Video.FormatArgs())
+		ffmpeg.Start()
+
+		audio := stream.InitPipedCmd(config.Get().Audio)
+		audio.Start()
+	} else {
+		log.Fatalf("unsupported stream source type: %v", cfg.Stream.Source)
+	}
+
+	webrtc, err := rtc.InitListener(cfg.WebRtc.Host, cfg.WebRtc.Port, 5006)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -39,16 +52,6 @@ func main() {
 	go webrtc.VideoListenerRead()
 	go webrtc.AudioListenerRead()
 
-	if cfg.Stream.Source == config.StreamSourceMjpeg {
-		ustreamer := process.Init(cfg.UStreamer.Path, strings.Split(cfg.UStreamer.Args, " "))
-		ustreamer.Start()
-		//go ustreamer.Watch()
-	} else if cfg.Stream.Source == config.StreamSourceH264 {
-		ffmpeg.InitFFmpeg()
-	} else {
-		log.Fatalf("unsupported stream source type: %v", cfg.Stream.Source)
-	}
-
 	r := gin.Default()
 	r.Use(gin.Recovery())
 	route.Api(r)

config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"fmt"
 	"os"
+	"strings"
 
 	"gopkg.in/yaml.v3"
 )
@@ -14,6 +15,7 @@ type Config struct {
 	Port       int       `yaml:"port"`
 	UStreamer  UStreamer `yaml:"ustreamer"`
 	Video      FFmpeg    `yaml:"video"`
+	Audio      []string  `yaml:"audio"`
 	WebRtc     WebRtc    `yaml:"webrtc"`
 	Stream     Stream    `yaml:"stream"`
 
@@ -22,9 +24,8 @@ type Config struct {
 }
 
 type WebRtc struct {
-	Host      string `yaml:"host"`
+	Host string `yaml:"host"`
-	VideoPort int    `yaml:"video_port"`
+	Port int    `yaml:"port"`
-	AudioPort int    `yaml:"audio_port"`
 }
 
 type ExtProcess struct {
@@ -34,7 +35,6 @@ type ExtProcess struct {
 
 type Stream struct {
 	Source string `yaml:"source"` // mjpeg or h264
-
 }
 
 const (
@@ -43,24 +43,17 @@ const (
 	StreamSourceHevc  = "hevc"
 )
 
-type StreamInput string
-
-const (
-	StreamInputVideo      = "v"
-	StreamInputVideoAudio = "va"
-)
-
 type FFmpeg struct {
-	Commands map[StreamInput]string `yaml:"commands"`
+	ExtProcess
-	FPS      int                    `yaml:"fps"`
+	FPS     int    `yaml:"fps"`
-	Bitrate  int                    `yaml:"bitrate"`
+	Bitrate int    `yaml:"bitrate"`
-	Height   int                    `yaml:"height"`
+	Height  int    `yaml:"height"`
-	GOP      int                    `yaml:"gop"`
+	GOP     int    `yaml:"gop"`
-	Codec    string                 `yaml:"codec"`
+	Codec   string `yaml:"codec"`
 }
 
-func (f FFmpeg) FormatCmd(cmd string) string {
+func (f FFmpeg) FormatArgs() []string {
-	return fmt.Sprintf(cmd, f.Height, f.Codec, f.Bitrate*1000, f.FPS, f.GOP)
+	return strings.Split(fmt.Sprintf(f.Args, f.Height, f.Codec, f.Bitrate*1000, f.FPS, f.GOP), " ")
 }
 
 type UStreamer struct {
@@ -75,6 +68,8 @@ func Get() Config {
 	return c
 }
 
+// arecord -D hw:0,0 -f cd -r 44100 -c 2 | /app/ffmpeg -re -init_hw_device rkmpp=hw -filter_hw_device hw -f wav -i pipe:0 -f v4l2 -c:a aac -b:a 128k -ar 44100 -ac 2 -f rtp rtp://127.0.0.1:5006?pkt_size=1200 -i /dev/video0 -vf hwupload,scale_rkrga=h=720:force_original_aspect_ratio=1 -c:v h264_rkmpp -flags +low_delay -b:v 6000000 -framerate 60 -g 10 -f rtp rtp://127.0.0.1:5004?pkt_size=1200
+
 func Init() {
 	c = Config{
 		LogLevel: "debug",
@@ -89,26 +84,24 @@ func Init() {
 			},
 		},
 		Video: FFmpeg{
-			Commands: map[StreamInput]string{
+			ExtProcess: ExtProcess{
-				StreamInputVideoAudio: "/usr/bin/arecord -D hw:0,0 -f dat -r 48000 -c 2 --buffer-size=150 | /app/ffmpeg -re -init_hw_device rkmpp=hw -filter_hw_device hw" +
+				Path: "/app/ffmpeg",
-					" -f wav -i pipe:0 -map 0:a -c:a libopus -b:a 48000 -sample_fmt s16 -ssrc 1 -payload_type 111 -f rtp -max_delay 0 -application lowdelay" +
+				Args: "-hide_banner -loglevel error -re -init_hw_device rkmpp=hw -filter_hw_device hw -i /dev/video0 -vf hwupload,scale_rkrga=h=%d:force_original_aspect_ratio=1 -c:v %s_rkmpp -flags +low_delay -b:v %d -framerate %d -g %d -f rtp rtp://127.0.0.1:5004?pkt_size=1200",
-					" -f rtp rtp://127.0.0.1:5006?pkt_size=1200" +
+				//Args: "-re -i /dev/video0 -c:v h264_rkmpp -b:v %d -framerate %d -bsf:v h264_mp4toannexb -g 10 -f rtp rtp://127.0.0.1:5004?pkt_size=1200",
-					" -i /dev/video0 -map 1:v -vf hwupload,scale_rkrga=h=%d:force_original_aspect_ratio=1 -c:v %s_rkmpp -flags +low_delay -b:v %d -framerate %d -g %d" +
-					" -f rtp rtp://127.0.0.1:5004?pkt_size=1200",
-				StreamInputVideo: "/app/ffmpeg -re -hide_banner -loglevel error -init_hw_device rkmpp=hw -filter_hw_device hw" +
-					" -i /dev/video0 -vf hwupload,scale_rkrga=h=%d:force_original_aspect_ratio=1 -c:v %s_rkmpp -flags +low_delay -b:v %d -framerate %d -g %d" +
-					" -f rtp rtp://127.0.0.1:5004?pkt_size=1200",
 			},
 			FPS:     60,
 			Bitrate: 6000,
 			Height:  720,
 			GOP:     5,
-			Codec:   StreamSourceH264,
+			Codec:   "h264",
+		},
+		Audio: []string{
+			"/usr/bin/arecord -D hw:0,0 -f dat -r 48000 -c 2 --buffer-size=60",
+			"/app/ffmpeg -hide_banner -loglevel error -re -f wav -i pipe:0 -c:a libopus -b:a 48000 -sample_fmt s16 -ssrc 1 -payload_type 111 -f rtp -max_delay 0 -application lowdelay -f rtp rtp://127.0.0.1:5006?pkt_size=1200",
 		},
 		WebRtc: WebRtc{
-			Host:      "127.0.0.1",
+			Host: "127.0.0.1",
-			VideoPort: 5004,
+			Port: 5004,
-			AudioPort: 5006,
 		},
 		Stream: Stream{
 			Source: StreamSourceH264,

external/process/pipedprocess.go

@@ -1,136 +0,0 @@
-package process
-
-import (
-	"os"
-	"os/exec"
-	"strings"
-	"sync"
-	"syscall"
-
-	log "github.com/sirupsen/logrus"
-)
-
-// PipedCmd struct manages a sequence of piped commands.
-type PipedCmd struct {
-	cmds    []*exec.Cmd
-	mu      sync.Mutex
-	running bool
-}
-
-// InitPipedCmd initializes a PipedCmd instance with a sequence of commands.
-func InitPipedCmd(cmd string) *PipedCmd {
-	pipedCmd := &PipedCmd{}
-	pipedCmd.ChangeCmd(cmd)
-	return pipedCmd
-}
-
-func (p *PipedCmd) ChangeCmd(cmd string) {
-	cmds := strings.Split(cmd, "|")
-	for i, c := range cmds {
-		cmds[i] = strings.TrimSpace(c)
-	}
-
-	log.Debugf("Cmds: %+v", cmds)
-
-	pipedCmds := make([]*exec.Cmd, len(cmds))
-
-	// Initialize each command in the sequence
-	for i, cmd := range cmds {
-		if len(cmd) == 0 {
-			continue
-		}
-		cmdArgs := strings.Split(cmd, " ")
-		pipedCmds[i] = exec.Command(cmdArgs[0], cmdArgs[1:]...)
-	}
-
-	p.cmds = pipedCmds
-}
-
-// Start begins execution of all commands in the piped sequence.
-func (p *PipedCmd) Start() error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	if p.running {
-		log.Debugf("Process is already running.")
-		return nil
-	}
-
-	// Pipe each command's output to the next command's input
-	for i := 0; i < len(p.cmds)-1; i++ {
-		stdout, err := p.cmds[i].StdoutPipe()
-		if err != nil {
-			return err
-		}
-		p.cmds[i+1].Stdin = stdout
-	}
-	// pipe stdout and stderr of the last command into os
-	p.cmds[len(p.cmds)-1].Stdout = os.Stdout
-	p.cmds[len(p.cmds)-1].Stderr = os.Stderr
-
-	// Start each command in the sequence
-	for _, cmd := range p.cmds {
-		if err := cmd.Start(); err != nil {
-			p.terminateAll()
-			return err
-		} else {
-			log.Debugf("Started process: (%d) %v", cmd.Process.Pid, cmd.Args)
-		}
-	}
-
-	p.running = true
-
-	// Monitor commands in a goroutine to handle failures
-	go p.monitorCommands()
-
-	return nil
-}
-
-// monitorCommands waits for each command to finish and checks for errors.
-func (p *PipedCmd) monitorCommands() {
-	var wg sync.WaitGroup
-	wg.Add(len(p.cmds))
-
-	for _, cmd := range p.cmds {
-		go func(cmd *exec.Cmd) {
-			defer wg.Done()
-			err := cmd.Wait()
-			if err != nil && err.Error() != "signal: terminated" {
-				log.Debugf("Command failed: %v", err)
-				p.terminateAll() // Terminate all if any command fails
-			}
-		}(cmd)
-	}
-
-	// Wait for all commands to complete or terminate
-	wg.Wait()
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	p.running = false
-}
-
-// terminateAll sends a termination signal to all running commands.
-func (p *PipedCmd) terminateAll() {
-	for _, cmd := range p.cmds {
-		if cmd.Process != nil {
-			log.Debugf("Sending SIGTERM to: (%d) %v", cmd.Process.Pid, cmd.Args)
-			_ = cmd.Process.Signal(syscall.SIGTERM) // Send SIGTERM to allow graceful termination
-		}
-	}
-
-	p.running = false
-}
-
-// Stop manually stops all commands in the sequence.
-func (p *PipedCmd) Stop() {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	if !p.running {
-		log.Debug("Process is not running.")
-		return
-	}
-
-	log.Debug("Stopping process...")
-	p.terminateAll()
-}

go.mod

@@ -10,7 +10,6 @@ require (
 	github.com/gorilla/websocket v1.5.3
 	github.com/pion/webrtc/v4 v4.0.1
 	github.com/sirupsen/logrus v1.9.3
-	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -55,4 +54,5 @@ require (
 	golang.org/x/sys v0.26.0 // indirect
 	golang.org/x/text v0.19.0 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

http/hw/rtc/webrtc.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"rkkvm/external/ffmpeg"
 	"sync"
 
 	"github.com/google/uuid"
@@ -38,10 +37,6 @@ func (r *RTC) AddPeer(p *webrtc.PeerConnection, offer webrtc.SessionDescription)
 	peerID := uuid.New().String()
 	r.m.Lock()
 	r.peers[peerID] = p
-	if len(r.peers) == 1 {
-		ffmpeg.GetFFmpeg().Start()
-		log.Info("FFmpeg process started")
-	}
 	r.m.Unlock()
 
 	p.OnConnectionStateChange(func(connState webrtc.PeerConnectionState) {
@@ -49,10 +44,6 @@ func (r *RTC) AddPeer(p *webrtc.PeerConnection, offer webrtc.SessionDescription)
 			r.m.Lock()
 			defer r.m.Unlock()
 			delete(r.peers, peerID)
-			if len(r.peers) == 0 {
-				ffmpeg.GetFFmpeg().Stop()
-				log.Info("No clients anymore, stop ffmpeg process")
-			}
 			p.Close()
 
 			peers := make([]string, 0, len(r.peers))

http/hw/stream/audio.go

@@ -0,0 +1,47 @@
+package stream
+
+import (
+	"io"
+	"net/http"
+	"os/exec"
+
+	"github.com/gin-gonic/gin"
+	log "github.com/sirupsen/logrus"
+)
+
+type Audio struct {
+}
+
+func AudioHandler(c *gin.Context) {
+	cmd := exec.Command("ffmpeg",
+		"-f", "alsa",
+		"-i", "hw:0,0",
+		"-acodec", "aac",
+		"-f", "mp4", "-")
+
+	//c := "arecord -D hw:0,0 -f cd -r 44100 -c 2 | /app/ffmpeg -re -f wav -i pipe:0 -c:a aac -b:a 128k -ar 44100 -ac 2 -f rtp rtp://127.0.0.1:5006?pkt_size=1200"
+	//cmd := exec.Command("sh", "-c", c)
+	// ffmpeg -f alsa -i hw:0,0 -acodec aac -f mp4 -
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		c.String(http.StatusInternalServerError, "Failed to capture audio: %v", err)
+		log.Errorf("Failed to capture audio: %v", err)
+		return
+	}
+	if err := cmd.Start(); err != nil {
+		c.String(http.StatusInternalServerError, "Failed to start ffmpeg: %v", err)
+		log.Errorf("Failed to start ffmpeg: %v", err)
+		return
+	}
+	defer cmd.Wait()
+
+	//c.Header("Content-Type", "audio/aac")
+	c.Header("Content-Type", "audio/wav")
+	c.Header("Transfer-Encoding", "chunked")
+
+	if _, err := io.Copy(c.Writer, stdout); err != nil {
+		c.String(http.StatusInternalServerError, "Failed to stream audio: %v", err)
+		log.Errorf("Failed to stream audio: %v", err)
+		return
+	}
+}

http/hw/stream/extprocess.go

@@ -1,4 +1,4 @@
-package process
+package stream
 
 import (
 	"io"
@@ -17,6 +17,7 @@ type ExtProcess struct {
 	running  bool
 	stopChan chan struct{}
 	finished chan struct{}
+	state    State
 
 	stdin io.WriteCloser
 }

http/hw/stream/ffmpeg.go

@@ -1,8 +1,7 @@
-package ffmpeg
+package stream
 
 import (
 	"rkkvm/config"
-	"rkkvm/external/process"
 )
 
 //h264
@@ -24,12 +23,6 @@ arecord -D hw:0,0 -f cd -r 44100 -c 2 | /app/ffmpeg -re -init_hw_device rkmpp=hw
 
 
 arecord -D hw:0,0 -f cd -r 44100 -c 2 | /app/ffmpeg -re -f wav -i pipe:0 -c:a aac -b:a 128k -ar 44100 -ac 2 -f rtp rtp://127.0.0.1:5006?pkt_size=1200
-
-arecord -D hw:0,0 -f dat -r 48000 -c 2 --buffer-size=60 | /app/ffmpeg -re -init_hw_device rkmpp=hw -filter_hw_device hw \
--f wav -i pipe:0 -map 0:a -c:a libopus -b:a 48000 -sample_fmt s16 -ssrc 1 -payload_type 111 -f rtp -max_delay 0 -application lowdelay \
--f rtp rtp://127.0.0.1:5006?pkt_size=1200 \
--i /dev/video0 -map 1:v -vf hwupload,scale_rkrga=h=720:force_original_aspect_ratio=1 -c:v h264_rkmpp -flags +low_delay -b:v 6000000 -framerate 60 -g 10 \
--f rtp rtp://127.0.0.1:5004?pkt_size=1200
 */
 
 // https://jsfiddle.net/z7ms3u5r/
@@ -37,57 +30,50 @@ arecord -D hw:0,0 -f dat -r 48000 -c 2 --buffer-size=60 | /app/ffmpeg -re -init_
 var ffmpeg *FFmpeg
 
 type FFmpeg struct {
-	*process.PipedCmd
+	*ExtProcess
 	config.FFmpeg
 }
 
-func (f *FFmpeg) getCmd() string {
-	return f.Commands[config.StreamInputVideoAudio]
-}
-
 func (f *FFmpeg) SetBitrate(b int) {
 	f.Bitrate = b
 	if f.Bitrate < 0 {
 		f.Bitrate = 6000
 	}
+
+	f.ChangeArgs(f.FormatArgs())
 }
 
 func (f *FFmpeg) SetFPS(fps int) {
 	f.FPS = fps
 	if f.FPS < 0 {
 		f.FPS = 30
-	} else if f.FPS > 60 {
-		f.FPS = 60
 	}
+
+	f.ChangeArgs(f.FormatArgs())
 }
 
 func (f *FFmpeg) SetResolution(height int) {
 	f.Height = height
 	if f.Height <= 0 {
 		f.Height = 1080
-	} else if f.Height > 2060 {
-		f.Height = 2060
 	}
+
+	f.ChangeArgs(f.FormatArgs())
 }
 
 func (f *FFmpeg) SetGOP(gop int) {
 	f.GOP = gop
 	if f.GOP < 0 {
-		f.GOP = 2
+		f.GOP = 0
 	}
+
+	f.ChangeArgs(f.FormatArgs())
 }
 
-func (f *FFmpeg) ApplyOptions() {
+func InitFFmpeg(path string, args []string) *FFmpeg {
-	f.ChangeCmd(f.FormatCmd(f.getCmd()))
-}
-
-func InitFFmpeg() *FFmpeg {
-	cfg := config.Get().Video
-	cmd := cfg.Commands[config.StreamInputVideoAudio]
-
 	ffmpeg = &FFmpeg{
-		PipedCmd: process.InitPipedCmd(cfg.FormatCmd(cmd)),
+		ExtProcess: Init(path, args),
-		FFmpeg:   cfg,
+		FFmpeg:     config.Get().Video,
 	}
 	return ffmpeg
 }

http/hw/stream/pipedprocess.go

@@ -0,0 +1,269 @@
+package stream
+
+import (
+	"log"
+	"os/exec"
+	"strings"
+	"sync"
+	"syscall"
+)
+
+var pipedCmd *PipedCmd
+
+// PipedCmd struct manages a sequence of piped commands.
+type PipedCmd struct {
+	cmds     []*exec.Cmd
+	mu       sync.Mutex
+	running  bool
+	finished chan struct{}
+}
+
+// InitPipedCmd initializes a PipedCmd instance with a sequence of commands.
+func InitPipedCmd(cmds []string) *PipedCmd {
+	pipedCmds := make([]*exec.Cmd, len(cmds))
+
+	// Initialize each command in the sequence
+	for i, cmd := range cmds {
+		if len(cmd) == 0 {
+			continue
+		}
+		cmdArgs := strings.Split(cmd, " ")
+		pipedCmds[i] = exec.Command(cmdArgs[0], cmdArgs[1:]...)
+	}
+
+	pipedCmd = &PipedCmd{
+		cmds:     pipedCmds,
+		finished: make(chan struct{}),
+	}
+	return pipedCmd
+}
+
+// Start begins execution of all commands in the piped sequence.
+func (p *PipedCmd) Start() error {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	if p.running {
+		log.Println("Process is already running.")
+		return nil
+	}
+
+	// Pipe each command's output to the next command's input
+	for i := 0; i < len(p.cmds)-1; i++ {
+		stdout, err := p.cmds[i].StdoutPipe()
+		if err != nil {
+			return err
+		}
+		p.cmds[i+1].Stdin = stdout
+	}
+
+	// Start each command in the sequence
+	for _, cmd := range p.cmds {
+		if err := cmd.Start(); err != nil {
+			p.terminateAll() // Clean up if any command fails to start
+			return err
+		}
+	}
+
+	p.running = true
+
+	// Monitor commands in a goroutine to handle failures
+	go p.monitorCommands()
+
+	return nil
+}
+
+// monitorCommands waits for each command to finish and checks for errors.
+func (p *PipedCmd) monitorCommands() {
+	var wg sync.WaitGroup
+	wg.Add(len(p.cmds))
+
+	for _, cmd := range p.cmds {
+		go func(cmd *exec.Cmd) {
+			defer wg.Done()
+			err := cmd.Wait()
+			if err != nil {
+				log.Printf("Command failed: %v", err)
+				p.terminateAll() // Terminate all if any command fails
+			}
+		}(cmd)
+	}
+
+	// Wait for all commands to complete or terminate
+	wg.Wait()
+	p.mu.Lock()
+	p.running = false
+	close(p.finished)
+	p.mu.Unlock()
+}
+
+// terminateAll sends a termination signal to all running commands.
+func (p *PipedCmd) terminateAll() {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	for _, cmd := range p.cmds {
+		if cmd.Process != nil {
+			_ = cmd.Process.Signal(syscall.SIGTERM) // Send SIGTERM to allow graceful termination
+		}
+	}
+}
+
+// Stop manually stops all commands in the sequence.
+func (p *PipedCmd) Stop() {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	if !p.running {
+		log.Println("Process is not running.")
+		return
+	}
+
+	log.Println("Stopping process...")
+	p.terminateAll()
+	p.running = false
+	close(p.finished)
+}
+
+/*
+import (
+	"os"
+	"os/exec"
+	"strings"
+	"sync"
+
+	log "github.com/sirupsen/logrus"
+)
+
+type PipedCmd struct {
+	cmds     []string
+	cmdsExec []*exec.Cmd
+	mu       sync.Mutex
+	running  bool
+	stopChan chan struct{}
+	finished chan struct{}
+}
+
+// Init initializes the PipedCmd with a slice of command strings
+func InitPipedCmd(cmds []string) *PipedCmd {
+	return &PipedCmd{
+		cmds: cmds,
+	}
+}
+
+// Start initializes and starts the piped commands
+func (p *PipedCmd) Start() {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	if p.running {
+		log.Debug("process is already running.")
+		return
+	}
+
+	p.stopChan = make(chan struct{})
+	p.finished = make(chan struct{})
+
+	log.Debugf("Starting piped commands: <%s>", strings.Join(p.cmds, " | "))
+
+	// Create commands and set up pipes
+	for i, cmdStr := range p.cmds {
+		// Split command string into command and arguments
+		cmdParts := strings.Fields(cmdStr)
+		if len(cmdParts) == 0 {
+			log.Errorf("Empty command string at index %d", i)
+			continue
+		}
+
+		cmd := exec.Command(cmdParts[0], cmdParts[1:]...)
+
+		// Set up pipes for stdin/stdout
+		if i > 0 {
+			stdin, err := p.cmdsExec[i-1].StdoutPipe()
+			if err != nil {
+				log.Errorf("Couldn't set up stdout pipe for command %s: %v", p.cmdsExec[i-1].Path, err)
+				return
+			}
+			cmd.Stdin = stdin
+		}
+
+		cmd.Stderr = os.Stderr // Log stderr to standard error output
+
+		p.cmdsExec = append(p.cmdsExec, cmd)
+	}
+
+	// Start the first command
+	if err := p.cmdsExec[0].Start(); err != nil {
+		log.Errorf("Failed to start command: %v", err)
+		return
+	}
+	p.running = true
+
+	// Start remaining commands
+	for _, cmd := range p.cmdsExec[1:] {
+		if err := cmd.Start(); err != nil {
+			log.Errorf("Failed to start command: %v", err)
+			return
+		}
+	}
+
+	go func() {
+		// Wait for the last command to finish
+		err := p.cmdsExec[len(p.cmdsExec)-1].Wait()
+		p.running = false
+		log.Errorf("process exited with error: %v", err)
+
+		// Signal that the process has finished
+		close(p.finished)
+		close(p.stopChan)
+	}()
+}
+
+// Stop terminates the piped commands gracefully
+func (p *PipedCmd) Stop() {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	if !p.running {
+		log.Debug("process is not running.")
+		return
+	}
+
+	log.Warn("Stopping process...")
+
+	for _, cmd := range p.cmdsExec {
+		if err := cmd.Process.Kill(); err != nil {
+			log.Errorf("Failed to kill process: %v", err)
+		}
+	}
+
+	select {
+	case <-p.finished:
+		log.Info("stopped as expected")
+	case <-p.stopChan:
+		log.Info("was killed")
+	}
+
+	p.running = false
+}
+
+// ChangeArgs updates the command arguments
+func (p *PipedCmd) ChangeArgs(newCmds []string) {
+	p.mu.Lock()
+	defer p.mu.Unlock()
+
+	p.cmds = newCmds
+	log.Printf("Updated process commands: %v", p.cmds)
+}
+
+// Watch monitors the process and restarts if it stops unexpectedly
+func (p *PipedCmd) Watch() {
+	for {
+		select {
+		case <-p.stopChan:
+			log.Errorf("process stopped unexpectedly. Restarting...")
+			p.Start()
+		}
+	}
+}
+*/

http/hw/stream/ustreamer.go

@@ -2,7 +2,6 @@ package stream
 
 import (
 	"rkkvm/config"
-	"rkkvm/external/process"
 	"time"
 
 	log "github.com/sirupsen/logrus"
@@ -11,14 +10,13 @@ import (
 var ustreamer *UStreamer
 
 type UStreamer struct {
-	*process.ExtProcess
+	*ExtProcess
 	config.UStreamer
-	state State
 }
 
 func InitUStreamer(path string, args []string) *UStreamer {
 	ustreamer = &UStreamer{
-		ExtProcess: process.Init(path, args),
+		ExtProcess: Init(path, args),
 		UStreamer:  config.Get().UStreamer,
 	}
 	return ustreamer

http/hw/stream/video.go

@@ -6,9 +6,8 @@ import (
 	"io"
 	"net/http"
 	"rkkvm/config"
-	"rkkvm/external/ffmpeg"
+	"rkkvm/http/hw/rtc"
 	"rkkvm/http/reqrsp"
-	"rkkvm/http/rtc"
 	"strconv"
 
 	"github.com/gin-gonic/gin"
@@ -173,7 +172,7 @@ func WebRTCSettings(c *gin.Context) {
 		return
 	}
 
-	ffmpeg := ffmpeg.GetFFmpeg()
+	ffmpeg := GetFFmpeg()
 
 	if len(bitrateStr) > 0 {
 		bitrate, err := strconv.Atoi(bitrateStr)

http/route/api.go

@@ -6,11 +6,11 @@ import (
 	"os/exec"
 	"path/filepath"
 	"rkkvm/config"
-	"rkkvm/hid"
+	"rkkvm/http/hw/hid"
+	"rkkvm/http/hw/stream"
 	"rkkvm/http/middleware"
 	"rkkvm/http/reqrsp"
 	"rkkvm/http/ws"
-	"rkkvm/stream"
 	"strings"
 
 	"github.com/gin-gonic/gin"
@@ -21,6 +21,7 @@ func Api(e *gin.Engine) {
 	api := e.Group("/api").Use(middleware.CheckToken())
 
 	api.GET("/stream/mjpeg", stream.MjpegHandler)
+	api.GET("/stream/audio", stream.AudioHandler)
 	api.GET("/ws", ws.ConnHandler)
 
 	api.POST("/stream/webrtc", stream.WebRTCPeerConnect)

http/route/nanokvm_ui.go

@@ -2,10 +2,9 @@ package route
 
 import (
 	"net/http"
-	"rkkvm/external/ffmpeg"
+	"rkkvm/http/hw/stream"
 	"rkkvm/http/middleware"
 	"rkkvm/http/reqrsp"
-	"time"
 
 	"github.com/gin-gonic/gin"
 	log "github.com/sirupsen/logrus"
@@ -56,7 +55,7 @@ func SetScreen(c *gin.Context) {
 		return
 	}
 
-	ffmpeg := ffmpeg.GetFFmpeg()
+	ffmpeg := stream.GetFFmpeg()
 	switch req.Type {
 	case "fps":
 		ffmpeg.SetFPS(req.Value)
@@ -71,12 +70,7 @@ func SetScreen(c *gin.Context) {
 		})
 		return
 	}
-
-	log.Debug("Stopping ffmpeg SetScreen")
 	ffmpeg.Stop()
-	time.Sleep(100 * time.Millisecond)
-	ffmpeg.ApplyOptions()
-	log.Debug("Starting ffmpeg SetScreen")
 	ffmpeg.Start()
 
 	log.Debugf("update screen: %+v", req)

http/ws/ws.go

@@ -5,7 +5,7 @@ import (
 	"net"
 	"net/http"
 	"rkkvm/config"
-	"rkkvm/hid"
+	"rkkvm/http/hw/hid"
 
 	"github.com/gin-gonic/gin"
 	"github.com/gorilla/websocket"