From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:39115) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j5CFZ-0006u9-3K for guix-patches@gnu.org; Fri, 21 Feb 2020 12:38:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j5CFW-0001Ir-P3 for guix-patches@gnu.org; Fri, 21 Feb 2020 12:38:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42078) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j5CFW-0001In-L5 for guix-patches@gnu.org; Fri, 21 Feb 2020 12:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1j5CFW-0004YG-IA for guix-patches@gnu.org; Fri, 21 Feb 2020 12:38:02 -0500 Subject: [bug#39719] [PATCH] gnu: FFmpeg: Prefer dav1d over libaom. References: <20200221173453.GA7603@jasmine.lan> In-Reply-To: <20200221173453.GA7603@jasmine.lan> Resent-Message-ID: From: Leo Famulari Date: Fri, 21 Feb 2020 12:36:43 -0500 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 39719@debbugs.gnu.org * gnu/packages/patches/ffmpeg-prefer-dav1d.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/video.scm (ffmpeg)[source]: Use it. --- gnu/local.mk | 1 + .../patches/ffmpeg-prefer-dav1d.patch | 43 +++++++++++++++++++ gnu/packages/video.scm | 1 + 3 files changed, 45 insertions(+) create mode 100644 gnu/packages/patches/ffmpeg-prefer-dav1d.patch diff --git a/gnu/local.mk b/gnu/local.mk index f2289518e5..0ebb0f3463 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -857,6 +857,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spSolve.patch \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ + %D%/packages/patches/ffmpeg-prefer-dav1d.patch \ %D%/packages/patches/fifo-map-fix-flags-for-gcc.patch \ %D%/packages/patches/fifo-map-remove-catch.hpp.patch \ %D%/packages/patches/file-CVE-2018-10360.patch \ diff --git a/gnu/packages/patches/ffmpeg-prefer-dav1d.patch b/gnu/packages/patches/ffmpeg-prefer-dav1d.patch new file mode 100644 index 0000000000..95e3712a7f --- /dev/null +++ b/gnu/packages/patches/ffmpeg-prefer-dav1d.patch @@ -0,0 +1,43 @@ +When decoding AV1 files, prefer dav1d over libaom for performance +reasons. + +Patch copied from upstream source repository: + + + +From dc0806dd25882f41f6085c8356712f95fded56c7 Mon Sep 17 00:00:00 2001 +From: James Almer +Date: Sun, 15 Sep 2019 11:29:56 -0300 +Subject: [PATCH] avcodec/allcodecs: make libdav1d the preferred AV1 decoder + +It's considerably faster than libaom in most systems. + +Reviewed-by: BBB +Signed-off-by: James Almer +--- + libavcodec/allcodecs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c +index 5130fca026..d5dfba1877 100644 +--- a/libavcodec/allcodecs.c ++++ b/libavcodec/allcodecs.c +@@ -680,7 +680,6 @@ extern AVCodec ff_pcm_mulaw_at_encoder; + extern AVCodec ff_pcm_mulaw_at_decoder; + extern AVCodec ff_qdmc_at_decoder; + extern AVCodec ff_qdm2_at_decoder; +-extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libaom_av1_encoder; + extern AVCodec ff_libaribb24_decoder; + extern AVCodec ff_libcelt_decoder; +@@ -738,6 +737,7 @@ extern AVCodec ff_idf_decoder; + /* external libraries, that shouldn't be used by default if one of the + * above is available */ + extern AVCodec ff_h263_v4l2m2m_encoder; ++extern AVCodec ff_libaom_av1_decoder; + extern AVCodec ff_libopenh264_encoder; + extern AVCodec ff_libopenh264_decoder; + extern AVCodec ff_h264_amf_encoder; +-- +2.20.1 + diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index f8c9f9e45a..7150467a99 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -841,6 +841,7 @@ operate properly.") (method url-fetch) (uri (string-append "https://ffmpeg.org/releases/ffmpeg-" version ".tar.xz")) + (patches (search-patches "ffmpeg-prefer-dav1d.patch")) (sha256 (base32 "176jn1lcdf0gk7sa5l2mv0faqp5dsqdhx1gqcrgymqhfmdal4xfb")))) -- 2.25.1