From nobody Tue Sep 13 00:21:51 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 4MRPKW3LNdz4bmQW; Tue, 13 Sep 2022 00:21:51 +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 4MRPKW2vRfz41Qn; Tue, 13 Sep 2022 00:21:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663028511; 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=A2+u0UNBhqk9hS1n5slRtqc8nN9QNGkgDkemxMK7Cik=; b=xGGJY9Ngu5CYKnPI/nHkKPPYZFx7527vJDJ+mJZDoDaUI5h2ID4qNomIqUEWiiZhQxDqGC 0BiniBHp3Dx219v0hZd20DBwRvLLFyimW109PmaSbuGo4mGOoOfUlWQXHY/pwVxmH3T/PM PBkQE/UF6hoPqtmqNz9iiOihoDp/SERX3CreA3+OB+TOriXR0A2nvkI8pCx8Qoi/XWd4tM TkqkGx0np+K6hCEn2F+Dv+TsUPorzyLyXWLnzrAfr7RMQkengWCCD9SNQg3voy0f9/70Gh vXzEa4l1yPhuvRX1S/KfTVGlsPP56SRB9x5ZDVmQbnmFQv5+B6SdRhOjE1PdNA== 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 4MRPKW1yq7z18kb; Tue, 13 Sep 2022 00:21:51 +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 28D0Lpab060399; Tue, 13 Sep 2022 00:21:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28D0LpeT060398; Tue, 13 Sep 2022 00:21:51 GMT (envelope-from git) Date: Tue, 13 Sep 2022 00:21:51 GMT Message-Id: <202209130021.28D0LpeT060398@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: 387b4defc247 - 2022Q3 - multimedia/ffmpeg: backport a SVTAV1 fix 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/2022Q3 X-Git-Reftype: branch X-Git-Commit: 387b4defc247d02313dd13d3ff05d2b475aaadf4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663028511; 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=A2+u0UNBhqk9hS1n5slRtqc8nN9QNGkgDkemxMK7Cik=; b=Z319kc8DO8St59jowFJunYq9AARJ5vl6gHXEkZDMyoQBlXK+92dq/hX3NGe7m7jqV1BwiR m3XndHHwONMy9LDEBhCaJfIEw8kgXyPn1hn39cjdW7+ob/8Rg9h8YRJuEHS/Vva/OB5WeG +Oe4X+6OcQWL5xpG7ZzNdW0z+jYj0ixVztexQeCDxvFlt49fuL3UZF7gsQTCcjsSCsqGUS N5/eEKCbSwEEnkV3cLbuOE1iTcq4dq9HNaZPEMkqyCmIdiI3hV5x4lJY35DBFOyrD9/ss9 fBAsCSijkfM3bcg9gwQxUz7urhjlqJCNqN5h+1WBhYzl36rKkIwPjps7ws4Iaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663028511; a=rsa-sha256; cv=none; b=Rag209pwBwlpkFVcY/E6cb9qb3os5YywGS2xMpLNBOoq2ZOXeEuvrfo2cDJ8fwilhkwi25 p6yRW9uQQ5x6qNJifBsMfSdEQJbp2iDs8bQO9DEOX1++ogERws0iERu5JfRkUfG25mLeea E4eOyghOeBrCvwHefq+k5pgo2n4zfFDQmG+o4rPox105mys7fVyAz9NejpheAEYzEPH6Kl /ODS4fpqm6bYh4lzlZnHkj01ggNfVcr80G1qybZwZOQVYDXnKs44e0ub4QAvFA1HsjPR/Y yVDb4abH91468yoXY1aiTh4oIqqeRuEfs3EAASsIS10fYkS1pSWhZYn9h+E9FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=387b4defc247d02313dd13d3ff05d2b475aaadf4 commit 387b4defc247d02313dd13d3ff05d2b475aaadf4 Author: Jan Beich AuthorDate: 2022-09-12 17:55:07 +0000 Commit: Jan Beich CommitDate: 2022-09-13 00:21:09 +0000 multimedia/ffmpeg: backport a SVTAV1 fix (cherry picked from commit 16655b80c7357694073b29f4475769e605bbbb64) --- multimedia/ffmpeg/Makefile | 2 +- multimedia/ffmpeg/files/patch-svtav1 | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 1a846ac6a56c..7ec077a880e6 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -2,7 +2,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.4.2 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ diff --git a/multimedia/ffmpeg/files/patch-svtav1 b/multimedia/ffmpeg/files/patch-svtav1 index 8fc0711e3511..5d8893a959fa 100644 --- a/multimedia/ffmpeg/files/patch-svtav1 +++ b/multimedia/ffmpeg/files/patch-svtav1 @@ -14,6 +14,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/6fd1533057ff https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ded0334d214f https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/70887d44ffa3 https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fe100bc556d7 +https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fb70e0611bd7 --- configure.orig 2021-10-24 20:47:11 UTC +++ configure @@ -300,7 +301,21 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fe100bc556d7 return 0; } -@@ -350,6 +443,16 @@ static int eb_send_frame(AVCodecContext *avctx, const +@@ -330,11 +423,8 @@ static int eb_send_frame(AVCodecContext *avctx, const + if (svt_enc->eos_flag == EOS_SENT) + return 0; + +- headerPtrLast.n_alloc_len = 0; +- headerPtrLast.n_filled_len = 0; +- headerPtrLast.n_tick_count = 0; +- headerPtrLast.p_app_private = NULL; +- headerPtrLast.p_buffer = NULL; ++ memset(&headerPtrLast, 0, sizeof(headerPtrLast)); ++ headerPtrLast.pic_type = EB_AV1_INVALID_PICTURE; + headerPtrLast.flags = EB_BUFFERFLAG_EOS; + + svt_av1_enc_send_picture(svt_enc->svt_handle, &headerPtrLast); +@@ -350,6 +440,16 @@ static int eb_send_frame(AVCodecContext *avctx, const headerPtr->p_app_private = NULL; headerPtr->pts = frame->pts; @@ -317,7 +332,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fe100bc556d7 svt_av1_enc_send_picture(svt_enc->svt_handle, headerPtr); return 0; -@@ -472,21 +575,22 @@ static const AVOption options[] = { +@@ -472,21 +572,22 @@ static const AVOption options[] = { #define OFFSET(x) offsetof(SvtContext, x) #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { @@ -349,7 +364,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fe100bc556d7 FF_AV1_PROFILE_OPTS -@@ -518,21 +622,20 @@ static const AVOption options[] = { +@@ -518,21 +619,20 @@ static const AVOption options[] = { { LEVEL("7.3", 73) }, #undef LEVEL @@ -382,7 +397,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fe100bc556d7 {NULL}, }; -@@ -544,9 +647,10 @@ static const AVCodecDefault eb_enc_defaults[] = { +@@ -544,9 +644,10 @@ static const AVCodecDefault eb_enc_defaults[] = { }; static const AVCodecDefault eb_enc_defaults[] = { @@ -395,7 +410,7 @@ https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/fe100bc556d7 { "qmax", "63" }, { NULL }, }; -@@ -561,12 +665,11 @@ AVCodec ff_libsvtav1_encoder = { +@@ -561,12 +662,11 @@ AVCodec ff_libsvtav1_encoder = { .receive_packet = eb_receive_packet, .close = eb_enc_close, .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,