From patchwork Thu Sep 28 21:35:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44015 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155900pzg; Thu, 28 Sep 2023 14:36:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH45AtxqHyztVWLTqjQLZc++14pVZGxKmJnRuRHWGw2RWVxEkYkY98t30xT5BLjFhbbaXoz X-Received: by 2002:a17:906:eb82:b0:9ad:ef31:6ef6 with SMTP id mh2-20020a170906eb8200b009adef316ef6mr2623770ejb.20.1695937006256; Thu, 28 Sep 2023 14:36:46 -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 ka4-20020a170907990400b009a9fbfccdc2si13477351ejc.369.2023.09.28.14.36.45; Thu, 28 Sep 2023 14:36:46 -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=a3L4YmOb; 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 738F668CBFF; Fri, 29 Sep 2023 00:35:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2056.outbound.protection.outlook.com [40.92.66.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F19368CBEF for ; Fri, 29 Sep 2023 00:35:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VTcCtNRjl0j5XtjPmsKPKb8QSClmvt0vg2iuQCPdfrfu8UFvkt3xMM/8O9EkwYnLlmSkkmShY22J9lrJA7eH/BW9lfhALWInT26yFOBnRGjaabbVFgIoSiWPIyGA5auHD6pIV7iRQ5FJnRwmC4PLoccFuQESQnRea9BG0phwZ/0GZexuMFv6sCkWA96B+ksm2Io1acJuqcaU3dHXr6LxSnuPIaZowGL1fgLr8crPjqwSRUW2/H8G2DOdrcPDErJVwtDl47y3+77SwuAqLU7HAIRQJFb0/B+7aDy0f7pKutOErn3/aeC3KoREZEOWt1KDw+UOhRO37II3bG+LsnyGkw== 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=qbpBIv8skthrCuB1u4q3+XxwhyllmuBYxRt5xhI0qaQ=; b=kfhdXE04a7UT/HyHC/8yQP8eT/9RnGNUP3reVO7GZNQnospqLI6K+XaMKbgDOXCjkv8aVO9jXyXSS4uYn0UCDm1FDYeUWlyO5nwuYTPjURN7VeCbEqPQPuGP8kVZchIVEOgWcsr7DZ0fBWWVPnGq0g/o27nW1vRyjNunMm8mY2vei97SAzdrJRlI6VdnsBCYkDRi3ZhWJDBiKR9KgrZnspDoNMvfWdHGFWwpE9dyARxa8Dl2OyBV89FDS//EVzMTwCI6mgQbUGzr6bh1ENiodUyYlzyh6oGbIc9basLvK+3bIUXq1F5g0gFiowyP4ZSWjy/OE1mXc2u71LQuAEkVNQ== 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=qbpBIv8skthrCuB1u4q3+XxwhyllmuBYxRt5xhI0qaQ=; b=a3L4YmObxJPbzAy2e/3Z72a0axPu15Lq7MdxA8zl9m5AxlH0Fio9xyYOiJVbHe1CyVLTwk/vVc8FtkkXShbfgFzfAb+6UPxRv4Cmd202Zne8WVQSYh2X8oO1v8k/gYlZQfv7C3NH18N7XD19Ay0yptACe1Elkqj9k6RLTEbtRBXKxkl9iRsnZZtBk0ILwVDzWTvO4avsttE9wLhyOWKuNKPFLeH+5MYZaFVjo0qx9O0oBr9x9D+Qt2dgf6L9hA6RWLhinlzY06PlXWRzQbcHk2mlT2PXMEEFjTwxZj4r7FZIDKMLJqbcxh5Z1g8CpTwt2K8mbbU4/jJyBxO2clTcBg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0145.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:272::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.22; Thu, 28 Sep 2023 21:35:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6792.026; Thu, 28 Sep 2023 21:35:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:48 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [ehuWlI56mU5q6LEqw83HTqgkmy0BQHQ/] X-ClientProxiedBy: FR0P281CA0191.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:ab::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230928213548.1219863-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DU2P250MB0145:EE_ X-MS-Office365-Filtering-Correlation-Id: eaa51fe0-e403-48ca-d8ea-08dbc06ae2e0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7Zbd9+wb9E5lgZo0llHiddTv6hny3DsgpYDTTFMoRbQzELJqX1SZUJHc4e7KytG7R+gaBd3Ubvt0MNUxQek3b2JILjOq/rmtNo2xJHJOLqV4bB2Px75hgaFOUGuQVCDrMvj1kuKKNxqhCpsVqaGdnSJeALa3aSOE4O5ZgAoiANniCl5QvfDpQySyUJRIW5E0Ec1AdRrZx/7F4tL9K7CaJ6gYpfabnI4C/CpWNnRjb5brOCDb2zmwDi1JqYK84W0FJEdMyu8EaWbiq7S7TJ9JcpCGDS/q049CCh2k9xC34a9u4gqE53ZTckfdGpP0Y2RlHTTzl4TaudHrYAVShX/Ku62s5HIR/G9qK2nweoffceWc7fYXpn+HKVaz2SsCr9DYcBMRGev2E10zvLUWG/KnKql5JXM5zAgxEIjoDs0BdoGot4Hq4ZzkKGAoQGTT4jGYE/jo7Wu2JzeVBGCkh8mCKinKayykT7Gcj2k3QNjxD8nEIwYkL2JmQhL9HwIkWVhz4WhdGb3hWHg7gMeQiBwMYTJ/8EvevSgUJAozdntnaQrksiCDCEveQkU4GhKiixNmZ0zh+DvSk4H6ty9hyh+CpOUkvgRfr8Ja/lUogD4eRixGYeCWQB8X5VHu0rMCvZtI X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0NP6dPW4OKATasfBTyB/Y9Pv5oxdJ7jMqw5gbmMX34Nh8i7c5unmoATgZPp6VgA94Z0OE3hbHOMUh1UAuDS4fViVeWUINnM2c3e4Awoupuu9gYp2TTOVZ38iS6aabrI7YWndoDvuXNJvkqFpa5PHasYW4jaHByFXZw/6+XAnu2yHj9CHpOm1IcKBJlhZpTmDjPY7/pzjKnNPSJn4ejayWb++OrwcT3NRdoLMyq72oXQxTLYKxKl8M23GISRmg1t0msX6g1gUzzIwUI4wd2xxWskrarZXJb6u/O/rHOAZuyFHgJXRCB4h7bZk7P0r+KypWNWpLCbFwVBfaUdkGsW2AMwhR40KnBMqgcsAOWLXxPV9ExNBcq9NbYq9MZBFLsIxnEH9xMSfqZoVpnrP8ttVokN/RcIVD8gQbGro7qlKr6Du3m27eOQtpKIy+tLiZNa5mPSUtVMe7HGGZm+WZmfFUgmUglSkbuoKSStIbgYK+3OsE/OIDWfJO1MmTHo2JVh+wlT9uLQMtQbi/2M9duPizPeJinJkS/VIR7YkZz1vkPaQ50zwAHzlXXQ7ZPK8agq/+vqNW5EbL5C16E66fbQ7cDoAmmSlJ0R6YBQfYk/KLYMAGt/axpSXdSntsqU6RdT2hTwmoaMdckIrCxQ8WFOJFpQsLGAGJ72fYz+IRjKgrVRmMIZSdq4msdlGOM1W/bjdrjXesNZTJu3qevCPIBx0/YLzNfytSlfMerMs5YTUpd5hWlTMemE443BPAnF18lkX8bme9urYaJuw8qVedlqKbyea33zQ+HOcy9XYZttXYuLAtiAV/dWaGgLLc9D2m1MJNU1ZKu+fWc7B104BH3ePI8Orlm+CF2jdLfjF2vvj2AI3tITT9HEfYqCaPRPelHriyynd0WD5LRsRxVVsMV3Snxgpa+gXlpeHeqQOohhmuMr6eTLHP6ItU/KQTddY78iD6TaLWk3thFC+OgqCnO8bvSm1R4r4Zn5tym6Ebs60guvSOekROwQ0Y1w7pNeRCQgGq6BS3pbXenF8szLJ2kqaOOGDVbDJgqX1Rei8Yzdp6DOI+Es5xaWW9ntAgRawgLfpLMS23e6YnL7yOtm1DM1e/eLIuOJLaotONOdJKBnYWtRbn4WQHoir/NZ7a06/MGWlbkgUMSCUYUIEginA/nx6EoZoaj3S+mzLXsEmplVLwyZ3TTNWRMj4sx9DLaTTREHMZNfSoOTbBPxPxQi8oY9dbWGbW/o3V1MRYKLKrQIyLRcYOgikl+DQXev3cgbqoXkn X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: eaa51fe0-e403-48ca-d8ea-08dbc06ae2e0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2023 21:35:51.0870 (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: DU2P250MB0145 Subject: [FFmpeg-devel] [PATCH 14/14] avcodec/bgmc: Use void* instead of AVCodecContext* as logctx 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: YqqJszjg+a3G Signed-off-by: Andreas Rheinhardt --- libavcodec/bgmc.c | 4 ++-- libavcodec/bgmc.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/bgmc.c b/libavcodec/bgmc.c index 361f7c52e6..0e41a39e00 100644 --- a/libavcodec/bgmc.c +++ b/libavcodec/bgmc.c @@ -457,7 +457,7 @@ static uint8_t *bgmc_lut_getp(uint8_t *lut, int *lut_status, int delta) /** Initialize the lookup table arrays */ -av_cold int ff_bgmc_init(AVCodecContext *avctx, +av_cold int ff_bgmc_init(void *logctx, uint8_t **cf_lut, int **cf_lut_status) { *cf_lut = av_malloc(sizeof(**cf_lut) * LUT_BUFF * 16 * LUT_SIZE); @@ -465,7 +465,7 @@ av_cold int ff_bgmc_init(AVCodecContext *avctx, if (!*cf_lut || !*cf_lut_status) { ff_bgmc_end(cf_lut, cf_lut_status); - av_log(avctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); + av_log(logctx, AV_LOG_ERROR, "Allocating buffer memory failed.\n"); return AVERROR(ENOMEM); } else { // initialize lut_status buffer to a value never used to compare against diff --git a/libavcodec/bgmc.h b/libavcodec/bgmc.h index 466df31a2e..81771d4aef 100644 --- a/libavcodec/bgmc.h +++ b/libavcodec/bgmc.h @@ -30,11 +30,10 @@ #define AVCODEC_BGMC_H -#include "avcodec.h" #include "get_bits.h" -int ff_bgmc_init(AVCodecContext *avctx, uint8_t **cf_lut, int **cf_lut_status); +int ff_bgmc_init(void *logctx, uint8_t **cf_lut, int **cf_lut_status); void ff_bgmc_end(uint8_t **cf_lut, int **cf_lut_status);