gilles/go2rtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BIG core logic rewrite

Browse Source
This commit is contained in:
Alexey Khit
2023-03-17 06:48:02 +03:00
parent 2146ea470b
commit 12a7b96289
107 changed files with 3000 additions and 3024 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/ffmpeg/device/device_darwin.go
+10 -10
View File
@@ -2,7 +2,7 @@ package device
import (
"bytes"
"github.com/AlexxIT/go2rtc/pkg/streamer"
"github.com/AlexxIT/go2rtc/pkg/core"
"os/exec"
"strings"
)
@@ -11,15 +11,15 @@ import (
const deviceInputPrefix = "-f avfoundation"
func deviceInputSuffix(videoIdx, audioIdx int) string {
video := findMedia(streamer.KindVideo, videoIdx)
audio := findMedia(streamer.KindAudio, audioIdx)
video := findMedia(core.KindVideo, videoIdx)
audio := findMedia(core.KindAudio, audioIdx)
switch {
case video != nil && audio != nil:
return `"` + video.MID + `:` + audio.MID + `"`
return `"` + video.ID + `:` + audio.ID + `"`
case video != nil:
return `"` + video.MID + `"`
return `"` + video.ID + `"`
case audio != nil:
return `"` + audio.MID + `"`
return `"` + audio.ID + `"`
}
return ""
}
@@ -40,10 +40,10 @@ process:
for _, line := range lines {
switch {
case strings.HasSuffix(line, "video devices:"):
kind = streamer.KindVideo
kind = core.KindVideo
continue
case strings.HasSuffix(line, "audio devices:"):
kind = streamer.KindAudio
kind = core.KindAudio
continue
case strings.HasPrefix(line, "dummy"):
break process
@@ -56,6 +56,6 @@ process:
}
}
func loadMedia(kind, name string) *streamer.Media {
return &streamer.Media{Kind: kind, MID: name}
func loadMedia(kind, name string) *core.Media {
return &core.Media{Kind: kind, ID: name}
}
cmd/ffmpeg/device/device_linux.go
+7 -7
View File
@@ -2,7 +2,7 @@ package device
import (
"bytes"
"github.com/AlexxIT/go2rtc/pkg/streamer"
"github.com/AlexxIT/go2rtc/pkg/core"
"io/ioutil"
"os/exec"
"strings"
@@ -12,8 +12,8 @@ import (
const deviceInputPrefix = "-f v4l2"
func deviceInputSuffix(videoIdx, audioIdx int) string {
video := findMedia(streamer.KindVideo, videoIdx)
return video.MID
video := findMedia(core.KindVideo, videoIdx)
return video.ID
}
func loadMedias() {
@@ -23,8 +23,8 @@ func loadMedias() {
}
for _, file := range files {
log.Trace().Msg("[ffmpeg] " + file.Name())
if strings.HasPrefix(file.Name(), streamer.KindVideo) {
media := loadMedia(streamer.KindVideo, "/dev/"+file.Name())
if strings.HasPrefix(file.Name(), core.KindVideo) {
media := loadMedia(core.KindVideo, "/dev/"+file.Name())
if media != nil {
medias = append(medias, media)
}
@@ -32,7 +32,7 @@ func loadMedias() {
}
}
func loadMedia(kind, name string) *streamer.Media {
func loadMedia(kind, name string) *core.Media {
cmd := exec.Command(
Bin, "-hide_banner", "-f", "v4l2", "-list_formats", "all", "-i", name,
)
@@ -44,5 +44,5 @@ func loadMedia(kind, name string) *streamer.Media {
return nil
}
return &streamer.Media{Kind: kind, MID: name}
return &core.Media{Kind: kind, ID: name}
}
cmd/ffmpeg/device/device_windows.go
+10 -10
View File
@@ -2,7 +2,7 @@ package device
import (
"bytes"
"github.com/AlexxIT/go2rtc/pkg/streamer"
"github.com/AlexxIT/go2rtc/pkg/core"
"os/exec"
"strings"
)
@@ -11,15 +11,15 @@ import (
const deviceInputPrefix = "-f dshow"
func deviceInputSuffix(videoIdx, audioIdx int) string {
video := findMedia(streamer.KindVideo, videoIdx)
audio := findMedia(streamer.KindAudio, audioIdx)
video := findMedia(core.KindVideo, videoIdx)
audio := findMedia(core.KindAudio, audioIdx)
switch {
case video != nil && audio != nil:
return `video="` + video.MID + `":audio=` + audio.MID + `"`
return `video="` + video.ID + `":audio=` + audio.ID + `"`
case video != nil:
return `video="` + video.MID + `"`
return `video="` + video.ID + `"`
case audio != nil:
return `audio="` + audio.MID + `"`
return `audio="` + audio.ID + `"`
}
return ""
}
@@ -37,9 +37,9 @@ func loadMedias() {
for _, line := range lines {
var kind string
if strings.HasSuffix(line, "(video)") {
kind = streamer.KindVideo
kind = core.KindVideo
} else if strings.HasSuffix(line, "(audio)") {
kind = streamer.KindAudio
kind = core.KindAudio
} else {
continue
}
@@ -52,6 +52,6 @@ func loadMedias() {
}
}
func loadMedia(kind, name string) *streamer.Media {
return &streamer.Media{Kind: kind, MID: name}
func loadMedia(kind, name string) *core.Media {
return &core.Media{Kind: kind, ID: name}
}
cmd/ffmpeg/device/devices.go
+3 -3
View File
@@ -4,7 +4,7 @@ import (
"encoding/json"
"github.com/AlexxIT/go2rtc/cmd/api"
"github.com/AlexxIT/go2rtc/cmd/app"
"github.com/AlexxIT/go2rtc/pkg/streamer"
"github.com/AlexxIT/go2rtc/pkg/core"
"github.com/rs/zerolog"
"net/http"
"net/url"
@@ -52,9 +52,9 @@ func GetInput(src string) (string, error) {
var Bin string
var log zerolog.Logger
var medias []*streamer.Media
var medias []*core.Media
func findMedia(kind string, index int) *streamer.Media {
func findMedia(kind string, index int) *core.Media {
for _, media := range medias {
if media.Kind != kind {
continue
cmd/ffmpeg/ffmpeg.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"github.com/AlexxIT/go2rtc/cmd/ffmpeg/device"
"github.com/AlexxIT/go2rtc/cmd/rtsp"
"github.com/AlexxIT/go2rtc/cmd/streams"
"github.com/AlexxIT/go2rtc/pkg/streamer"
"github.com/AlexxIT/go2rtc/pkg/core"
"net/url"
"strconv"
"strings"
@@ -27,7 +27,7 @@ func Init() {
defaults["global"] += " -v error"
}
streams.HandleFunc("ffmpeg", func(url string) (streamer.Producer, error) {
streams.HandleFunc("ffmpeg", func(url string) (core.Producer, error) {
args := parseArgs(url[7:]) // remove `ffmpeg:`
if args == nil {
return nil, errors.New("can't generate ffmpeg command")