From f0e04828e8472d7681f8a3b02e88f371b40437fc Mon Sep 17 00:00:00 2001 From: Aaron Date: Sat, 30 Jan 2021 18:05:26 +0100 Subject: [PATCH 1/2] Dockerfile: Update Chromium to v88.0.4324.96 Signed-off-by: Aaron --- .m1k1o/chromium/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.m1k1o/chromium/Dockerfile b/.m1k1o/chromium/Dockerfile index 8fb27035..7a3db1e0 100644 --- a/.m1k1o/chromium/Dockerfile +++ b/.m1k1o/chromium/Dockerfile @@ -1,6 +1,6 @@ FROM m1k1o/neko:base -ARG SRC_URL="https://github.com/macchrome/linchrome/releases/download/v87.0.4280.88-r812852-portable-ungoogled-Lin64/ungoogled-chromium_87.0.4280.88_1.vaapi_linux.tar.xz" +ARG SRC_URL="https://github.com/macchrome/linchrome/releases/download/v88.0.4324.96-r827102-portable-ungoogled-Lin64/ungoogled-chromium_88.0.4324.96_1.vaapi_linux.tar.xz" # # install custom chromium build from woolyss with support for hevc/x265 From 31cd834526ec6b2fd9a14e1b413f70382a79b134 Mon Sep 17 00:00:00 2001 From: mbattista Date: Sun, 31 Jan 2021 23:12:52 +0100 Subject: [PATCH 2/2] Removed double h264 encoding if h264enc and openh264 is installed it lead to both strings in the gstreamer pipeline which resulted in no video output --- server/internal/gst/gst.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/internal/gst/gst.go b/server/internal/gst/gst.go index 9af0feff..d7c8291e 100644 --- a/server/internal/gst/gst.go +++ b/server/internal/gst/gst.go @@ -130,18 +130,20 @@ func CreateAppPipeline(codecName string, pipelineDevice string, pipelineSrc stri if pipelineSrc != "" { pipelineStr = fmt.Sprintf(pipelineSrc+pipelineStr, pipelineDevice) } else { - pipelineStr = fmt.Sprintf(videoSrc+"openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream"+pipelineStr, pipelineDevice) + var h264Str string + h264Str = "openh264enc multi-thread=4 complexity=high bitrate=3072000 max-bitrate=4096000 ! video/x-h264,stream-format=byte-stream" // https://gstreamer.freedesktop.org/documentation/x264/index.html?gi-language=c // gstreamer1.0-plugins-ugly // video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream if err := CheckPlugins([]string{"openh264"}); err != nil { - pipelineStr = fmt.Sprintf(videoSrc+"video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream"+pipelineStr, pipelineDevice) + h264Str = "video/x-raw,format=I420 ! x264enc bframes=0 key-int-max=60 byte-stream=true tune=zerolatency speed-preset=veryfast ! video/x-h264,stream-format=byte-stream" if err := CheckPlugins([]string{"x264"}); err != nil { return nil, err } } + pipelineStr = fmt.Sprintf(videoSrc+h264Str+pipelineStr, pipelineDevice) } case webrtc.Opus: // https://gstreamer.freedesktop.org/documentation/opus/opusenc.html