iridium/neko-custom
Archived
2
0
Fork 0
Code Pull Requests Activity

xorg refactor.

Browse Source
This commit is contained in:
Miroslav Šedivý
2022-09-13 21:40:40 +02:00
parent 478984e944
commit 4c1c96b163
15 changed files with 467 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/internal/capture/manager.go
View File

@ -1,7 +1,6 @@
package capture
import (
"fmt"
"time"
"m1k1o/neko/internal/capture/gst"
@ -127,7 +126,7 @@ func (manager *CaptureManagerCtx) Streaming() bool {
func (manager *CaptureManagerCtx) createPipelines() {
// handle maximum fps
rate := int(manager.desktop.GetScreenSize().Rate)
rate := manager.desktop.GetScreenSize().Rate
if manager.config.MaxFPS != 0 && manager.config.MaxFPS < rate {
rate = manager.config.MaxFPS
}
@ -158,11 +157,7 @@ func (manager *CaptureManagerCtx) createPipelines() {
}
}
func (manager *CaptureManagerCtx) ChangeResolution(width int, height int, rate int) error {
if !xorg.ValidScreenSize(width, height, rate) {
return fmt.Errorf("unknown configuration")
}
func (manager *CaptureManagerCtx) ChangeResolution(width int, height int, rate int16) error {
manager.video.Stop()
manager.broadcast.Stop()

2
server/internal/capture/pipelines.go
View File

@ -52,7 +52,7 @@ func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineS
}
// CreateAppPipeline creates a GStreamer Pipeline
func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string, fps int, bitrate uint, hwenc string) (*gst.Pipeline, error) {
func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string, fps int16, bitrate uint, hwenc string) (*gst.Pipeline, error) {
pipelineStr := " ! appsink name=appsink"
// if using custom pipeline