From nobody Sun Feb 20 18:32:55 2022 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 F20D719D7613; Sun, 20 Feb 2022 18:32:55 +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 4K1vF36QRBz4lPk; Sun, 20 Feb 2022 18:32:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645381975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PokplUVIbnUuXldyH1t9ELWHgWVaNzh+6RaXsYOrCM=; b=EsKu2+gdn+LXhdLVdfJBnKfgMGyb6m78r0kZ7wU1Ieb54Zl8F7u9yiRxXcDnaNItA20z1Z XWa8r8JEe1vf0WMNcuq1FyUEHxlH82FZGSKCpmHPr0Ob9sW6shT483cy5H6O87XfsUUs1R EMvLhTkY/QiZz1nY966CHjj2HRPMZjzUX5m4fR1+tgbasNB2Tte1F6228trlthCjy/PyqV l1t2FVqJnTvUYgpP3iVUzKl8yU3ABfR0JwnPGpejbzEJ2H0FRUp6QYlmNFnAbH96qxuN8l +nt5FbdFamK+wsws9AjjzrvL2LjsprtdIStIcwWHEIcXvJV0y27hPDL8zJZGdw== 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 BB89821675; Sun, 20 Feb 2022 18:32:55 +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 21KIWtDI050110; Sun, 20 Feb 2022 18:32:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21KIWtln050109; Sun, 20 Feb 2022 18:32:55 GMT (envelope-from git) Date: Sun, 20 Feb 2022 18:32:55 GMT Message-Id: <202202201832.21KIWtln050109@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: 863466ed9f7f - 2022Q1 - multimedia/mythtv: unbreak with dav1d 1.0.0 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 863466ed9f7fc4e70449afe37309b6de1e4ad2a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645381975; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+PokplUVIbnUuXldyH1t9ELWHgWVaNzh+6RaXsYOrCM=; b=YUZB8I91QKXhhLu+UiILmEoRinAPekaxksGUgBOXDqV7MhwelMVCQRfRmS2P+G6W/uzg5J ZUrgaCaqFSWfnsYHMKaQ5SmQv0+FxuWdFwX9tONhAD1B8sCarJA9YlQ9oDkzbCPaFwWNH0 4F3zQ5kOPmKE02ELiVUDiFu2qdTCaFhGDfy3ak752QK7S/pIxT0Vyti6lImFQlooPM6sgn V+sTKANEHqIWE2zhfYsCbjzaWpes0oxz/8XcCkz7GUH78eFKe6ezrjGD6bgGVOXh5V0qrS 3/qp+0GujE/ZvYmdb5Je7bpU0TpsdpGDI7k4ELb1VwND2iA/wDhJZzDFXo43gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645381975; a=rsa-sha256; cv=none; b=I7WS71Gh3gVRtI7Ark9l39ga0GxQmbnMrV4lk7HYGhLVVY+O+tb4Ak60W5woxgqXmyX1+q WsJyZMMePCjrU9Qt6gEHG05wGXj1bolLBbRy0HQEdqysgqS/MRx7R6F+3XdwL6cwEf7jLU qCtnkM00zR2gOiNAP8lPY4ylKwgBBeEG+UQsKtoO95hTqU6CmOGUIKf/JQq9bW7KADbozW MuAZhJRlPWKz8+iKmZsvtOnFBtO8X5YYoJk6q7sna6eRFYDAaLgs1/SI13i8YHz40bxLCy YClRnCimbceQXmPNdMuR1Bo6HKZQGioz87+kQaOLPRgdCHHfKual3KYygjK2aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=863466ed9f7fc4e70449afe37309b6de1e4ad2a7 commit 863466ed9f7fc4e70449afe37309b6de1e4ad2a7 Author: Jan Beich AuthorDate: 2022-02-20 16:56:13 +0000 Commit: Jan Beich CommitDate: 2022-02-20 18:32:29 +0000 multimedia/mythtv: unbreak with dav1d 1.0.0 libavcodec/libdav1d.c:135:7: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' s.n_tile_threads = dav1d->tile_threads ~ ^ libavcodec/libdav1d.c:138:7: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' s.n_frame_threads = dav1d->frame_threads ~ ^ (cherry picked from commit 3efc49fffd5ace5b83292d1037b4f3fc03164815) --- multimedia/mythtv/files/patch-dav1d-1.0 | 111 ++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/multimedia/mythtv/files/patch-dav1d-1.0 b/multimedia/mythtv/files/patch-dav1d-1.0 new file mode 100644 index 000000000000..272eb84994a9 --- /dev/null +++ b/multimedia/mythtv/files/patch-dav1d-1.0 @@ -0,0 +1,111 @@ +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/5e61fce832f7 + +libavcodec/libdav1d.c:137:7: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' + s.n_tile_threads = dav1d->tile_threads + ~ ^ +libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS' + : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); + ^ +libavcodec/libdav1d.c:139:52: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS' +libavcodec/libdav1d.c:140:7: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' + s.n_frame_threads = dav1d->frame_threads + ~ ^ +libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' + : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + ~ ^ +./libavutil/common.h:96:22: note: expanded from macro 'FFMIN' +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) + ^ +libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'? + : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + ^~~~~~~~~~~~~~~~~~~~~~~ + DAV1D_OBU_FRAME_HDR +./libavutil/common.h:96:28: note: expanded from macro 'FFMIN' +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) + ^ +/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here + DAV1D_OBU_FRAME_HDR = 3, + ^ +libavcodec/libdav1d.c:142:65: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'? + : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + ^~~~~~~~~~~~~~~~~~~~~~~ + DAV1D_OBU_FRAME_HDR +./libavutil/common.h:96:34: note: expanded from macro 'FFMIN' +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) + ^ +/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here + DAV1D_OBU_FRAME_HDR = 3, + ^ +libavcodec/libdav1d.c:142:48: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' + : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + ~ ^ +./libavutil/common.h:96:40: note: expanded from macro 'FFMIN' +#define FFMIN(a,b) ((a) > (b) ? (b) : (a)) + ^ +libavcodec/libdav1d.c:144:14: error: no member named 'n_frame_threads' in 'struct Dav1dSettings' + s.n_frame_threads, s.n_tile_threads); + ~ ^ +libavcodec/libdav1d.c:144:33: error: no member named 'n_tile_threads' in 'struct Dav1dSettings' + s.n_frame_threads, s.n_tile_threads); + ~ ^ +libavcodec/libdav1d.c:378:94: error: use of undeclared identifier 'DAV1D_MAX_TILE_THREADS' + { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD }, + ^ +libavcodec/libdav1d.c:379:97: error: use of undeclared identifier 'DAV1D_MAX_FRAME_THREADS'; did you mean 'DAV1D_OBU_FRAME_HDR'? + { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD }, + ^~~~~~~~~~~~~~~~~~~~~~~ + DAV1D_OBU_FRAME_HDR +/usr/local/include/dav1d/headers.h:48:5: note: 'DAV1D_OBU_FRAME_HDR' declared here + DAV1D_OBU_FRAME_HDR = 3, + ^ + +--- external/FFmpeg/libavcodec/libdav1d.c.orig 2020-03-23 14:32:28 UTC ++++ external/FFmpeg/libavcodec/libdav1d.c +@@ -30,6 +30,9 @@ + #include "decode.h" + #include "internal.h" + ++#define FF_DAV1D_VERSION_AT_LEAST(x,y) \ ++ (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y)) ++ + typedef struct Libdav1dContext { + AVClass *class; + Dav1dContext *c; +@@ -132,6 +135,15 @@ static av_cold int libdav1d_init(AVCodecContext *c) + s.allocator.release_picture_callback = libdav1d_picture_release; + s.apply_grain = dav1d->apply_grain; + ++#if FF_DAV1D_VERSION_AT_LEAST(6,0) ++ if (dav1d->frame_threads || dav1d->tile_threads) ++ s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads); ++ else ++ s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS); ++ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads; ++ av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n", ++ s.n_threads, s.max_frame_delay); ++#else + s.n_tile_threads = dav1d->tile_threads + ? dav1d->tile_threads + : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS); +@@ -140,6 +152,7 @@ static av_cold int libdav1d_init(AVCodecContext *c) + : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS); + av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n", + s.n_frame_threads, s.n_tile_threads); ++#endif + + res = dav1d_open(&dav1d->c, &s); + if (res < 0) +@@ -335,6 +348,13 @@ static av_cold int libdav1d_close(AVCodecContext *c) + + return 0; + } ++ ++#ifndef DAV1D_MAX_FRAME_THREADS ++#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS ++#endif ++#ifndef DAV1D_MAX_TILE_THREADS ++#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS ++#endif + + #define OFFSET(x) offsetof(Libdav1dContext, x) + #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM