From patchwork Sun Jun 9 09:54:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49733 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1935908vqo; Sun, 9 Jun 2024 02:54:59 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXdtyEskl9jS2Fz+SykZqQvc/DgTu2Bg4kGQ6Kfa2WhDY07d7tAeYJvGrDFn/S21l4lEKHP5GOVbeSVDH7GrFdtn3LVXdxA4Y6QlQ== X-Google-Smtp-Source: AGHT+IGqk7Q3CtChFnwwNW4mQ4M6An5KRUFXoHzueRGMVgBpbdlLa/bHKtJEA29osiCWogrQhy+A X-Received: by 2002:a05:6512:3f09:b0:51f:3e0c:ace3 with SMTP id 2adb3069b0e04-52bb9f785d9mr7238464e87.16.1717926898842; Sun, 09 Jun 2024 02:54:58 -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-a6f16a688e4si53796566b.200.2024.06.09.02.54.58; Sun, 09 Jun 2024 02:54:58 -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="o/D2BPja"; 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 172FD68D725; Sun, 9 Jun 2024 12:54:55 +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-am6eur05olkn2022.outbound.protection.outlook.com [40.92.91.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07DB068D72B for ; Sun, 9 Jun 2024 12:54:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yk0Bys3ws8tPr3wIS9ZTwBERnzlxoqXPj1okNrrfi2YrRWxn+/nYls5YnGL1VSQ6rCrpOVf3sQwpnyxP3u2IGdA0qLxMQG9BR0BoD3K/HN1hQt/vx7ybA8oLsedSK/3PE9jVc+fJReE4IjGLWNuCX3dQ77TTgEEgmyGe6i+gyFvXOnDkYwKG9ePaC2xCQtLjddv2z/MX+PrApw9JP76/0jvALbabQdoSsDNqW1yWjKMM0tMMH+EZSASeWPAF1qpbJmCvMoXcyflW0GhXoEO5Ba97ZmtmB9crBG48/rWnRoMOT4ixe/EdvTd1qZHp8XNKlQMI6KezB4xV0JVKrFrSjw== 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=oLk6GFQER67lD+8wxjs2vH3FUAc73ehklNL6ZcqhWao=; b=Nd9Kr4PQhY0yyRtM8FCmBag12MjcLHn1a2vNhGQUWXAqe+T92nI5LbA3UHXw5ftX+2376as2FSZvvQz6fvfrjoe4tSoVlKIPRBGIrDzqLqkF4Z4vQcVS8Xt5eXuZQEpfpgDWuHun2hC9n5XhSCNop/Kz8V7vNuYsPGpH0FBPJ0z3cwUs6vyoan5hAHipCcJGthMYrig00rAz6x1X7TvGS3Cfmlpx21J6kv3C6XK6KfqlPJGRMyrkiCK+U7yTPWAxylzxsmi1H8zXqoTgNA9hVq+qY4tfdRyy3fVAPVfU7ziFYFllKpwXz2o4by/jOs2Qe5Yai+dTenFD4Dxa8AsH4A== 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=oLk6GFQER67lD+8wxjs2vH3FUAc73ehklNL6ZcqhWao=; b=o/D2BPjaZN3W5iSnIGso9G6ufxVS/iomXkAf4hCuy4ApleVoJzBQLjUiCfYaYKpqthRKcdJjnEGwcilDCzsrqd/CzNyW+umhdoaFGmvOg4bFQajW4Ignllcn9SRwkTOwPD8i9yg0DoqJdfX4K533M8fMryS2ir17AFVxMWkavhqdCghvHxMVVGOLleBlD0OUBs1oB8Z705viQ4PmUiZ971b8OzhaIcWhCROtkso7uIh2kXT0lyEDm/ty9INJBSdJxh8OTwUbuyQsprpNacX5CD4oMrRTYDaHsWbm9fBw7LG+wUTpraB1INZ196eXrh0pTnWpT8/oU4Ukb2px3iqb6A== 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:54:46 +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:54:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2024 11:54:33 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [YPbz/COe2zRaLiYi27zjGQ8oIHsu5mG+FJqmDR4FmcY=] 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-1-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: af6b833c-3fce-42f4-bf4e-08dc886a31e1 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|3412199016|440099019|1710799017; X-Microsoft-Antispam-Message-Info: a3PmdRMNfBqc2dHseg8gbKBHLj5JdWP/iKXW8z0BlPxAId/k4xIJSb9v2Mu+10PKPrPkfzAtRfiEvdXrb9msPrQefZKUaOCTWWTqZ4D+hD9W12vjf7fbjrtu3P8dqpqHIIUIqAFe6PdufGlq8X9TsKZEy8uqOAADdb/vgTHRq5odcQnIcTCcSoMNWuYAPjJMVMhKY+z1R38Y7PnYEras+8HLbDvQ9bkk1nrioVsoVJF7u8eVMVyn6ZHUvRV34cytob0wLyGv03YH745Njpl1XyPisZ346p/qnG8y4curpB7RhDc9kODeHXZOd+s8KpSKZU2O7tFokqPc/DClCtwLVOhhMEq9p41OgI8pCutCmvLow62HwpZYyMj0OwE6Oo120uSVq35jxhnLuF+M01PjLpqwUSE+ySLEZY+gEU7lHu7zFrDfkcICJ4bOiGnDSqaG43W0o6fWt/C6g8w0G/zKXuZQ8IQq84mdWv1UR/rAGgBPXzicD03j8AhG0pHybfA1NpRMroQxMEq+RXUybntrJqCLVwySiQMx7JTbYY6EXogRldrLktWvAf/zKTOqnRqnWoRdPJWzAE7mV7qciIiPO8qzetxrCGUxIKFdhotjl5BDrqeuQy/QpU3n2H3NsiaA X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pgh6tP9+gs/kaAr5irpmyy3B0nqIx4731A6Z+0JO++BOxCGtYRvEyh75bKuNztQyP/dP9+gt6agBEkSuQxZE4pJ2pdjUfWvKLudxRWLawjUPXLj4Ze7qJvoBV+Bl+rMDBsAilvlhZpeS6zydA2QfP1B+20H72+YD1cK9q7fGGixiJOFzikNTuKBQuJfQDu/1nhwkZcpXPSOSjTjOk9R+tN2EmKLCueNXYcvmLRwT58gGAg3ed43SeZsYn8hdwC6ehAzhAGFbs8qmuA35oZH2m2yUK3catvJJMNW+bNCPE2wd7IbIaU2LJSMDNV1AZvUamsWDKR0unLMGA7XT/+I+AcKLBOZ4xcihWRmZjaMJuPsoYxGUuKRiWtHSnkBHQHDsZBCwFV1lqahGGIcWtL85gi9KKWc1ekvIEuManfZEUyZnbOF4nLjCGh7unJg5n1tDx91RDI+SxF8AARWaA5qXmZmxJe84TU+7jffRQ5ePqQcq7OZQmQ5KIuQCQIWYDkzDv1CYMbYCVpXbrwXpGkqbWRah/5UKsgwFSVO/RKwywr+ScDnzDJkSPA9nGQeGSDkrDS0SY+87qmKaWRVKMSQ4vrITdSnrHGrZqCucdXOwR0YIABdW0/bj56LrYH4eTRQa9wRT1CpMdxG+6tue4DEtCp69a8FF8OfFPqNLqBB3V28OOQmmJJvBGxudK7l3XOw3D/R1kvRJctZQP4ECMqzAWKtlOPk1wIWisxaSdQOwZ0mmnzh+AF7uq0jOOh5tvF1Yy6NGL2n/7FTg8X0cbk3oICdEtDmcIMcTbdVmgbGCUECdVqKycg8fp+2IvoHloU6FNsA+CuJO4lbRqr4reoMHAVnA4gMWVefnnyZK0J6Rws3lp1KBZqwVt05gJm4Pqy23wZelmFuG+ILTJpULcyQu7zTVq7jINCx67bQKznjx+GcG2ie5Q8fOl5vEyOsiIxApvOyTUU73RrXyCRPqz9+thqIo+b8siw1tp7vmoHdZ81JQYcKhSn6ZlruPdBG8s7hSKbHJrFipUCNxIrHCfIW6s/3kyxPBsnCaIcOa2vaa7K1D/FIpE83/MYCZ/9QnlqLoM1uHdTSUa/elGkWOHKaspoN7XObjg4zpcn/yiFtF+LU62qczfNc6zDTbonNArokeCGvY+XP+eKkr12vMK94Dcc4Xd+W+Z61LAiSfb2RG9+/olaJ5JASRkqoDeeoYddO2hLQVz9Wgf0lCF8UhksmTlOyELMxuqnd1zNDcCIZ45B8pv/HUg55oJuz9cT8qfOUDpUmOL0dSJegFcwRNxnvkYg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: af6b833c-3fce-42f4-bf4e-08dc886a31e1 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:54:46.6335 (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 2/7] avcodec/mpegvideo_enc: Make ff_dct_quantize_c() static 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: kr5WuerXfKXY Only used here. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo_enc.c | 13 ++++++++----- libavcodec/mpegvideoenc.h | 1 - 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 82bab43e14..45b6fdd3f0 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -87,6 +87,9 @@ static int encode_picture(MpegEncContext *s); static int dct_quantize_refine(MpegEncContext *s, int16_t *block, int16_t *weight, int16_t *orig, int n, int qscale); static int sse_mb(MpegEncContext *s); static void denoise_dct_c(MpegEncContext *s, int16_t *block); +static int dct_quantize_c(MpegEncContext *s, + int16_t *block, int n, + int qscale, int *overflow); static int dct_quantize_trellis_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); static uint8_t default_mv_penalty[MAX_FCODE + 1][MAX_DMV * 2 + 1]; @@ -296,7 +299,7 @@ av_cold int ff_dct_encode_init(MpegEncContext *s) if (CONFIG_H263_ENCODER) ff_h263dsp_init(&s->h263dsp); if (!s->dct_quantize) - s->dct_quantize = ff_dct_quantize_c; + s->dct_quantize = dct_quantize_c; if (!s->denoise_dct) s->denoise_dct = denoise_dct_c; s->fast_dct_quantize = s->dct_quantize; @@ -2444,7 +2447,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, } // non c quantize code returns incorrect block_last_index FIXME - if (s->alternate_scan && s->dct_quantize != ff_dct_quantize_c) { + if (s->alternate_scan && s->dct_quantize != dct_quantize_c) { for (i = 0; i < mb_block_count; i++) { int j; if (s->block_last_index[i] > 0) { @@ -4566,9 +4569,9 @@ void ff_block_permute(int16_t *block, uint8_t *permutation, } } -int ff_dct_quantize_c(MpegEncContext *s, - int16_t *block, int n, - int qscale, int *overflow) +static int dct_quantize_c(MpegEncContext *s, + int16_t *block, int n, + int qscale, int *overflow) { int i, j, level, last_non_zero, q, start_i; const int *qmat; diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index c20ea500eb..169ed1dc3b 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -148,7 +148,6 @@ void ff_write_quant_matrix(PutBitContext *pb, uint16_t *matrix); int ff_dct_encode_init(MpegEncContext *s); void ff_dct_encode_init_x86(MpegEncContext *s); -int ff_dct_quantize_c(MpegEncContext *s, int16_t *block, int n, int qscale, int *overflow); void ff_convert_matrix(MpegEncContext *s, int (*qmat)[64], uint16_t (*qmat16)[2][64], const uint16_t *quant_matrix, int bias, int qmin, int qmax, int intra);