From patchwork Sat May 11 20:51:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp299831pzb; Sat, 11 May 2024 14:00:14 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWItzzyuit/s8T1GOtaMhqof5dX9fPJcvXiPYPbArXfGbfLt3Af8AZVICCtVwEf5FKhICAEmn/Evh9cJ1zv3/R76bY+hfidmRHmrQ== X-Google-Smtp-Source: AGHT+IEQRtXkv/8FuNTv7FT6nBNj5nmIfgTstzaDU63bmni0xZp1J0V65z/MOq/4fKIEPOZGn9HJ X-Received: by 2002:a2e:9844:0:b0:2e5:5c83:3359 with SMTP id 38308e7fff4ca-2e55c83336emr28388971fa.42.1715461214136; Sat, 11 May 2024 14:00:14 -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 38308e7fff4ca-2e4d183c949si19900961fa.478.2024.05.11.14.00.13; Sat, 11 May 2024 14:00:14 -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=SDNTwsF5; 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 1DFFC68D7FF; Sat, 11 May 2024 23:55:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2022.outbound.protection.outlook.com [40.92.90.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1614968D220 for ; Sat, 11 May 2024 23:55:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Mo1AJSxHcddMZ32+fVyLLV/9Lif4flPlbEoVAulId9XJzxzw2qEPOJYduKYdh5wgtB68Nz+wVElKzhRA0+FbWzOA6iZ50+5kdeuuxCzoqlDeR5cn0DMFshMZKarMtWfOPUlutP0ZSp3Pymzn9ljbA3475F6+grK8zAu1xo3jUzqlevkquMxWdcVIryBjIKo6pxvANabMx3+SvJlY/nSECGuU1OkZ9fOXMCk6rVX1uQRFOZSDHRenCoc4EM8l4qdcanIcrmFN5fdszb4C25+kzPc2/24B26dp55cxkB6Cvw6Roi1TY9469xw5sCw+ZQOJlwjWSK+JOQe6dKObGRPWNw== 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=2U9G3Zq7sFoycJRcQ7kwMoa9MlnWC7yIdLGm4xOUREI=; b=SMkQd3EnLXRCDrUx70sZwwjrP4D+WF641Gz/6gXjzv0tBoeZNWLNanrfF+4W3WxECq3gWqFKmfwrD5HasZ/XnWMOO8bSVMqAV1w483G6rLLCnCFJzxeelIlit/e4vSyGh01Kc/N84Y2HGLwq0XkEDaxQjVFI5Pj7TULMmJKaz85ZkCf2/f0T/fCEt3eLwQ5nGaRzKTrNlUIDkor0QmscfgGzVwSVRRauZNTuIUwicmzNjuRHDpB2hGWuAgrqKkuHYzO38Yh2MWVPuZsO5oHd5tSR1HvU7bcxVny+z4hbP8Qa84ijq8EgHP55xBBYDs2psdxqzcGjUp3YcYfNSC6qCQ== 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=2U9G3Zq7sFoycJRcQ7kwMoa9MlnWC7yIdLGm4xOUREI=; b=SDNTwsF5tMeAINKP7PUa8y1BnFI1gzOuy9gbNGIuopfB4qtVh7LC3v/qqmlrD5glsvNNXZ6GpNoBvvR2cbtDXfkYAvGuspdSosHPlGN+2RITflsHLHgPwWZ9BHWsniQtn/hOqUJjFgQd3Nn4mJYl5hd25+WHQU+PAp++kRAppQaLOCd4oD0vVsKzl8a/3LvMPj9QUQyL+Iu1VqxyjKmr8gkSYZpA4GWd81tBYQpgggwyTrTu0dvMqB05bAp6JBvVcfhR2yj83prfp+mwkpZ7txQu9TQtIiJ+qgxWKH6rKXJKCocvjknNsbJHbz2yE1fnX694R1KAIvSgWVfe+KTvyA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0070.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.55; Sat, 11 May 2024 20:55:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.052; Sat, 11 May 2024 20:55:27 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 11 May 2024 22:51:22 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [LK7jUsTbpkUiiTG5d8VUP7N9YqPCEpvsBkvCNhBPA9w=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240511205135.2411886-57-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0070:EE_ X-MS-Office365-Filtering-Correlation-Id: 612f15d4-2c4e-4e7f-933e-08dc71fcafa8 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: 9S9uARaISWv56K2YzQ9Wa0fWDmbM5HtakoXs4C3EZFuaIZChqV8WJcPZTwh8djsHv5MIgx0M0SUrpCGH01t8O4wOTi9hI9q5I5efq6r7oh6rN1mQVKDQh+irtWJm8OB3HUoG/C1hHCu6V/XLUKemzScaTaKIu/Q6C64bsCHz+hRy3a2wsmpF1NuVpvW25MyDvakFmUiqL6d2B+wwQNaCWBUr1gciHmR/3Ua8/qMyKcvHp/zQpyqvAvSHeIIKQguNvT8i5uUQp93nfdVpTE2GNvKG7UfOZ5a9Fu+gvd3FD7659+S7ALbkd5V82+xV4BVflCVi+23KeGkYaBengjInih90hrgymHBmHiz+dnRWDjgIPUMyDmH8j5gLbfphmEsvqCfsJWAz2zBOjy3WFQRgWo/cuo4F4L9J1XyPsOCiGONcIIS5bC/3m+kXTYAhfLtnFZoKFBkeyyB3saE3HTBD7F7Qnw8zO/YRGZ1uWX8CxWmdzGPgvMK5/etKXy7KyDvHs5ALHGb59jcrTjKssP+9Zj6wR/tMytTMXqKfOC+WYbiU7I5LAid9qMV9QXEBoCxrYBvRk5Wi2GtJ6Dqa6KhGH8l/o+8nCrvM8c7JSyKXISABBMlDlq/UbX9j1Jy24PXe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GxthdX4apHl+zu81l7560gTXOYCVtY/ff2ssKCIjliVWF2Czee/Gb2lU14yXhPAmiihQ3H3Ei5b/qyRZ6B3lyVRoFkxpALHXyxwqSfG+eTP8K3LwaM+vnMi6dBfTlyV9M4+it77JBhIje5TJXTAlG+7O22OiZZKY3WTy//QVoUlVz9hr5cnITKxTZqc9hzC1TrZnzwX000JQPyETDievigg3TFn57GgAbEgeLUV24cwxf8vuZK4vaOUwIgMVHeHRIv0v04OOud5YCBV8Ce8dGKEDyiK4Kvd3XAw3yxiu+uGsk9QW101mpQMjufmny3KcG37taH9xQempXBF7hHWZYq2HAQfz0ZOHA1VDtrqwgLXRFVQJGjfXh6qF/AuRV1f3d0nakvoDseFpjum7Np7jO93WLS2tdPvhZQ75VVQnah5karXbh/DHtBIFg85VnbrUSOP2crI1fFUIigZctvYzkORvO4KeZmDvBjLa/CWtOMMAOPfZ6hRHZ80gqGE/u+fnphX8atAftcTwq7K7Y4CkESZ2pRfHZkLijQ2fvqerqQ6tcHiOkNdc0vbn3f/2DHFj3R9NdhcIstjApnvMx/+eCmU8QJ9AeM0xpYFK5M6dVrroBr8n9tr9YQhhLIsiXd3vWFAlwajNWAxG8Ch34wY7HdLG2Lb/2FTk8/4qgN8tREERZezlj2eocW0tCQJYwhwI3XDBanajNHnEHuuNqQdCTdNx9yqB/xayqwoP2Inm81I83XqSEQr+93+0UIT7wy0gg9/bhsFZh7JJIFgc6vz3Iw5kBc1DMbZKyOfc6TvGNkFCX9dKvOugnQ1NYGOg7DWMo3PDkNQjK6sBVXVrFBw7924dwa5OzWIATsyfx8sbWAQ4bEdR/ft/lqtuDUG/BGUYKyDA4U4raZz5L1vJfpJ2YStcl9jY+y8oTaZG+xGa+l8+8ulrelSyygk5RJbuWA0uWpJujzyUcZ431VbflOTbyVFncrWfU2PBP9ueL9V/OTXJa/4VgdSDCmjG8ImAGfZO5ULEhFBgpqwLpqxEllRBpvU9PwAer/8CkP19RiHplwDpur83YvK93OCEgC17QlqyVxaWWCX4q2sox+2FrITd9f0SCl0TGwSNuQu7YyJTREcDU176MZWLVh5UvOyCAlHSGwTyCqsVcEFnWnDWx9zw+CcJqBY0VhCH07i00moLIYNS19ahUtvgjOoqaAqYRYYg+9lO5jF0PPCNZ+bfIsr+n5WxCCYVUrQH29F/oj69Yih0KeTnLIuF0TzF6q2Yoh/V+t8Kro6CzhawYBRznCnXqw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 612f15d4-2c4e-4e7f-933e-08dc71fcafa8 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2024 20:55:27.5027 (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: AS8P250MB0070 Subject: [FFmpeg-devel] [PATCH v2 58/71] avcodec/mpegpicture: Avoid loop and branch when setting motion_val 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: htL/u2SuaMFt Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegpicture.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/libavcodec/mpegpicture.c b/libavcodec/mpegpicture.c index ea5d54c670..9308fce97c 100644 --- a/libavcodec/mpegpicture.c +++ b/libavcodec/mpegpicture.c @@ -223,6 +223,7 @@ static int alloc_picture_tables(BufferPoolContext *pools, MPVPicture *pic, for (int i = 0; i < 2; i++) { GET_BUFFER(ref_index,, [i]); GET_BUFFER(motion_val, _base, [i]); + pic->motion_val[i] = pic->motion_val_base[i] + 4; } } #undef GET_BUFFER @@ -231,6 +232,9 @@ static int alloc_picture_tables(BufferPoolContext *pools, MPVPicture *pic, pic->mb_height = mb_height; pic->mb_stride = pools->alloc_mb_stride; + pic->qscale_table = pic->qscale_table_base + 2 * pic->mb_stride + 1; + pic->mb_type = pic->mb_type_base + 2 * pic->mb_stride + 1; + return 0; } @@ -250,13 +254,6 @@ int ff_mpv_alloc_pic_accessories(AVCodecContext *avctx, MPVWorkPicture *wpic, if (ret < 0) goto fail; - pic->qscale_table = pic->qscale_table_base + 2 * pic->mb_stride + 1; - pic->mb_type = pic->mb_type_base + 2 * pic->mb_stride + 1; - - if (pic->motion_val_base[0]) { - for (int i = 0; i < 2; i++) - pic->motion_val[i] = pic->motion_val_base[i] + 4; - } set_workpic_from_pic(wpic, pic); return 0;