From patchwork Sun Jun 9 09:54:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49737 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1936071vqo; Sun, 9 Jun 2024 02:55:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWlmbXQE8vprsbVYDbiOok/6daK6/CnSaq2XWxDs8QJmc7+Cx5jm2FoL/lNqrmpe1C+VPerjrIU6LBEEJa0QK0T298mGsOEro2ZWg== X-Google-Smtp-Source: AGHT+IEN4tBOjMRW7DetvdQeu2HFqoS8lNhRsn0WC6TlubsGqA/S/KC7RnQ7CN/3swce7IL6CI39 X-Received: by 2002:a05:6512:1191:b0:52c:8449:8f01 with SMTP id 2adb3069b0e04-52c84499118mr1719473e87.12.1717926937817; Sun, 09 Jun 2024 02:55:37 -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 a640c23a62f3a-a6f0e731b21si109063066b.175.2024.06.09.02.55.37; Sun, 09 Jun 2024 02:55:37 -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=toAF6U68; 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 F241968D7A2; Sun, 9 Jun 2024 12:55:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2100.outbound.protection.outlook.com [40.92.91.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 372D868D7C0 for ; Sun, 9 Jun 2024 12:55:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jC0TlkiEpYmZYr6mzcqA867aYaW4ipX+giFzj/EbmCi5duaxBSUptqscLAAqFzl/gDsVrCePxPGDTB2lIsgmER2ET7QydwLhI56FTDjyVPPCfLZ62x9VZsgM4COeWp3xl+XasM1IKmPCOr7/vR53ngRXdLrGvfnMUnwSJbkjh1AeAx6Szo9M/nMymrKW8mI7wJIHkrkbdThrT5VWbRJJPZ+9utvEmre2hBMkOf/APV+4Tl7sa2ljvl4socfDQ0kF+zc2Z5B0ENNgFSYrMv9ObMqnvrUfNYdEVm4eHUKMq1B4QDg2GRFoBBlYJD6VH5zaaymOdUR0na2w6e6eo6t/Gw== 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=rvL4UKr8VfnsA4hg4MszNcwdfWLVhNjAO83DUtdUjug=; b=ZIcc1GlTblMT6WyVAltltJh+wgpzeSj631fv9dBq17lkk+2hDzgKw0+FpJ4fDTbsyNd+tDFRYFbSAdb76LiH3ABaXmdzaNhcgD2oWpr5EMM2ppyWWITJmPdnChGfZcpThpd488UmGwBfHU0Yb0Ib2JSEbGFc74kOm1oCj5NEwBAXi6bnWsab1c439Pm4vVUuLDqwyMiNnX4KMbxRPqwp5YVO0yEp+k7jVZmTk90M3J1AVw+INjXNN6XH2sWb0kDETMPIzbqcov09NkxpRUOKsp1EVbQxcjWIBTfj1SqQEpQhubT0vRjaFRL35C1YTBkdEVhMByLlAzxxTj2Jh2U9wA== 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=rvL4UKr8VfnsA4hg4MszNcwdfWLVhNjAO83DUtdUjug=; b=toAF6U68kdxKSiiuhEm95GpEk+9XeCj9NQTIdGeHYI2LqrqPX1I7LZxz5FzMoS59ByUss4GnXWrD9fqXm9PnT+e1Y6L7PlZ0P73JcLy3LLKIHIlvOI5Uko6GFSVjDPw60hXBuBBCte/J8ZhWN0Vq4OoKmY8O6T6vq5XqToEUnxsKpIo/UQ1RYS1nmj3sHlVaj7f14s6gsrt6QpeDPV1E9DvbZfVIvO6RmTx2w54CMsxc5MYuT2Ao3NvwF2Ril8EvnZEkfjcBzVU3azix0mH4Fa7EmxFMyQ484rG8TlbXrEkrJxkYnyFkdn4+7StEhqi8nUfY5AMJ8XknHq61XjHpcA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS1P250MB0553.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4af::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.34; Sun, 9 Jun 2024 09:55:01 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7633.021; Sun, 9 Jun 2024 09:55:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 11:54:37 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [Wq04xRLuRzibeXpFuh9A8hGgRXaKeLIjvDb2+QVaHLU=] X-ClientProxiedBy: FR2P281CA0034.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:14::21) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240609095438.3250145-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS1P250MB0553:EE_ X-MS-Office365-Filtering-Correlation-Id: 7bb4fed8-2101-4c25-45db-08dc886a3ad7 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: rwCYlKqps4B3zNnIOtqIP/ZX+2kcBR528stxBCuWI08izzrR8K/SeCutvmMt106n6Op+DttYEHO/LEZweXVIbmcIEHHKfR4AB24EI/vpo3YqTXDkIz0NUv+Qivk/MV4ebTSq0IiUaZtlCJMJxwuhmIs3/SASPqcsppJSdDu0j9JnZA5Z0jKdQY0fTgF6YERUlUDkHkwfvLoKEBvAJPzkFQn31KRde2H98v5dQjOg9nmNXMA+CpuoWiyzq/W6kKNBuhQIfXFo9ewyPOBVSJAOx9sf0skhndR67ZNcn8iov3G0q+wuld5JH4fT6zUwDfheDXvc38W0J1CE9RuAB8dsS6xKrgny2lomTJXrzPsZuJznJk1fkF3Ftzmcc1m0N7y7IqXISwPPhe+mahS59fIPj7AsoHu6Fd8RngLy7u6xrr+RBOU8V6aJ0Rjg+LfAu8O+LvV2QhuTAA4pf2sujfivj6jHkChSiUUBAsXuFuxtTY2nISqZRO2FdfClzywR2+v+qXjqxSn38Wdob+e0U90tflXPBzH39P9KPG1nuNeC/Ty5sZ4/XpWq7Nt1L9NytAD45tiDqBRZBFn+WUQHN2X6utFO0TyANXID1SWOY9Sq9rBEZQ/jg5szPhtqgHsS3rBk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: A9DNgPsighzKrehwKsq5YzQM0AOgUjtDWrCsEy7yvzJr1Hu4eH+uE51QeSa4B6e0af+C9KGki6wUm3vKRKiiwZsnkZGxsj78raQnK4PlQ9GURzZyGTI76xg8ZNPvKzLhv53Ro/3pALLZQwM01HtJFWvXSJkWLrlpItuqzPXWgHpbNveSnWAV7z6hAzP2rdqnn/YpKrlkUjFpX0+tstSAFKzxwvXbP4rh60hPpsSpIPajHHz8o+qTEiyIAWKrvHQ+GMwSNWC7aTcRt5aa8VCGfL6eLciXBgo9Haxa5vZc+rAcT0itRdPCOu2kIEGJWwgFVIMHo5vB9TQmUk/svHdXRET9S7+qU+eYcAD1LKVRSDqbnoKUExW6p/sIc61TSD9YNdYYA9Ail19XjQaNV4Z75ZWwB9jvLXNghCWj4NAtxtrv4VM8J/Rw+zQ+vLMwg7VNadwOaK45GpW+BWGM54CJOV3WeVKA3PqUe3XVIxwWW2KypdFhAdl6MP3aBQVZnKsO93AjmfDIBRlghqQmTIfmYB2cu3GXWCXL34sesV0iOcYYiRcej5aqg7zx/9CyN5E0fecCLcoapgYwLIz+EPMbTtYL2QnnMYh3WOsU7I8rrdfCA9xx2niooQ2dJcVH+w8ui12F1jAiusxSAVi1RMw0oCGFKPr06F4rc/hTaSnHlpDcsM0WafwgXEaRtVtANyYSaI5cM3001M/dknJpS2LSGjPevGgOGJITJLrvj27mQ7i6e6dnMe+oF6xS/YMifv1Z5yErO78QviQKY5COlbf5atqYyocVIAzN7OmWrKclnXsbDSiR86BGsmwzJJgfPxb0UfL310z2zyVtwbqWP1CpbKNwZ15hjbASXHSFWOc0bnbhwa8ZmDehoZ4/Ss+lVJvdO+wL96gZJk8waMhmAKGzZxtfkZcVG1RcRCoIfPJhOUvyZefWgBWpHba7k7qIe9jM8U+FYvgt/03LMHhypcUL2p+Xx1UV2qua02YqXN2H5X3i6icG0O25X6/mFBEj9VmkNDoDIlS52k2oLOEOBhjy/001G5q9/e4a6LVS0dJ5yjvjsZwvWoGQyErYlp4G2/xuux/gr7ECqhSqaO5qrmisAreuZQq4HqiiuYycxC6yZj5vpnIRuPUZgOzen4PhVFaeagsYYfCIbguhFEjl44bCHwVQoToCiSZUbUOnKpsk8H+Y4FKLckeegQ81Z2UnNrhnd+oDcbpQ2mwJYT3kKsCi+qtXDhU74HJ/iEpGZfjZzuEVgeDcFPRBD+eFni+xz+5aSV3/XN/Zm2gp19NGk1w8jQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7bb4fed8-2101-4c25-45db-08dc886a3ad7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jun 2024 09:55:01.6421 (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: AS1P250MB0553 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/mpegvideo: Remove fast_dct_quantize 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: G4QTTI8bu4pw It has been added in 3a87ac948f0cd95218e62d5a98b8b8d5e4c11366, but there was never an implementation different from the ordinary dct_quantize of it. Signed-off-by: Andreas Rheinhardt --- libavcodec/me_cmp.c | 6 +++--- libavcodec/mpegvideo.h | 1 - libavcodec/mpegvideo_enc.c | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index db3fb1260c..670103cc05 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -751,7 +751,7 @@ static int quant_psnr8x8_c(MpegEncContext *s, const uint8_t *src1, memcpy(bak, temp, 64 * sizeof(int16_t)); s->block_last_index[0 /* FIXME */] = - s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i); + s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i); s->dct_unquantize_inter(s, temp, 0, s->qscale); ff_simple_idct_int16_8bit(temp); // FIXME @@ -779,7 +779,7 @@ static int rd8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, s->block_last_index[0 /* FIXME */] = last = - s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i); + s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i); bits = 0; @@ -849,7 +849,7 @@ static int bit8x8_c(MpegEncContext *s, const uint8_t *src1, const uint8_t *src2, s->block_last_index[0 /* FIXME */] = last = - s->fast_dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i); + s->dct_quantize(s, temp, 0 /* FIXME */, s->qscale, &i); bits = 0; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 215df0fd5b..e6b9d1e581 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -496,7 +496,6 @@ typedef struct MpegEncContext { void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) int16_t *block/*align 16*/, int n, int qscale); int (*dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow); - int (*fast_dct_quantize)(struct MpegEncContext *s, int16_t *block/*align 16*/, int n, int qscale, int *overflow); void (*denoise_dct)(struct MpegEncContext *s, int16_t *block); int mpv_flags; ///< flags set by private options diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 7dd692c1e4..b7c1f08b0f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -301,7 +301,6 @@ av_cold int ff_dct_encode_init(MpegEncContext *s) ff_dct_encode_init_x86(s); #endif - s->fast_dct_quantize = s->dct_quantize; if (s->avctx->trellis) s->dct_quantize = dct_quantize_trellis_c;