From patchwork Wed Aug 24 01:39:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp2229344pzh; Tue, 23 Aug 2022 18:40:45 -0700 (PDT) X-Google-Smtp-Source: AA6agR4oOkO/BnkChygMyTqTH/9MEMdU5ogvpU0i370G8VUcLHF/333UPiBSuRUqHIiFy/CgkZgq X-Received: by 2002:a05:6402:3481:b0:447:163:3200 with SMTP id v1-20020a056402348100b0044701633200mr5630688edc.406.1661305245364; Tue, 23 Aug 2022 18:40:45 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id yr19-20020a170907335300b0072b12db5f1csi989464ejb.451.2022.08.23.18.40.45; Tue, 23 Aug 2022 18:40:45 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b="tBuP/v4B"; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D291468B4A4; Wed, 24 Aug 2022 04:40:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2071.outbound.protection.outlook.com [40.92.91.71]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C7BA468B4A4 for ; Wed, 24 Aug 2022 04:40:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IrkIRX000/1VYUgFGy0IaF/VYThvjJERXzioOGLJ9OZL1mx8Z2wofCgrN5gX3rSw5ZpNhheEdWlE2hFVpEV3toHKiPwbEaQNZf0MqNX2aNv/0DDtM4wc2cyDAnaWsfnoPtz6o5jWhMbXKzOIGosClHMzjONPsrrpEfjohALdMzCUki62J1CEb3O3VMD8k/ma5Zxi3lttYuN8bpByHpGdExxFLndf3CxNiZWM87hZWIE6Gy79fIhAXSzD+HwdVC7m67J/nj3m84Gvma0842xJVjoc66CvQ0+KImGHDegtXqOD+LWA4dKYrWwupnFzUk7Z568zpw8ho+423Yh5b6tOkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TMjhlHwyULR4gtUjmxKded2eEQTSyjinkIVdduE2CZQ=; b=V6EE4SbYYSNs8VHCAq9204R3gP3sFduICQ3gJOC12pGHTItRT5rxyGWLKJtotHnejTDFKSUtsv8RxbxvOYBcHUBdzzCE4EOuSrEEb768Stae6Gn7YGz46Tkyu/rtYm9NiOTcNoGaxY3Omt0e8/N+chkKaJm7UiRTuho1ffiaT3CYrCkJsXN5AZ9mLIfUVd2gYx47dfgmhDRwbI37KZjhxLg3Yh4haSMp8tJ8lYLY8Fbr63sG01P0vvv8xbtJ7OV1LmofY3m/k4nXzrQzqyyVDrPNE/PLw+AQmOgdtelQh0u+3pWg4T7NNJI3r/9x6j0dLiNSFbNOKzEbBLVFm4WVJg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TMjhlHwyULR4gtUjmxKded2eEQTSyjinkIVdduE2CZQ=; b=tBuP/v4B6nvPkiCuefPj6XPrWxuLShVKwbDdOBv7vpDjtZ3SoNZHNjbn3qgq0He3P1M/5bxeHKnmMs/UpjPECxUTAGtW+Hfyq7HfKQVrg2q43xwXzKFMkyYDvZ37p2FTuJZMNyCbEiRfg8BgdtJ39yNXyO98AHL2gb5pAWFzhdFcquYeY0XIiEG36bseNI9KjBVc1V6iBvls5iuW8HxDkaSSc10m2LgqSAYlNUS3dL9c2MWB1lWaJUeS9S53hVfiW5ejgUyi1QG81qJ1Vw1f0JLCJLxt8DLgfO0Ptbrd+8LUWrffNwvSZ3oYvwaJ6IuRRYtDRVmt/q3ga9HfB3OaHA== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AS4PR01MB8966.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4e5::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Wed, 24 Aug 2022 01:40:19 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5546.022; Wed, 24 Aug 2022 01:40:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Aug 2022 03:39:59 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [kHCQuLKh1GDf/VcVCILyncVAISsGnn0b] X-ClientProxiedBy: ZR0P278CA0110.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::7) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220824014006.2441856-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f502ec4b-bc84-4442-89d5-08da85719a72 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmqqMbmmUl3hmz+Lb9LXv/kABErleZblSvLIjcJFG/yIiEh9dEZWOKm9SHFemK8PqfQ3LDHPDn20FAF/LINTvlWN6Srll3lPXoSl2wbK3Xbm6PPpW6FIAfc2I+3SymDUMjzo5ku0sGYdRtvmggNkt1dO8Ct4sb04vOYrYjCxQ7ZLj9BTQvuvA9vEYGMdzAsvdExS6OWQfHl/25nWF6THj9HmUTSSrnt0kQkHGttJIyf1K7Ptxex4UeS4QGhs/otPLO0YFztovx6tkcTSn4AbVIwXaf48IBYCd0C2vXvuVWdJEsz84wH8IUJJzSth/kkAGs3PdD4waZKwlHARpfvBw14D4xCzvySrld2i7LGacaDzZqQf/8savi7sFDz9adsgnxFW4tDC6o/1BGx79cNL1VO0mcA7lH+PpFNJlZ/lVwOpZELM9ZKBqixvamRPPPZ4YbtWguSGdzCymFa5ahU7hcQx1y+o3IhnDDrkPnjk63FiOBS8u5yJpcKwCBxRtGcER5DcQ15DgZWzSDtlhSqcvOEmgUTtt54wdqJnBmAtyFWP8arNkBVVPqLGQsU3Cumv4NDvCAm++2NT7xvYy+gevfa9K68MFAt6xJBefTj2RMysjfDlzZqL8jvLR2MnS8W/R8964BGjHPqTsPWmKyQuGE+AN8ywbaprU6CxaJ1bOsiyv/PsdZEidDNMy+b/dHxb5GLlgZeboJHNpINN1/piOAdguY56Q8hNvusw/fvR79nAAEBBvNz43SboUWoNKcPWVBo= X-MS-TrafficTypeDiagnostic: AS4PR01MB8966:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5fRzhFRDMW3mbpHYmtOYhpYS8sB2pSlf+gSBp/YYTDuuZsGuajVibpH2KD413qGf6Pk6Jy24eGR8zs9TvOXEQhxLEdOJR+iZ6cFQ4N/H5KwtZ3ePcjSynjuRUFWEsdvChZvO3UIR0qKEhaR+ZPrwhESOnrzM/LWCNmbLWl/lB+s7cNeKcAdO+hYXRVRH0I0aNHA09Lm9gMzzPX8aFIqll2AcsSIJIWA9QG54lrTWO+yW7yT8G6X+WLf+/u02AlMb5L1TR5pSlxJwxa7Z9QQGWFU15A/5FVuqWpT5jHOreQYImCshjT6+Qs1foVTcSWczG0H/iJxDajoGMBYnmctZ6Moh9qFqa6S+CHW77KL9+vlCsTCTS+nUklWm6a3hYdgjwv8m58tOkGXcq2WQuVxB7EoqlylSZ0aKJ79aQHrUujEgaI17z7BV0u0/mETheJDUecpqZrrZsgCFjYPUoJWGNXPF8KDOXsrdmVbxjkZ8U6nGN7DKNaSYY3iYpopIm236E92WeVH50mXjlCo0jJw/Zy6fGsgLZ2T0yq9e+Kjf8wrG8422fLlQud25VG72zDWM9hGYv96dn8GwDC1rPdE9L5WcVYgN8xquI14RCFMci6O7N7GV/Q0hEfVKtIvFP8FVpPdQwG8C0wwQfZFKXozTEQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BgCRdnB0kl4NKhjN/wQu8oM+JXSzO6BG9YpJY1oLHQHTZpv7J5omnYlwVqlbQZuUrxbVkn3JKP5iQdPrEsipvoGkmoAJRw8lv7AppqVvTatTPtoiqMai+dxjv8ZnGv6V7ujFE+YJ4Jh8bfGq7UHA8K3mpQEhZKAwgooY44+dyEH2BOXrq/tmFiaqocoX/CbaFWEXiJNxkBgHahapGoTIXlUYCo8IS+Nphm5q1t+bzg7ozX5iz6v+tdjFcHVcIayBvtj/gFeVCShReCl+FaIVdr2p1cU05mo42jko92lqN2XDWY9yApQSgEObWA/3zsX6ytc8DETieY4YK5jUJUIIGv053/twb6HGSkxG5yAvX9MAsBp+kOTeQwjPR3KvwPb3TSd6uL/6z7aqOyNlfdDUqJM6oV1mMxv1KSSUF1tbWsvT9SfWoKAF+kXVpEv1OB53AotEAwIlJz590ZEgJ7UU9L2hDxeLxd+suAadUEz9sGU6sdAAU3NSHFA5c/48WTkI0OvXX9ooOqbRA/K8QzHhgT6dFylCV3OY6tczS2/Y/FNrKtJPCtJuLQLGD+I4QlyaVUNMaF06Z/UhtrAJSg8vScSijVgZQEUHXqD2PSQkvi4MX18+3vVlW6AyeW3fNlniDUHUj/Q7c0E5FRycrmjq7gGciOC142w9GtpHjbefzNtKFSuvxhVUSM8qfjYhb4P2XGjPxE71kfKMNhBlFm6kJPgcF8zv3Vdtabs3tcv0i+yGAQ3FxHJXvbBI5NvSOg7R9NneVPLFLoO9KCn5BWy57ESzuMy4SuedJzhRNrjhmHgu2klEEKmtnktWPmIRHntCtV6oB5De7km/NpmmaQjRQggont/yi5ZoPlOExdbaBbYuHZZTdQCZqExzK8/qaUrlaF/wsA02VMtxd6lIL7R9a/FReBtK+JCAIVKrgz4nnqzQbizhwi4vHP+UPp93oXF+ePDNKlrpUR4P45kyDI1exvCO07wruAXH6HRf5POLiucyi7sx7EsyHOdfLzjo4GVAJWTQYq1PB4w/RwP4oS2BBuNHR77k+kQvedIJyaaH0C/21SulrBxa/LleI0NldfkGFlKQaESjuC7bqlg1ToK5yUq6Zi7zp7f/aW0Psw+tFtT73p4VltiSO0M66lEPK23SPCNwLZsdNHK/nRnhrJe04A2L+zrJPfdhsGlR9R8u8hkIQrp0JLuTq7LGwmRydFN8MJzFXyDgEE2RZZd60he0LVQJaYIv2i8btBAf8AYWJYCzcpkohQrh3H4wXz3A9Bxcn+zeEigrBRc8WyntUGcQuv7RelhfnjcBftojUd8ztuE= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f502ec4b-bc84-4442-89d5-08da85719a72 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 01:40:19.7842 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4PR01MB8966 Subject: [FFmpeg-devel] [PATCH 04/11] avcodec/encode: Simplify check for frame-threaded encoder X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: fzkTldKSTRk0 AVCodecInternal.frame_thread_encoder is only set iff active_thread_type is FF_THREAD_FRAME. Signed-off-by: Andreas Rheinhardt --- libavcodec/encode.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index 9f413095e4..01b59bbf70 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -192,7 +192,7 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) if (!frame->buf[0]) { if (!(avctx->codec->capabilities & AV_CODEC_CAP_DELAY || - (avci->frame_thread_encoder && avctx->active_thread_type & FF_THREAD_FRAME))) + avci->frame_thread_encoder)) return AVERROR_EOF; // Flushing is signaled with a NULL frame @@ -203,8 +203,7 @@ static int encode_simple_internal(AVCodecContext *avctx, AVPacket *avpkt) av_assert0(codec->cb_type == FF_CODEC_CB_TYPE_ENCODE); - if (CONFIG_FRAME_THREAD_ENCODER && - avci->frame_thread_encoder && (avctx->active_thread_type & FF_THREAD_FRAME)) + if (CONFIG_FRAME_THREAD_ENCODER && avci->frame_thread_encoder) /* This might modify frame, but it doesn't matter, because * the frame properties used below are not used for video * (due to the delay inherent in frame threaded encoding, it makes