From patchwork Sat Sep 10 01:07:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37822 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1245738pzh; Fri, 9 Sep 2022 18:08:59 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Vk+ivrwj9ERYsBKBBDpG9htmFWziGCK1+5Xtifk4Hwi9ovzF+OMH8JRx+QSBTQ4+xAI4Z X-Received: by 2002:a17:907:9484:b0:738:6f9f:6032 with SMTP id dm4-20020a170907948400b007386f9f6032mr11572700ejc.602.1662772138980; Fri, 09 Sep 2022 18:08:58 -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 cw9-20020a170906c78900b0073d9b010076si1537269ejb.822.2022.09.09.18.08.58; Fri, 09 Sep 2022 18:08:58 -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=Ok98fDqK; 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 A7C4A68BB37; Sat, 10 Sep 2022 04:08:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074104.outbound.protection.outlook.com [40.92.74.104]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB73E68BB26 for ; Sat, 10 Sep 2022 04:08:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LkW4wm+Ox+l5Kp+eX1AylwoyT2diqAE9TuzCP9DkyvxUoWdim6skecCdm+ujKrMPewIGh7HI4b3/zmUEc1hVAopFLA5aSjC2Ht1yMCTHOJ27f7+yARdSKMePJ44i7hmlgVkJYuTGHANiEuQ8blkID3tLVX5bmqxHrRRpZbUAuynNVyApr9w/w/hJWPxAlNF/HI37PFlyAZ+taRQfVGFCAbMIvkhhvVyHyh9LfLjF9VYmi2WYu9AxHZ4i241t/8lZ+72b8/7lSZjofM2m/Q7rNFEO5xHk6+IeK2Ip6sVdx1hgKnq2Tao+Mt8QoIK49a0cWXmiJDQuDWSIJJUfl9bFsw== 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=6ioJXhm4BCLM8BALlGowpsnUFisFvKpE0TM06zmXS98=; b=C+EjwsUquI229WrByfEda16XOJ6jp2V2yZ5DHKbFOsycjrOYwGoDXZ4+LdMHs8kIjJayJOPzUgRUK2cWRAzyfyGmiyi0Q8MifbvBf32G/6nI/YswIgeYZVuwth3cnghuuPlvCQbWmjwi55X27eG8RCZKeoMRd9UIclMrkGhS0e1WKm4G9YLBcG22BrNu0OyXieX6md3NVzTV7WlPygxWi1+To3lkInutwBXJ8+erg6wN+PFiNpuukbtzLfQVLK0xEMyVD+AUcPPumVVV+WsGMd9iUe/N9B/6FybjMMFZkDFfn61HOtDZHcB+H6IF8WqnVYlVEasHVk+HEizMbaAmnQ== 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=6ioJXhm4BCLM8BALlGowpsnUFisFvKpE0TM06zmXS98=; b=Ok98fDqKroygLthkO0uXQM/nBcbVwFTZY6IB6iwTTCzpV9gfkuAr1796JXJYCinEMRVCqyrHVpXbY8my0StMx5ERl0zAmbBgGesySaycZrgXDGEHkdoOCiR7khGDH8z2UkxYkxEpo096J13JddM+GMBEYxX6TpuS7vlFdb0BhzMUVl+hWjCwTaD2oM17poRFebr+yvxVB8+DmlxGPGR4T6Whzoc6Zyl9vWXAddV3XMkODbzmP56Ph9epm0Gif8w9u0UNMJDUxCjwnofRpgfgPBdONX225o1gU7U5NiGKYgPNeJ4n0oZUg1PyaqMqDH7vtHP23bbEd0L38Z+/Sw4y3Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0242.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Sat, 10 Sep 2022 01:08:01 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a%4]) with mapi id 15.20.5612.019; Sat, 10 Sep 2022 01:08:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 03:07:21 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [7hXnmdOph0/CYdzO6QyHPERROVAGYgwb05qTJX1znes=] X-ClientProxiedBy: FR0P281CA0102.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a9::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220910010729.2961339-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0242:EE_ X-MS-Office365-Filtering-Correlation-Id: 986075b9-a0c0-4aa3-2b2d-08da92c8e804 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKyiifK3O4NmONuSB5M1PIcS3tVVBrbnBxFL+CsC35Tz5clFt10064YVMuixzUQtWRLOsG+hjzMvnlj49T/aveCTkKBPOilEcDlJbB7VTsmivexOHT3C+ALbT5BmgITVRy1hWjzuBvRw5C1/wruRXfpANQ3XJ+IhXhVxCOo4yCyvlUB+L0v1hdhYSJp3XpsV76PEIZBBtexXOlX0SmBn8/dEb6Vi6ohrvyDskWicJ9TwkdivB1BC42hnX2zlZjAhusZSO3eEB+yy1PaVKyp82JYDmSXzknXTLP17jtGofji8Z+Q8ERRwyqTIZGN543On7+ltd7r/Uxuo5JFbilApZG33MUgsMIwxJkbLvXM0kudXp01in/baR40eb8r3zCRBmIvNTUoKmzdWD243stv3kLEeZA4oXWPsW/pF1qQPLrAaiqlO/qIG0MgtKGVmKzPux3WS1wfYc+YI4H9bYDWJYulE0XSlsA7surJAOaIhlJXgPHpf8zsdZrRA730zn7uG0YuWsHqju90D3OJW0sritCiEKigS+dgff/nZi6lxjZv5s1wqCrz0mZnALAMAbSyTvrzIrJLgScHQR6MqKr5xpb+r0hwjKeeuDmH0OOjvv8vVr0TNQ3i7doMhhkoJUnh+E447Kkl5rxWYo39Qu1aebLCAwFL0rH7yq/iPwN4OAsn89M8qS0+EchIDVPFzm/5GtV827X5MAiOc6y4vFgLORYh7t0dp/174G44= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CgcguxB1btla7jlhqw96r7Deg4R/NjORsAUBMUGgXOF8mvY5Rph7wyP+wa8ti9YcTVQI6GazyveHlwwfCwqq3IbLPaxExNlylRacrfyb197gofTao33w4869qO3BdGnvUUHBYJmH8nTWPX3aabl99jUSZzR9PLzKNICZBH5aLNfuprGYnAhl6izKCf1NpDnDDY6SO6Ac4Z7xvWsaNX99EExPmXfzHD2iV9NDSkGapDRoJXMXorsJUVLuyjWTVflwcK3nmPQAbFrqWRM2ux4pqJ1yImSNhY48wb6NyM3KvYmnbkzDXvmC1IGoW+GZAUiU5XJSuEHhP28LVBHYTNsB48yNX0hwRZyg4MEMyWlYYPlKVKkLQMjwVs1rPfI+ykFGx9cxutauRYPOSyYNxeAepXj6X7jTRldBPEvbgUD4yCx5uRvIwmkFC0zDjcyOKmbVilVjCFXSGSeFjJDrfP/XHqBHc9e32MDK7DVwdTLOAB14vVxqPfr3OrykM9bCo4khfByYQnu6gLn6Xz1lM255c6YUmu+9+iPCDVe8sV1pFQlXC5GoeSIxedXoU+XnDc/aBaeyZFJYLi7pzcEFlyVXqzn3oJN35gC5uofzEzg5uQvJDYb6PHPUMzOCxJ88eVQn4daFQlcXOUhovbIJpZtHEA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qRy+rAp3aALEUGePZlVlDonl7Kmijo3wVDcAWnQz7v5y8MKFyRc5uxpTIMoon3vSl7UPKYbTYAHR1X66yc4YUzFlkVycBF5b4otYGIyuCbJ4NKsv5yqs/bz7QlfC3doHNoiB8kwXo8XuLMkyQeqqcXWXC4Tk2nYDfA5KioWHCAVUFHAUDFEF1YaQbRsGzUHDv3RsSc26gV9mkPT8IVKlhrxWKLvaPjJCuBcLS4GIxLo96nEPD3MlzISI7Wql5Uyo663s4aaKc/V36KfsCUDlIwixBDeVFbX24hclK+yR5jd2khPySXaKOwr4/6zJ1YQ8NSl+B8gSI6lM/GRZ/rDuH4TWpO/fD1X6ePm41caWzsT0Fg1m9f9yK63rDoFqta9WxKs0emsAlHQyA+rAKQhKlT8Wb6rTnBAGCxQcj+QucRjlbUc4iAFYLh2/KiE1IquGbYzOSffNrhfjJw+Gxb5/NsqGngYqzNoqwjAnp4QXTonz/8T1ZM0fYnrVLs8VCJd4KqtVeHCjQ1pR/Mr5rcwRzZr6hahCKstk4F/4Sz0/svMms/Xo4ajbYgf4K855WjYxO7UlDU1Mti2RIq5mVp882Ze3a2CgIFGiwVNlsUwDOebEIEEiKZD0spJP8BHXTZHVEw+5d0J+kobdFZbq+e56OeWIK2e0BH1NfovqvYIVSRJM9DtdAvTmUfwXnaDrBWVyna3myWMWkzxkmlatEQL5ks3yNNJ49E8MVtJykdFKiyXiz6F4ENtynwEiZTyEETWrXTxsSdbCmCkqd+4faFHqvqi2hQJWgllssYE9I6pXhk3BWnUVAZIubfImTTrKRLDVAkC3cGZjKQqtiy3fS/LmcGYnySvP2GeDeYN8HLB2uiUYpMyNJfIbFSj4C6qXWlueeupOKk1ALiTrZU4k2DcOoAH3tN8gfAQMZD7liJSWgGkG0WxBpy1rXTlq6tvJIDslTFVNR/APY/rFGvsY9w+Sj6z7uBv+TGeNrqEsIxkZjECpGj0dH2mLQk3jni/Qf1nc3b0giLqdHzucV3Tfe6D9SOnOSh5cbvx/LsKgr8sJ18sa8Q+oXif3uBuZDvTi2wsrwcK+0wHkcha5SbRTocM1Ij6N5VV4/XayjrwWENWCIfG4UP9VmR9xA78QJ3eq75cuXVdE4VNa5jiQmEi+FJPPJrE2x8BeRY8xRIf0G8qN7kkrl1BfmyT+o7W8fg0rkbXBSMey3ID/Eas0ovGX6gMxXwKMx69iUeAvqFlekdxgwoI26miQZZL7MqUmKZtMQpmZdLs+IwqeD8v1cNT2uxQfSkxJrPPK85zC+yvNSRAQkU2kk5QvmwzcAkEPryzpxh2a X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 986075b9-a0c0-4aa3-2b2d-08da92c8e804 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2022 01:08:01.1766 (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: PR3P250MB0242 Subject: [FFmpeg-devel] [PATCH 10/18] avcodec/vp8: Inline num_jobs for VP7 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: 8ZY3duH8ZwmL Always one. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index dd3d38d342..ce824cec81 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2395,7 +2395,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void VP8Context *s = avctx->priv_data; VP8ThreadData *prev_td, *next_td, *td = &s->thread_data[threadnr]; int mb_x, mb_xy = mb_y * s->mb_width; - int num_jobs = s->num_jobs; + int num_jobs = is_vp7 ? 1 : s->num_jobs; const VP8Frame *prev_frame = s->prev_frame; VP8Frame *curframe = s->curframe; VPXRangeCoder *c = &s->coeff_partition[is_vp7 ? 0 : mb_y & (s->num_coeff_partitions - 1)]; @@ -2491,7 +2491,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void if (s->deblock_filter) filter_level_for_mb(s, mb, &td->filter_strength[mb_x], is_vp7); - if (s->deblock_filter && num_jobs != 1 && threadnr == num_jobs - 1) { + if (s->deblock_filter && !is_vp7 && num_jobs != 1 && threadnr == num_jobs - 1) { if (s->filter.simple) backup_mb_border(s->top_border[mb_x + 1], dst[0], NULL, NULL, s->linesize, 0, 1); @@ -2533,7 +2533,7 @@ static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata, { VP8Context *s = avctx->priv_data; VP8ThreadData *td = &s->thread_data[threadnr]; - int mb_x, num_jobs = s->num_jobs; + int mb_x, num_jobs = is_vp7 ? 1 : s->num_jobs; AVFrame *curframe = s->curframe->tf.f; VP8Macroblock *mb; VP8ThreadData *prev_td, *next_td; @@ -2566,7 +2566,7 @@ static av_always_inline void filter_mb_row(AVCodecContext *avctx, void *tdata, if (next_td != &s->thread_data[0]) check_thread_pos(td, next_td, mb_x + 1, mb_y + 1); - if (num_jobs == 1) { + if (is_vp7 || num_jobs == 1) { if (s->filter.simple) backup_mb_border(s->top_border[mb_x + 1], dst[0], NULL, NULL, s->linesize, 0, 1); @@ -2608,7 +2608,7 @@ int vp78_decode_mb_row_sliced(AVCodecContext *avctx, void *tdata, int jobnr, VP8ThreadData *td = &s->thread_data[jobnr]; VP8ThreadData *next_td = NULL, *prev_td = NULL; VP8Frame *curframe = s->curframe; - int mb_y, num_jobs = s->num_jobs; + int mb_y, num_jobs = is_vp7 ? 1 : s->num_jobs; int ret; td->thread_nr = threadnr;