From patchwork Sat Sep 10 01:07:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37818 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1245619pzh; Fri, 9 Sep 2022 18:08:42 -0700 (PDT) X-Google-Smtp-Source: AA6agR6QR1VGdIFKR7RZhdcQKJjIBNk+o7iUQvZ1xVURozJfwjh2rVaVXwSWEBphcL0t7/CORr3g X-Received: by 2002:a17:907:7242:b0:741:7cd6:57d5 with SMTP id ds2-20020a170907724200b007417cd657d5mr11524688ejc.419.1662772122109; Fri, 09 Sep 2022 18:08:42 -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 r14-20020a05640251ce00b00446b33b356asi1698763edd.502.2022.09.09.18.08.41; Fri, 09 Sep 2022 18:08:42 -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=YcUGxRT9; 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 A816F68BB0C; Sat, 10 Sep 2022 04:08:03 +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-oln040092074090.outbound.protection.outlook.com [40.92.74.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BA2068BB14 for ; Sat, 10 Sep 2022 04:07:59 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=alcjqa0poCndbKHRqtGtPX+cVVU5s+AKLMA6Nwjc0Sb5Mvz2Oc6qEY+yevq+0c0E45UrvMLeKteSZ3j9u+LukHvQXYiiD9y0Im9M8wnsEj3nPZmwFk9TTYaQgh1Rh6KwLh7tfA1+JZ3GFsBNybQ0yXZeYu5K9YXcvQRqf5Q+3CHknNeOuEz4FZ94P/cUFQ0/Q6P//D/fvOz3ZV5OYGylq8bzIJouMrm3jIlxCRgj5r8WCTzV2WcCsVIwd5Xc6eHAShaijpgf0RO8rDZbOniM6LlZ70vrJlx5T/zUO2QNlzqrJTn5vgbp98pcMRHm8SZYaNIdc4PLl8RTZOQ7XDtQWg== 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=IW7sZKv5Rk5OWIkQGsu5f4VQwykbaNQ/c5PAqpeJvwU=; b=kAUqNPDsEB+J4pryZj2EgyDrBEhsIBtJ3RaLidqPqhBYHggBpO3MVDZi9CwG6drPFXr+yXc3ki6YACz772UI/R4Sh/Ihqg3SyOMMXC7A2sQ7iSgU66AutyG6gGKTvM5WzxVuRhH4lOVYP3dP50+4+Cz1UFcVVmjd+y0Y9akCHnCq6odQTOFyuVUFazBClb+3JFd/5PR+sH+hpBQLW2MzUzyJA5kdQ3ycre5Q3DZAp9XXJS8Wpuvpckb52qx0ONMRdP6yy7vw/ehcKeD0lbp8oyy/8MwL2yeGQ5LFdVG0hCjFN7PpW1UJTZOsarAOGfBu/etivjnbsUrUA5I1tSmJwQ== 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=IW7sZKv5Rk5OWIkQGsu5f4VQwykbaNQ/c5PAqpeJvwU=; b=YcUGxRT9lPnUjFlzO7gGJylDk7pGVmZ7uRGtPc5dHxcxzKfdZpyTzCdBxWwc+FRVrt843W/iKrJzQclh9zniVGgO9sMjnktS4bMT7PMDRjDv1StYdJGAIzTV6TZR33wuGy3JGSt2EFhHCnWll9tVDWYdOl0HDj45+zf7wAxuU7Z7rT3bwK8pE3Iw0JEnfd+dis94TxlZnHa4+qC/IKK7PsOW8ZNLCYFAHQElqB3qaysES+vWPQHXt8qaVujOBB829PRO3AF07gUIxLzV9mMImFPQ85hsTCpwk4yzhYkuRPhIaN2W1cWXoQ+mYvBPn1q4DXUwbcgxh8D6HgziyL6xlA== 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:07:58 +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:07:58 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 03:07:19 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [LdfsX68jnSxuAKoMXG+1MOy2VIvYug5YSDrJ2HVt2bA=] 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-7-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: 30b23618-b78e-4999-4849-08da92c8e678 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmqc989vEjNQgjm661f4SJJ45fyxO5AscQNMkOibRheMxHFuBstCvHDVey5XvFpHPbHzt2K9rKKG6PxNSWNoXMw52gMp9IrCP/kng4xF+GSFu1VX/MLcrImYzESA4VrdOpzJtInsAiVoFW3YJptEwxnRq21lnkIS7CYpy5cC6MVbvOzm4u3NK2JWTZbxvODNWR6ilkP0gxx0mtRjvf8sHCs5YhL7nZnkpO5WxrwmquORpD44nyz/NJhAnTLvMyRdb9HN4Dz0cSFgoZcEDYYBuGeUhuzqFM2B9drGSu3qJN3bFU5bvUZy/A54AJHnAw+F1D7AeHPEZEjpzQxU3egPIc/X1A7OVhGyrqD/t67mz8FN46NcXfKd75rkLRf0xmOav0d1RUAZIrzs9tVIHKsm3x3y3Z26HRhUtM7U2GNvubbZEoSQflMqsm9vccafS4FrPD2K4lvqpo7sejyQWGYtUts2W8EiLGYZTtBwojOffcXJbck3BBzawNU4drzlwt/+f/EE1fK6Ok0O1ZEwnmcgSbuxyG99/2vfhS1R73ATr/Xgv/w6n3QsoQg7D0wDCS3ifh/VWn1Pdwq3ilZ2tHfO2JrtDJAAF2+xUOWGYI/IrMjKGfcK2/ifi+DrLrNY6juPyxXNUvHLRifRd+CEvywnRY5TDcJZE8sfUCiqtY0eeXPQ3ApzeKTm5aWm/IByHb4ql7nEkjdtBPRjnHT5WtQgKDVVMEQUCa1VDddxkQm9iJE3pLynJyRehpKhwPrYDgITXG4= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5ol1IBnbUNDaegqDHiryGgBiLIrk2MhR7/j7VjK4Jrbwg1m+GKBUdKXXNnx36kwtABmHHPlnt+x0I8JHGa34+MoV426SCgt0cGOlZglVX+XeyhOy0Fmhi2fwPtsCkUYXs8VTIHR2Eiy2MUt6wyC/2rpducW2eH/ZiZgxtj8NI+6Ry3L41WAF1bmUUervCi64EdSPigO48jT5/s1ArmlL4VnXxZ2q6vxOhM50XoxbjrxISvpcvImiHy1oOpSoUdad7I0bLI9+ifZ27rT9XWQJl0OyMKKPkSCkZqYgCDOtOQtut4BDARjUTqXXPWDlkwjJt0Nl79NTAUVCQJ+IjZDZnhWFi9f4X1EVyaIPzgmlAPKFzVL6rMZ5aRWd4Dpku2P7Jj3nzoQ4wEMVFxpjlVckTjvsts5it9YdeprbMcRzTGHjvABQrguhxhqx83Q6Z4jmltasxo3eziE5zVD/He+lzOpd7crNpiGPGUcgExP5gt/trdOZJOuQqtbNv8YqpqcVB/L0K8UE6qK0fX3uXTK1JmXhbw+Wf8ItuUu5O0RfaNVx0Z5dmFLBBZMB+JKFbWyqsr3e5NHbrIHU8M8wrrHFXD/p5EfITsqKxk14qNNLgFdpYdR/sI6Xhkd1uFuIcOA6aWtpwTxPnP9XCmebCIlGbQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: w+lRmVqWwG8Q263JQ4yzC4rOs8m/EBmcDZbqvhJSsdMkDG0Ms7kRCQVBnnpC6kLc1IcbXXsgcTxlLYZFtu/CTRga4YFgBGgolLLfMIQwazwUAFcnoEBMZS5mJB55Pv75ibTvJZz6AQd2stJNkyiUSTz9OeabkzpEfFzAk2FBftbpHVFs5VTX7lWRrUsGo/zZ+QFiloR4aDHks4P63+3+qv1rrAlVB/0Zy+1SkTV+55tJA1F0k1QawE9hW91KgGZzsxALIwbca6wkleE4kA7+xIiP3itifZrBzM6a0z8KGDLMyA7fRAwMMTyNdRXP3tGjDrCNEppJeoBi3mZ1PeP519mTDHtet/M0SEwtracwa9VEHI93anDh1KpQddLDXkkM+kDtVV2gVTIpIt+Hn8XPVXWkrocKFxZLMsWdf8CXy5WuwBvypjTc83y8Avz68sugQxo03XazuQauYSqW5jMX/945HPNQWNwpRi/OSoumWDUO5M3kze75GdL08sJgzC5FMduISxHwxknQggGaMeQ6FAKo9xdJiUBl1FrpzaetWZ1+hWYrs7h69fMSLdlPN2bTTTC+ztIYOgH/mM/K+WaRWDYzKkCBzuEKITa2uvPHbRjoTVG8zstxpthEkyxpMf1jOJUT5V+EfuegVNmQEIuOizjsIs+y082U4LEnungo5icv2fe2y1G2+dcA4bhSJQjgO8CH0gA/aYIz6rLrWnrIftGK9Wc8L55krjrStl14eRulfhmGNTDaEVm42R6NsvU3SNGPP7904lo86v/Bjov4SIyHekcX5d1EOPBZB+Jt2+TKxpIrU1q++LkyXCcdmWmQgmmzk1kfqIHPNRpClU+h8NEcaX7Jkqf7ugYC4yuW3GEVeAKolOMMW5rLX0q84duMRiQstT6iWfZDVDCnGChoQI3wGihB9pjDVI6tDqCg3lebY70cYME9rBvdBxCu6sKImMM5SXbckWyoBRtHuEOInho/7JoNakAi73XB61jwTNCX4ZQWyIU6kWpDT1Fn76yKjO8ah2rN4+8zYIRofWuummzEEZeKhIobk5CLpPTYYGrQmtWVp5Swif08Y/qTU3s3UISWtOwbfheV4xmykaxGyezFA1UB9ff7MnvQgWVgk3W6dzWEBYxWxoPgFv6vg1XvjkIOya/WwhCvtgiINmWfNe+fc36jA13B6b6cwgLLhT0xcszSQtiyUWTXmdqxhSMU2iYqj1zGLlTUpx/DBIJV4gkhb1i8O2oGGLO0cDnbK++fT+0fuSYbyQpBDG5rTJDB877hmd0d7AXEmdIDosIyN2MZcqkJY1BEmDlPgbGYq2THaI5agTUNePyjYPYqOt+S X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30b23618-b78e-4999-4849-08da92c8e678 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:07:58.6146 (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 08/18] avcodec/vp8: Inline num_coeff_partitions 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: HhvyqGPyLac5 Signed-off-by: Andreas Rheinhardt --- libavcodec/vp8.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index 5ecb9b07e5..f5c05cd84f 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -2398,7 +2398,7 @@ static av_always_inline int decode_mb_row_no_filter(AVCodecContext *avctx, void int num_jobs = s->num_jobs; const VP8Frame *prev_frame = s->prev_frame; VP8Frame *curframe = s->curframe; - VPXRangeCoder *c = &s->coeff_partition[mb_y & (s->num_coeff_partitions - 1)]; + VPXRangeCoder *c = &s->coeff_partition[is_vp7 ? 0 : mb_y & (s->num_coeff_partitions - 1)]; VP8Macroblock *mb; uint8_t *dst[3] = { curframe->tf.f->data[0] + 16 * mb_y * s->linesize, @@ -2793,7 +2793,7 @@ int vp78_decode_frame(AVCodecContext *avctx, AVFrame *rframe, int *got_frame, goto err; } - if (avctx->active_thread_type == FF_THREAD_FRAME) + if (is_vp7 || avctx->active_thread_type == FF_THREAD_FRAME) num_jobs = 1; else num_jobs = FFMIN(s->num_coeff_partitions, avctx->thread_count);