Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a8c36dbb58bf
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1accfe77b73c
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jan 21, 2020

  1. shotcut: auto-detection of VAAPI rendering is broken again 

    The 'connection=x11' parameter to ffmpeg breaks hardware
rendering with my Radeon RX 590 card. If we just drop that
option, everything works fine.
    @peti
    peti committed Jan 21, 2020
    Copy the full SHA
    1accfe7 View commit details
Showing with 35 additions and 0 deletions.
  1. +33 −0 pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch
  2. +2 −0 pkgs/applications/video/shotcut/default.nix
33 changes: 33 additions & 0 deletions pkgs/applications/video/shotcut/0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
From 247baa7e9210bbe5462b6155014c3dcd4a60e56a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 24 Sep 2019 10:27:17 +0200
Subject: [PATCH] encodedock.cpp: connect to VAAPI via DRM, not X11

---
src/docks/encodedock.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp
index f2d64fc8..63d20787 100644
--- a/src/docks/encodedock.cpp
+++ b/src/docks/encodedock.cpp
@@ -766,7 +766,6 @@ Mlt::Properties* EncodeDock::collectProperties(int realtime)
setIfNotSet(p, "pix_fmt", "nv12");
} else if (vcodec.endsWith("_vaapi")) {
setIfNotSet(p, "vprofile", "main");
- setIfNotSet(p, "connection_type", "x11");
}
}
setIfNotSet(p, "width", ui->widthSpinner->value());
@@ -1890,7 +1889,7 @@ void EncodeDock::on_hwencodeCheckBox_clicked(bool checked)
QStringList args;
args << "-hide_banner" << "-f" << "lavfi" << "-i" << "color=s=640x360" << "-frames" << "1" << "-an";
if (codec.endsWith("_vaapi"))
- args << "-init_hw_device" << "vaapi=vaapi0:,connection_type=x11" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload";
+ args << "-init_hw_device" << "vaapi=vaapi0" << "-filter_hw_device" << "vaapi0" << "-vf" << "format=nv12,hwupload";
else if (codec == "hevc_qsv")
args << "-load_plugin" << "hevc_hw";
args << "-c:v" << codec << "-f" << "rawvideo" << "pipe:";
--
2.24.1

2 changes: 2 additions & 0 deletions pkgs/applications/video/shotcut/default.nix
View file
Original file line number Diff line number Diff line change
@@ -17,6 +17,8 @@ mkDerivation rec {
sha256 = "1vwgah8pp2kbd0iaz952d3bwxphk06yxqc0pi4hk1mklkh87qzm9";
};

patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ];

enableParallelBuilding = true;
nativeBuildInputs = [ pkgconfig qmake ];
buildInputs = [