From 405ef7b9ddb57b245431bd14932af4c2ea29ce67 Mon Sep 17 00:00:00 2001
From: Marcel Battista <m0battista@gmail.com>
Date: Sun, 14 Feb 2021 19:13:52 +0000
Subject: [PATCH] bitrate as integer

---
 server/internal/gst/gst.go             | 11 ++++++-----
 server/internal/remote/manager.go      |  2 +-
 server/internal/types/config/remote.go |  6 +++---
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/server/internal/gst/gst.go b/server/internal/gst/gst.go
index 2281d001..e1eea2fe 100644
--- a/server/internal/gst/gst.go
+++ b/server/internal/gst/gst.go
@@ -9,6 +9,7 @@ package gst
 import "C"
 import (
 	"fmt"
+	"strconv"
 	"sync"
 	"time"
 	"unsafe"
@@ -79,7 +80,7 @@ func CreateRTMPPipeline(pipelineDevice string, pipelineDisplay string, pipelineS
 }
 
 // CreateAppPipeline creates a GStreamer Pipeline
-func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string, bitrate string) (*Pipeline, error) {
+func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc string, bitrate int) (*Pipeline, error) {
 	pipelineStr := " ! appsink name=appsink"
 
 	var clockRate float32
@@ -131,8 +132,8 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri
 		} else {
 			var h264Str string
 			 h264Str = "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream"
-			if bitrate != "" {
-				h264Str = "openh264enc multi-thread=4 complexity=high bitrate=" + bitrate + "000 max-bitrate=" + bitrate + "999 ! video/x-h264,stream-format=byte-stream"
+			if bitrate > 0 {
+				h264Str = "openh264enc multi-thread=4 complexity=high bitrate=" + strconv.Itoa(bitrate) + "000 max-bitrate=" + strconv.Itoa(bitrate) + "999 ! video/x-h264,stream-format=byte-stream"
 			}
 
 			// https://gstreamer.freedesktop.org/documentation/x264/index.html?gi-language=c
@@ -141,8 +142,8 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri
 			if err := CheckPlugins([]string{"openh264"}); err != nil {
 
 				h264Str = "video/x-raw,format=I420 ! x264enc threads=4 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream"
-				if bitrate != "" {
-					h264Str = "video/x-raw,format=I420 ! x264enc threads=4 bitrate=" + bitrate + " byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream"
+				if bitrate > 0 {
+					h264Str = "video/x-raw,format=I420 ! x264enc threads=4 bitrate=" + strconv.Itoa(bitrate) + " byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream"
 				}
 
 				if err := CheckPlugins([]string{"x264"}); err != nil {
diff --git a/server/internal/remote/manager.go b/server/internal/remote/manager.go
index de3f1981..e4f591f8 100644
--- a/server/internal/remote/manager.go
+++ b/server/internal/remote/manager.go
@@ -145,7 +145,7 @@ func (manager *RemoteManager) createPipelines() {
 		manager.config.AudioCodec,
 		manager.config.Device,
 		manager.config.AudioParams,
-		"",
+		0,
 	)
 	if err != nil {
 		manager.logger.Panic().Err(err).Msg("unable to create audio pipeline")
diff --git a/server/internal/types/config/remote.go b/server/internal/types/config/remote.go
index f0309d9e..fb11603c 100644
--- a/server/internal/types/config/remote.go
+++ b/server/internal/types/config/remote.go
@@ -18,7 +18,7 @@ type Remote struct {
 	ScreenWidth  int
 	ScreenHeight int
 	ScreenRate   int
-	Bitrate      string
+	Bitrate      int
 }
 
 func (Remote) Init(cmd *cobra.Command) error {
@@ -47,7 +47,7 @@ func (Remote) Init(cmd *cobra.Command) error {
 		return err
 	}
 
-	cmd.PersistentFlags().String("bitrate", "", "set this video bitrate when possible")
+	cmd.PersistentFlags().Int("bitrate", 0, "set this video bitrate when possible")
 	if err := viper.BindPFlag("bitrate", cmd.PersistentFlags().Lookup("bitrate")); err != nil {
 		return err
 	}
@@ -120,7 +120,7 @@ func (s *Remote) Set() {
 	s.Display = viper.GetString("display")
 	s.VideoCodec = videoCodec
 	s.VideoParams = viper.GetString("video")
-	s.Bitrate = viper.GetString("bitrate")
+	s.Bitrate = viper.GetInt("bitrate")
 
 	s.ScreenWidth = 1280
 	s.ScreenHeight = 720