From patchwork Wed Aug 17 08:53:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37323 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3d0d:b0:8d:a68e:8a0e with SMTP id y13csp2339268pzi; Wed, 17 Aug 2022 01:54:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR4eKyWWIvyMjrjl08tAQBJ2iWL3tEwgX+OVihKnG5ATElTtIm3TG7oCrZb0ZIunogp4ubok X-Received: by 2002:a17:907:1c01:b0:6f4:2692:e23 with SMTP id nc1-20020a1709071c0100b006f426920e23mr15688111ejc.243.1660726453543; Wed, 17 Aug 2022 01:54:13 -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 hz8-20020a1709072ce800b007309eacb2f9si10167460ejc.468.2022.08.17.01.54.12; Wed, 17 Aug 2022 01:54:13 -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=h8FWbuI0; 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 58B7D68B7C0; Wed, 17 Aug 2022 11:54:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-oln040092072024.outbound.protection.outlook.com [40.92.72.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24D4C68B3FD for ; Wed, 17 Aug 2022 11:54:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BcmZD1azUqllp//KSE7p/+Ak6g0Irz+xkMpMJ57Vrr9jIRk48mL4jCywLc8+4/QBZAiOczWVSFeVeeLaCV0Ner8S9vDdArDvwXE6zzRkRjGmfK90SsajFtoFQpJe1X7vriIFv9dwjpJKdrKKQME9CcEZW8bYcmk6a1nYIr4bUaQuSJRStAQBk5F3Kc2/B1eeCaihO/OoUscQ6b6OCrcuc/S1okrNhqwTDhrDtZ+VWKa5X8/sH8eYDlAwXafZs97KLgT3TG8ICiMqnw9B9eXOsc2e0tqweLeo1hdqs5I/tF22JOFL4H8csD1sRSE1kw/+LMqkcrBuEoEr61kiMt1jeA== 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=1B9PNpFXQlrVljZLVjxb0pKQWfjAAxJRhHSjG3yqIcc=; b=CYUjGvCVSr0DTgySN0W91V8GR0IxMrEm1bKiPbf3vWDwl2GtRnZ8sLW5EpotwzpYZSdaktF1z9nuQpUMpPPKcvTSe7zeLAAyiIZhymqD2u7KhcUBk+gaiXj+xAE7UFH3fNRP25KK08jIMn3D0TU2izDB4JXv3ukB9XVa+IUb/I/bfEHvkvcxtQXjYP0uPYPwQEMod+yVX9Cdz6dRKop7SyTDZhjjl04Wke2kw0fwqPQNM4kIjexeFuBDf4fOM0WSqKMVHi42UGS9gnhopG+B0gXh2Daq61Em4WRw8NH03x5E0R2IShaPGNJlCuUmK4RjKS11nQzcXoUPwYBQcROjnw== 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=1B9PNpFXQlrVljZLVjxb0pKQWfjAAxJRhHSjG3yqIcc=; b=h8FWbuI0+R4/V85YmSyNHUXJtH0Od9x3HmOkWOdhlptpqfbe+XQAQTfLx7TicKKY6gDZmFJYrDZspFPyDXQIdd8ubiBos1gWof/75AV9ocrb81uuW4k48JI81HvzG9CxxfysNJ8wnogN4s0hXMl3CJMVbKmrca/F8UDTRIr/dbRijrfjWHmaHdEdHGhb+UGohV0R1KXt9hBnVTn9zpl9EO8GDelWtq/4QxYYNqRr0PInEBvLIGAB0H+vbcyUNs8FdKjBXgHneFPGQngf5oqd6pcvZRcbztjq48+R9PAC/x6t/FcnZ9OqUM3j6HLX4mNUomlRxQ9qmnAHMeO2Qe9Gmg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by PAXPR01MB8520.eurprd01.prod.exchangelabs.com (2603:10a6:102:22f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5504.16; Wed, 17 Aug 2022 08:54:00 +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.5504.028; Wed, 17 Aug 2022 08:54:00 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Aug 2022 10:53:53 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [/z8iTBU8ZiTowBUyGd3p8irq2bfKrsYx] X-ClientProxiedBy: ZR0P278CA0157.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::22) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220817085353.3211414-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ef6d66c1-21ef-497a-4d1b-08da802e071d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTISFcQEGF4mGvrmx8JxR60CfQjhEE4bq9+4S5L/sqc7OdXMF25DLqB7Yj02DgCahQgLAp7J1r13DsxYumbZyHYVE2iFcyesbilICeExyt847gt1Ri0PfeNtj5QLmcCRYY3flb9GMmcYTjHPb1tIiyMBVeqoynf3Y40t6RPkjDONDkzMMrepDnqSyjJV3ymHRmN72n1Ue+P5inb3iiFe1sXagNL8bVWZUTT7fqUOClSSk/vTyflY6dK7c1sAofgIRmLf21o/TWSGLohPrUIHSsHh9V6rEZeM/KafWIVuDPVUL+Ux5MKVfbtTI4ytXYtbjS2PlGLGp43v4y/851OvcWsAzvpovTTSsoIovBL3NHt2p/5b/IbK3hTEqZGKjh4la4nAA1z+k8f0VrK3mKzVLD2hbCBwla+5DLjlByKyzscCnQnIvOQc0ZbmY1ZquICF3FijlN03WeDJpFrgPnDVAAwm9MuxLj245xwrkdzkbUffNv0szvT6dI46BdUBThEWH9+hzh6kGjFJyp3sc4q4/yQwn5+cW49dw/jxLCi5JGWZ/+Tsnqm7btzYujexCRKh21Zeocmc2Yp2jkFiI84v7L4bgDV6vHFbKrOcZ6u1kKGEmXQ6SzFaHNYJFx/q3jP8tZ7S2RSXBKlcSC87R2keHuWPD0Z5Tu7ZS+mnm7TSVR0YlUNzODGzhZvF4m6003t9+C21eioTw+uzpWip8cBHKkI0TE+WO1z93hy8xhjFD3agvcbyH9jy337pKPWnRtwQL0= X-MS-TrafficTypeDiagnostic: PAXPR01MB8520:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8Ug9Ncle0zMxYFPqPDyYW7R4IIUOmVJEVRneExNGokX7a5cyzhnowSS9xwqyrbZS07CQ47fJeqdMceG3gQ/FV9bcW+rG94ZIVhVM2UjlZ0IXarxdVQ7ZQMigdZtiRYJRiiHS+16xmgRVSQgb6HTCPWxfrtm1Q7o2kiY40F0wHVhlu0bMjr2F8RFKwxbI488EJ+byBYg4lPkP/6wT+PlRpnpo/g6hMVHEN+xy4xomEWpYwwlyTisYXAo/j+zAR1w77CUfG2ArQUkQAawnmzaZ83dmlj4SppatVgOzdk089xpnOyZNnLF6YOgxahiTjVBGs7B1hqLPMlj5+SXn0VwzcAg+XJOyGcdPB0p8cEB8XWP1VqMZwhM87NCFa3qLXrwCpFNkhB3s1AOtTm9Ot5SW8nh9Sh42mLHBvKloBfaQGmQ1RC0e0iufHJ8Hoh5S4XjVE+6OdjWkmcBOtuLaHA6vdCkQxBUbtG47ziFnaUt46TT4nOZVQ4GhYPKWUxL8wUTn29GbsHUnPIA+mLQ/o1P3CQRb2nOrA7bhvzbEw+6wcal/XFfwI5iGvbI79366/GX/T7s/MiGuzQjLmCG4zyYzZYVvEXW+tuME08Tid9RkMCURoXY/8uVcncg2SeB0BXJ3YYAZ976JAYLEeHIv1xMyYw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yU2y8LIDhgx8NorFVIQ4In5+i9KNItENz5LZu40B4K+0WYvlxp0U8L6BEN87EcDSD5kFNwr4r7G732V7Zh87tgLpv0vRH3t2jAXERDdl4MCWZENG1CugRgjdbB2lLwvmL8IRuamtvtSHaAKAavpkcnlw0RLUbdxIv0mmvmL9WxQD2VleEIE4YOqU0geD4DqVOFscDSRpd2WhN/U105LzKLoPxOK1R0pM0mO6YCPzbmn0RUHxGbCSf1B49+hDhDW61UfL9FVP06uISf2bXxOgIdniIaXiICGzMocraNEc2BQRd3o/pP5xcYUZ2Km+Z4svXhHDTYx51Az/SPasw9ap1mgxCSh9AF1Mq0+PYGGu+jHe+LIhG+O45MOKDoxT8xgSldqpKjAyIqOaK5Xb3D37fbEZ8zQ7yJ7uVumk7W+4rN1eztQfkz2wRbysCJ7uy1xVXashSRxFakgtRnoVkedLpJHCANv1VV4jdATu6tISbQKndd0GNpqWpga4s858y6g/S58jWUh0SsZPYJbDHLFwVm66cCTy/msqkgqsjOlmBrgDd9vBdbhL7Qtj8EegexXvWU0Qpx6R8iLyp+Vzu7rSc2Rz5sixSN4GqHo7+BlGtroO+X9/PnKiOnqDkXgjFtdeG9r15Q8o/FroJJQny/RIHgbR5gDx9kOEm1AGDSo0fvSnudy3W0w/3zG6SzZoGm79X7OFN/EOGfeJmpMcG5xRmm30QsFVwU5MmQERNsMzRQ9oD30Q0sOy8kiZEpcHwwE0hbDb/m9b1/PnM0v//Gzd0xDmyZRD7Q40cL6zasMogMN5dcTld/JrZyukYcmVjnPDnl+0xCo0+aP4eLQDXX6jxNuUK13Qkunln6Blr05ZyEdWN8uSdHR3NDkLvhhidlFsBkeNRnXgf6m/O15gvsffEbZdgj3Vy2Ygzj/kn79YdmxTjJiby5/YDZxCkE2VYWcNq/dx0iW20b4immp8ir0t66gqu6aK+j6j6jDMohlbkzGcNHzWL6tZyBJgJfmwelEnawsUM7TDRDRx9SkgnzcJ559JeFjG6ZHVJcBq0pAbEZwrX9n27aVg3p0EFTsZbn1OO3A841/N6SzzyMcrHFVI4rmd5uckg9bgakK/O2ebI0tEFEvJCpeci8z3hMZ6XSckEG7zDfXrdeGGEj+cS3VaEzqSDkYEQfEq42jRePL8zgNQakqJF6GLli4wXDfeSoAlOR765OidwrEl2ROcSAXggS2r9y2eahcZdd+NNxvH7wmbu9WDwFi64DqWUD9zDxpf6HP0upR1TltXzj0h1bQtyJjFKlUTHZIvk4tDZJKf4KE= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: ef6d66c1-21ef-497a-4d1b-08da802e071d X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Aug 2022 08:54:00.6776 (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: PAXPR01MB8520 Subject: [FFmpeg-devel] [PATCH] avcodec/me_cmp: Remove now incorrect av_assert2() 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: w0J6/YCWBNFX Since d69d12a5b9236b9d2f1fd247ea452f84cdd1aaf9 these av_assert2() (or more exactly, the ones in hadamard8_diff8x8_c() and hadamard8_intra8x8_c()) are hit. So just remove all of these asserts. (If the test were improved to know which functions expect h == 8 and which support any value, the asserts could be readded at the appropriate places.) Signed-off-by: Andreas Rheinhardt --- libavcodec/me_cmp.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index fa82ae54ae..4242fbc6e4 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -558,8 +558,6 @@ static int hadamard8_diff8x8_c(MpegEncContext *s, const uint8_t *dst, { int i, temp[64], sum = 0; - av_assert2(h == 8); - for (i = 0; i < 8; i++) { // FIXME: try pointer walks BUTTERFLY2(temp[8 * i + 0], temp[8 * i + 1], @@ -610,8 +608,6 @@ static int hadamard8_intra8x8_c(MpegEncContext *s, const uint8_t *src, { int i, temp[64], sum = 0; - av_assert2(h == 8); - for (i = 0; i < 8; i++) { // FIXME: try pointer walks BUTTERFLY2(temp[8 * i + 0], temp[8 * i + 1], @@ -662,8 +658,6 @@ static int dct_sad8x8_c(MpegEncContext *s, const uint8_t *src1, { LOCAL_ALIGNED_16(int16_t, temp, [64]); - av_assert2(h == 8); - s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); s->fdsp.fdct(temp); return s->mecc.sum_abs_dctelem(temp); @@ -729,8 +723,6 @@ static int dct_max8x8_c(MpegEncContext *s, const uint8_t *src1, LOCAL_ALIGNED_16(int16_t, temp, [64]); int sum = 0, i; - av_assert2(h == 8); - s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); s->fdsp.fdct(temp); @@ -747,7 +739,6 @@ static int quant_psnr8x8_c(MpegEncContext *s, const uint8_t *src1, int16_t *const bak = temp + 64; int sum = 0, i; - av_assert2(h == 8); s->mb_intra = 0; s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); @@ -776,8 +767,6 @@ static int rd8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, const int esc_length = s->ac_esc_length; uint8_t *length, *last_length; - av_assert2(h == 8); - copy_block8(lsrc1, src1, 8, stride, 8); copy_block8(lsrc2, src2, 8, stride, 8); @@ -851,8 +840,6 @@ static int bit8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, const int esc_length = s->ac_esc_length; uint8_t *length, *last_length; - av_assert2(h == 8); - s->pdsp.diff_pixels_unaligned(temp, src1, src2, stride); s->block_last_index[0 /* FIXME */] =