From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id AFE804B744 for ; Wed, 12 Jun 2024 13:57:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10DF668DAC9; Wed, 12 Jun 2024 16:57:00 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2016.outbound.protection.outlook.com [40.92.75.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BAF8868DABE for ; Wed, 12 Jun 2024 16:56:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h8jAyX/fJOpkqCfzzgvgJH0Dd2yE8q7+wzWMeAM3JkhZsTXn6/dRF4eGd7VY9xju920igMndeiVH82wUSqx5uF6y0BDBlDw4We9uYL2YRryCiMtXmnzrQcaMM79zyzvlVguIaPSjNqve+xcftwGe9uGVDPypW0/bF3jk+DAmin3Mhml94WwaNW8z98GPN6xkgLdWDHH/JOS2MPHWUqBvW4l6UKaO4BUmE7SrPrb5fP/t6zmd9bRoiKry0EYTAv9sSDnKCeBF77gRpAu4rWUfgQ7TqbqwGddfX0CArtyrVlASeclxvSyXd7DBph/tQqWosinOHUfp7/kNGYweklT6aQ== 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=rqy0opI1jJD4WDu8zFDCnYEtq96TGTYFDCvPRGv0yS4=; b=f3Kw3pQGcJNzbmpg2kjeNG66vQCAHmi7GEfO2e+SCpVW1fOJV3n9iTCHXVbfUjTtcCYMnpwdVebgIaHscbzzJDkdyFJdaKGtfDsmeoUWgJacBs4tTBuxAt0lIdSGx9zCUEiIkh8dwC6+cxEDz+uRc6tRiEZsVkoGbC9PRVyKv3g2EarhyLgWdH2lejkS2vjsDOlo8qw1G1sy+bkduSDOwcmFy+jnLANyn700f1ahn+z7RoKlrCIbOFKLo76DZvNj2pxToQQK7I/Bfz8XnjSp/EKLspsA+mWc+rvta47sHjQsgzw8J49FLHBjXuNjfb4v7zu0En+IEkadeEk3WlHrXg== 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=rqy0opI1jJD4WDu8zFDCnYEtq96TGTYFDCvPRGv0yS4=; b=maIyoqCec13nts4QlrDvY6+sw+XzNfZwqlfyD1d2s/HM4Bz3VEFTJGES+H/tcRCCxfz/xtgdcKsa4mU+n2o/7oeL7yBPFmwGuuP7tHRGfjgWqjC6pSHwWEjAgjJnozzwqhK6D4RpXV7PuRIJqHBRAn1c6Aa/kS4S+yLAeefn4kL90Eqw2nYHV5Am3fmCUs42iupo1+KJGXV/xRcyNJxgjVH3St4pYi436OPRuo2vxYwf+YETEEL+1J3AiSRxhMYNO2VO0hqOJjz8vygLG6h9MSMWC/Kb1Y2b0w06LDES8kr5hITfo5BA/Rql/V3nmdDzYPjlOgwcfrkj7oH31yNHPQ== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0232.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:56:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:56:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:49 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [HDETRrGPauO/fO1mJEMQachiYJvR2wPVisQ+G7dlhwo=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-52-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0232:EE_ X-MS-Office365-Filtering-Correlation-Id: 8e723e7c-c2b7-4059-db83-08dc8ae785be X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: D1NI0d2ALHUHCnymaiOf/DDASK3KZwn64h2I8OAYW2+OkbNIqog9eOzwXZJUkloFZHIrVIM1f5IgxhwLDAiGgXEN1Oz8EGBoEiyTbMkf3063ZTLyjJ43U2fBSWmHE8sZWvm4E9mhlhF4oO/J4ZzHYPodICZtXffDD/iUOinVVZZ0POswyjZ2BQC66aU4fR1GeGjXqv0SSI8QTFs7Wqijp101WDeFOoIsDejxyfVCnoO+fY1/PMD0DCBVaT9TvKfQ+zRmAaxnTkh5u8+kMU9LnPy1bUgxfjiWz02hdP4F8erdsadOEwIwvFuVt3rbRM118FDr4uDKfellAIjfEYi3sLU6QL/SK/2dJWvb972Kyn5s58n8VkNFHnv5mVdkslxwGyGPHEQAvZqdpjvwH1V7YDU5OO1COUe1B5XuIZidduxe/CKr0eI/aA/wtKLOuB+6Q2YLPIHUdgUKQQVGkVvvoZbz9Xmpuav7JKffZLWWdTvqQhsI+v585G6hIgGouRhxOxX79/CyzI7iMV+5GEK5i/5FY45D2TggtRoip/c/9th7u8A9XiAwNgQQBnqX4G3z2v57/OTtVh3fmCK5C6ex+1gM1uwRdTC9H6XdfQaQ/4ksLpMOYYin1iXgVs79DLJV X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?p5CpEhgwGu59Y69xvFk3p6LwiWfVY7aXM3ZdA4pA+CyfOME6W0cn4YuqfwAw?= =?us-ascii?Q?3fdMyC6OYDiUu0HbjxDx/vNn1ZJ7Ou4Pqu3Uc2f5neHseJQMEcDFTc58oyiE?= =?us-ascii?Q?d2vo7H++4GPHUoWVUSErln1b8qm8Vh7/INHXaxraOE/23ngudEjTtTTfgLmq?= =?us-ascii?Q?UJLswt5Y39TTN2zNOQN2aJakxQfXoAkB+9SXKvJ5ymUvZhU7pfvF0d/wkkZk?= =?us-ascii?Q?O87SkvFJJ8rmKLqpSrkyVGlstkun+r8f5hNNuuwioGc/QYZvF9jDRfwsrB/s?= =?us-ascii?Q?Eb8qGy6dz2cY5in1gRqAxxg2M5mGS3bZ90vIdXfCkrihWe2Xbfq7XJhcrhqp?= =?us-ascii?Q?4zJYypM0WAhQs9jDp9IccljdONqh6nLzPpOEq3tp/54FPwQJzfohrym82jRD?= =?us-ascii?Q?IEK8LzurZuYzM5x+TXm2cJ4NAYHp+YXaf5f4FwF/G4EPnE8JS43Ny9m5QX7P?= =?us-ascii?Q?QXTdZx3lUPm6LJeDsXAUQ39TE2NGAXjpc6UpgClfBUYoC5P8ueg0ftRxjodS?= =?us-ascii?Q?V2rs2zCKj01qajn9lm1gdYrs0PvUgkTb88iV373Yu/ZOKeaqt5Qm1p22chjl?= =?us-ascii?Q?TtPjZel7m+oS1B9FbaJsbFei1U8gme5xiuuE0urEp4/6auipE/rplV1IMNOG?= =?us-ascii?Q?cYr/u8QbY6Av4V/amScVXVihstTX4/P5x81jag6jIh3bwA8TQa4vAsv9NPqO?= =?us-ascii?Q?NIob1iaXARVaBYJr7zcG3uVHctT+KN1Vn3XJ+vReDTeDVHBVuXCV5lNDIF7x?= =?us-ascii?Q?pLJNy/GQ7MZOXWfrjjnOpMMOpmGoIX7teDVZ0wzfrE8Gff3c3NucSDaiCtts?= =?us-ascii?Q?D7DQ6pPRrZW4fm+3iaHQTq/quBZC70uFarqK/nfG7XootGmuYFWDEOXszxnZ?= =?us-ascii?Q?u+AZBvwN6dEZDmOiePbRK5OzRpk4Qg9Cmj48F3w2gl+MFGhut/WGoxwAHdWW?= =?us-ascii?Q?s7x9n7kJE6ApXIWs/mASOJRhiijWrPwwwc+A+P7czo9XmHFo2CMGlBXKgJ3X?= =?us-ascii?Q?mqIx3+HlHtQBMl0yMn6yv6HF/lMQD9H1srv6RA4eo+ueg+zVnCn8IoX1T8VD?= =?us-ascii?Q?CHWxXdLVEdVAXvzL1P4DyHRZdoB5wpim3Jwt6HaCloSm+Kql03Q6Zs8uI9nM?= =?us-ascii?Q?drr1a74y2MPqTAHoWaFRpc3g09ihtgpPx4mtjUMtcLUAfAEp3aPnpHYIogbv?= =?us-ascii?Q?fDjKIwHk0EwTUrqysd3jq9WV2Y5O5e1rKppYi20qk9eWczVkTP83FEDXO3Yx?= =?us-ascii?Q?lZo00lpcdVPENdHGt9aCqnPer+mkQJXfCN1u901lNg=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8e723e7c-c2b7-4059-db83-08dc8ae785be X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:56:56.8266 (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: AM8P250MB0232 Subject: [FFmpeg-devel] [PATCH 53/57] avcodec/mpegvideo_dec: Remove unnecessary FFMIN 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: No mpegvideo-based decoder supports lowres > 3, so the FFMIN here are unnecessary. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_dec.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index 4e279d9fa8..684f31947c 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -483,11 +483,13 @@ static inline int hpel_motion_lowres(MpegEncContext *s, int motion_x, int motion_y) { const int lowres = s->avctx->lowres; - const int op_index = FFMIN(lowres, 3); + const int op_index = lowres; const int s_mask = (2 << lowres) - 1; int emu = 0; int sx, sy; + av_assert2(op_index <= 3); + if (s->quarter_sample) { motion_x /= 2; motion_y /= 2; @@ -536,12 +538,15 @@ static av_always_inline void mpeg_motion_lowres(MpegEncContext *s, int mx, my, src_x, src_y, uvsrc_x, uvsrc_y, sx, sy, uvsx, uvsy; ptrdiff_t uvlinesize, linesize; const int lowres = s->avctx->lowres; - const int op_index = FFMIN(lowres - 1 + s->chroma_x_shift, 3); + const int op_index = lowres - 1 + s->chroma_x_shift; const int block_s = 8 >> lowres; const int s_mask = (2 << lowres) - 1; const int h_edge_pos = s->h_edge_pos >> lowres; const int v_edge_pos = s->v_edge_pos >> lowres; int hc = s->chroma_y_shift ? (h+1-bottom_field)>>1 : h; + + av_assert2(op_index <= 3); + linesize = s->cur_pic.linesize[0] << field_based; uvlinesize = s->cur_pic.linesize[1] << field_based; @@ -666,7 +671,7 @@ static inline void chroma_4mv_motion_lowres(MpegEncContext *s, int mx, int my) { const int lowres = s->avctx->lowres; - const int op_index = FFMIN(lowres, 3); + const int op_index = lowres; const int block_s = 8 >> lowres; const int s_mask = (2 << lowres) - 1; const int h_edge_pos = s->h_edge_pos >> lowres + 1; @@ -675,6 +680,8 @@ static inline void chroma_4mv_motion_lowres(MpegEncContext *s, ptrdiff_t offset; const uint8_t *ptr; + av_assert2(op_index <= 3); + if (s->quarter_sample) { mx /= 2; my /= 2; -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".