diff --git a/internal/config/capture.go b/internal/config/capture.go index e73701d9..6ff91461 100644 --- a/internal/config/capture.go +++ b/internal/config/capture.go @@ -140,15 +140,15 @@ func (s *Capture) Set() { // default video if len(s.VideoPipelines) == 0 { log.Warn().Msgf("no video pipelines specified, using defaults") - + s.VideoCodec = codec.VP8() s.VideoPipelines = map[string]types.VideoConfig{ "main": types.VideoConfig{ - GstPipeline: "ximagesrc display-name={display} show-pointer=false use-damage=false "+ - "! video/x-raw "+ - "! videoconvert "+ - "! queue "+ - "! vp8enc end-usage=cbr cpu-used=4 threads=4 deadline=1 keyframe-max-dist=25 "+ + GstPipeline: "ximagesrc display-name={display} show-pointer=false use-damage=false " + + "! video/x-raw " + + "! videoconvert " + + "! queue " + + "! vp8enc end-usage=cbr cpu-used=4 threads=4 deadline=1 keyframe-max-dist=25 " + "! appsink name=appsink", }, } diff --git a/internal/types/capture.go b/internal/types/capture.go index ce095a33..f8ba68be 100644 --- a/internal/types/capture.go +++ b/internal/types/capture.go @@ -1,13 +1,13 @@ package types import ( - "math" - "strings" "context" "fmt" + "math" + "strings" - "github.com/pion/webrtc/v3/pkg/media" "github.com/PaesslerAG/gval" + "github.com/pion/webrtc/v3/pkg/media" "demodesk/neko/internal/types/codec" ) @@ -55,7 +55,7 @@ type VideoConfig struct { Height string `mapstructure:"height"` // expression Fps string `mapstructure:"fps"` // expression GstPrefix string `mapstructure:"gst_prefix"` // pipeline prefix, starts with ! - GstEncoder string `mapstructure:"gst_encoder"` + GstEncoder string `mapstructure:"gst_encoder"` // gst encoder name GstParams map[string]string `mapstructure:"gst_params"` // map of expressions GstSuffix string `mapstructure:"gst_suffix"` // pipeline suffix, starts with ! GstPipeline string `mapstructure:"gst_pipeline"` // whole pipeline as a string @@ -142,5 +142,5 @@ func (config *VideoConfig) GetPipeline(screen ScreenSize) (string, error) { config.GstPrefix, encPipeline, config.GstSuffix, - }[:]," "), nil + }[:], " "), nil } diff --git a/internal/types/session.go b/internal/types/session.go index 65d120a4..cb11e82b 100644 --- a/internal/types/session.go +++ b/internal/types/session.go @@ -16,7 +16,7 @@ type Session interface { // websocket SetWebSocketPeer(websocketPeer WebSocketPeer) SetWebSocketConnected(websocketPeer WebSocketPeer, connected bool) - GetWebSocketPeer() WebSocketPeer + GetWebSocketPeer() WebSocketPeer Send(v interface{}) error // webrtc diff --git a/internal/websocket/peer.go b/internal/websocket/peer.go index 14365564..6bf1c344 100644 --- a/internal/websocket/peer.go +++ b/internal/websocket/peer.go @@ -6,10 +6,10 @@ import ( "github.com/gorilla/websocket" - "demodesk/neko/internal/utils" "demodesk/neko/internal/types" "demodesk/neko/internal/types/event" "demodesk/neko/internal/types/message" + "demodesk/neko/internal/utils" ) type WebSocketPeerCtx struct {