From nobody Tue Sep 13 00:20:34 2022 X-Original-To: dev-commits-ports-main@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 4MRPJ26Bkhz4bmbX; Tue, 13 Sep 2022 00:20:34 +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 4MRPJ25gvfz40gw; Tue, 13 Sep 2022 00:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663028434; 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=edtixUtplh37WvAyX9JoTh60v7+pkFgIMWuqcQf16HU=; b=qc+Wl8ooTzvV+O9OOGHnEVjTi4H2PRM2SH0uDXwyZGr3TO5BVhxHVldkQLkmuyLk/XgZ6y bBtNWN4Kq06l+p+qNflI5kil/sisHT5YIT4B9l2dRBwbOXzciCVVe/9lLWgfgjhUqqmkKp 8D65akNNBECINFs9xH/qSh6/keegS4DGFvIzGR3xdnYjY7yTYfp92gwS7mk9aqHUAWCZFo LFzbg3HVB93ThWc+vELhfnCP5R38AIMzrb9zgpLn+tA82+FQ4RZvp8v0Ds2mACReDeCXlD IiT7BdFNiQ1bvfhPaP7x2rcKcwJBAi2jFrrPQ+T5mtqOaYLhxJmrwYqtmqjPwQ== 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 4MRPJ24lVFz18YG; Tue, 13 Sep 2022 00:20:34 +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 28D0KYFB057666; Tue, 13 Sep 2022 00:20:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28D0KYtp057665; Tue, 13 Sep 2022 00:20:34 GMT (envelope-from git) Date: Tue, 13 Sep 2022 00:20:34 GMT Message-Id: <202209130020.28D0KYtp057665@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 16655b80c735 - main - multimedia/ffmpeg: backport a SVTAV1 fix List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: 16655b80c7357694073b29f4475769e605bbbb64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663028434; 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=edtixUtplh37WvAyX9JoTh60v7+pkFgIMWuqcQf16HU=; b=qKaAgXxWoNG3/kEWdpG4dU2OR18Tpew7Vv0w4nGLN0YIM3Om1Y11Gi/60rqC4nj1GEAK/M /v6ZjHS/T+/ynWW9IEeEk1cj4IO2gB5CEeO+E9KT5ULRWOgf45X6XqDcQwG/6N3z/ZyZKV FnjiRJG0Mqn1iDLH8naKTw3vNRC0MB96TBWPCWEb5oJbHFzolEQSyiveWlyq/pu78rSTQE sJeORJ8/FK8UJMzaNAiDGy26bvoysx5JwvMZqMhrbA8gmdsxcNlbIlObqfKYv9D/41qUho qpqwKGs7NigOCTyrcmVC5sgRR4vjUCRDd0k6rkPJXeIFUUi1mY449izrWhTqIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663028434; a=rsa-sha256; cv=none; b=I1TZQBOy+PA6y8a0cCPFCLfHM6yv9ibG1M+GZ4Glc37Klvicd9p8v11+opZn/xSBA+Uu0x ia+/v4XLwuwIYXhLbWTo3dFF4MEn0L1U7sDWFDJ7EpLWu2grq5k5MxBy+4Ex7ZOlsD8jL6 sAs2LZBnXXAQEDWU3b2hI8CpVNXnZOaSfmSFUlB3mRqeor3Vnful/nO0EihiCOvDNWpmSC 3smVHPZX98/es89Z1JT07XtdjOr06pVTJfG7+ONopmLC5I1LK8CGWRdptYYGSr/U1j/wtH 6Mcnhv7NNORvtt8LwIuHQ7Jgdgj175PZm6OHdEeL4MsQwv0XA2NI/HXQ3k182A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=16655b80c7357694073b29f4475769e605bbbb64 commit 16655b80c7357694073b29f4475769e605bbbb64 Author: Jan Beich AuthorDate: 2022-09-12 17:55:07 +0000 Commit: Jan Beich CommitDate: 2022-09-13 00:17:13 +0000 multimedia/ffmpeg: backport a SVTAV1 fix --- 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 244eadab3c2f..2ba095d9233b 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,6 +1,6 @@ PORTNAME= ffmpeg PORTVERSION= 4.4.2 -PORTREVISION= 7 +PORTREVISION= 8 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,