From nobody Thu Oct 07 13:36:31 2021 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AF1E512DDAD2; Thu, 7 Oct 2021 13:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HQC5q4MD7z3DnW; Thu, 7 Oct 2021 13:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6A8FF149CB; Thu, 7 Oct 2021 13:36:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 197DaVGt073413; Thu, 7 Oct 2021 13:36:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 197DaV09073412; Thu, 7 Oct 2021 13:36:31 GMT (envelope-from git) Date: Thu, 7 Oct 2021 13:36:31 GMT Message-Id: <202110071336.197DaV09073412@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 4c4f0e624c82 - 2021Q4 - multimedia/intel-media-sdk: unbreak runtime after f4faca97f05b List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q4 X-Git-Reftype: branch X-Git-Commit: 4c4f0e624c8251a9e2eea6e1d912426355b1475e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=4c4f0e624c8251a9e2eea6e1d912426355b1475e commit 4c4f0e624c8251a9e2eea6e1d912426355b1475e Author: Jan Beich AuthorDate: 2021-10-07 13:21:34 +0000 Commit: Jan Beich CommitDate: 2021-10-07 13:36:26 +0000 multimedia/intel-media-sdk: unbreak runtime after f4faca97f05b $ ffmpeg ... -c:v hevc_qsv ... [AVHWDeviceContext @ 0x8062d0140] Error initializing an MFX session: -3. Device creation failed: -1313558101. PR: 258976 Reported by: Yuichiro NAITO (cherry picked from commit 0402cf13b3cc4b3c1fe6bd68b1286c2054f0ee3f) --- multimedia/intel-media-sdk/Makefile | 1 + .../intel-media-sdk/files/patch-msdk-default | 28 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/multimedia/intel-media-sdk/Makefile b/multimedia/intel-media-sdk/Makefile index 80d3668a75bd..8929be7f8013 100644 --- a/multimedia/intel-media-sdk/Makefile +++ b/multimedia/intel-media-sdk/Makefile @@ -1,6 +1,7 @@ PORTNAME= intel-media-sdk DISTVERSIONPREFIX= intel-mediasdk- DISTVERSION= 21.3.5 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org diff --git a/multimedia/intel-media-sdk/files/patch-msdk-default b/multimedia/intel-media-sdk/files/patch-msdk-default new file mode 100644 index 000000000000..503fcbbf792f --- /dev/null +++ b/multimedia/intel-media-sdk/files/patch-msdk-default @@ -0,0 +1,28 @@ +/sys/class/drm/renderD*/device/device is Linux-only, so default to +INTEL_MEDIA_RUNTIME=MSDK on other systems. + +$ ffmpeg -hide_banner -init_hw_device qsv=auto -i foo.y4m -vf hwupload=extra_hw_frames=64,format=qsv -c:v h264_qsv -y foo.mkv +[AVHWDeviceContext @ 0x8062d0140] Error initializing an MFX session: -3. +Device creation failed: -1313558101. +Failed to set value 'qsv=auto' for option 'init_hw_device': Unknown error occurred +Error parsing global options: Unknown error occurred + +--- api/mfx_dispatch/linux/mfxloader.cpp.orig 2021-09-29 15:58:50 UTC ++++ api/mfx_dispatch/linux/mfxloader.cpp +@@ -181,11 +181,16 @@ mfxStatus LoaderCtx::Init(mfxInitParam& par) + return MFX_ERR_UNSUPPORTED; + } + ++#ifdef __linux__ + eMFXHWType platform = MFX_HW_UNKNOWN; + auto devices = get_devices(); + if (devices.size()) { + platform = devices[devices.size() - 1].platform; + } ++#else ++ // Assume a legacy generation not supported by oneVPL-intel-gpu ++ eMFXHWType platform = MFX_HW_SKL; ++#endif + + std::vector libs; +