From patchwork Thu Sep 28 21:35:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 44013 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:394d:b0:15d:8365:d4b8 with SMTP id r13csp155765pzg; Thu, 28 Sep 2023 14:36:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGihyDGauEB1jbKPu6bA4ciqMrG4NOTsFVIyllzob7995oUYWON3VpzNIkEkevI1OPp7Y5y X-Received: by 2002:a17:907:985b:b0:9ae:6a08:6f53 with SMTP id jj27-20020a170907985b00b009ae6a086f53mr2360631ejc.63.1695936987525; Thu, 28 Sep 2023 14:36:27 -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 q12-20020a170906770c00b0099332c48e49si15259261ejm.133.2023.09.28.14.36.27; Thu, 28 Sep 2023 14:36:27 -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="ePYT/T0a"; 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 42DA068CBEA; Fri, 29 Sep 2023 00:35:51 +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-ve1eur01olkn2029.outbound.protection.outlook.com [40.92.66.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3348068CBD7 for ; Fri, 29 Sep 2023 00:35:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=C12Sw5Bu1A5EGW/JaLX/Hzv0pjtfeky07e/R6880fuO/SJ/a9iPyfeKNOs1MityWnK48E8eS9JEQAAiPihVA7vf0NJYK5BFtRRz+s3Jl00cb8vgxJ0B3w7PhJpWgTFMgCVPgHYlLFMbDgWVqYhkk0SVIwDZqXAFqnYAmPD/DdLGNPUYDoMKICn8y5158TcEhrKBI5cVAau0UqGdQ3DIlQPYNTzlkJmDludvgoFTnA0kz2t4IdozczIBcKXw+tirw2Q1Kd1YedKwdOarLR6dMpfNElgmb0SzdhERhFNJXM6sS14S1en9vd7UTFVjIJA6cRBVqoaHx/L6eqMFLropdPQ== 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=8ab8hbE4djebwM0gJ8p6YEGtfHNZgilRRJMOImiCgrE=; b=k0lyeXcj/+LZLaQC/r8bpVGb+jNtfL2hSwMPY8vL1DaOtwlQGudxjs9xkt3Re8sdanc18GD8pMlLWVfSX2TmY6XD9jEpe1SHfXeRFZettxpNsYBiYw6HXDyvl4UbSt6Lx5PxM+8gK/OHRlRtRGyt/Q3sxu1dRxb+0Dnf+FncpORLO86pxrm6jYW3qX/n3ZEjRrhQiMt/KiUrHB2arND/K8DdvhuuKdz4R7bFgaqdxTckuR9/y2s4JKjOrfxzNpWmiSJdl0W9fLaj+m2sdcLzqwnURrhWsiFSNDInBdY4EMVr+YFZOxzvXW5TUudJ2ZjeE/Y3GnB3m/EYnO9yN/CArg== 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=8ab8hbE4djebwM0gJ8p6YEGtfHNZgilRRJMOImiCgrE=; b=ePYT/T0aZtX8V6TzC69FtjUYwf7RxOVIsYB/qr8kOqk69vo7tb938QL7QQN29pheliqLbhLg4Hmurpli4ubvryReswbVbuj02zyzv+ncw/TEQZwLErKfEcgbK2aZbzpo912qILU9RRxgD1hhaocQRYxi8klxjamYAyRGPnjgzGBZirXizpLNLlwa1u8pjtfD5TMbldPNo5M1R8iEIiJkm/+XXULernCgKwxIYzeXDoLRXAPP8OY7vHYzQPpAC5wcTbFLHvjgvcQb6yUfEMbzeFHyyj5UZn4H4f1DxxWJ1cSGUFv6kSeEEVnF6lSvWoDBPZrUXi89FQC/2nfRpHjVKQ== 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:48 +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:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:46 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oRvoSaEzVyU5oi1bO0sAoNsExJ21oYUn] 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-11-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: 7d7e9a8e-c42e-482a-ddfc-08dbc06ae108 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: P4m8ETFSkfUQ9T2Te3EJnChipjIKletTXr6xezoe8N/Ziw8QaVQ3a6lStLlRfSzsxNBjNIRU7gQ0Oz4tDMxaEMVpSTqD4oHCnkj6N06vqH8sqXRt+Ro0DUsGAvM3vx9+Hvdu+hzj/Lr4sV8FJ8HT0MwRH4btT6jRTaLxjVo2QgZ+E11zfQTKj/CiS5JVU6k+9QamBmkQno38y3ARBPJ/yqj+JCYgW4xwN+hfEdwtwYJNwVO+Cp1j7foriWTp430J9iSUDysWbczsGyxGVfmagkKqLkuGq+RrnFVzdsD+WGjTKpFuFOe82rVR37H1KPYj6tN29qpLpET5pTSWd9Il0BMn28am2uf7SQhjD0tw5Lj6V4fOE5eUhO0oFhx5UCofHB7CwugjdV1e8OEjo8d8DWV4BGew9xGqCEuCFVAoEa2r+pKlxh7PH4XzuA4j4jKrT7rgFIkUNPGge6LdekT5zln+IAFrO/Zr3BqzUc2f7ss2lbLLpFr8qnjt+VJFeOc2Yr/2Vj2n9XolfvsZiLkFSeX9zPjQSoWma+HNPSVL/dV7Z95Nqfoq9tpfOeloKfQtmFXOKSBS/iGboAE9BaHAlEdPAPxR1B42MSNzaAxbtCg4d1jV8iw6+K5O+7gLZG3k X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LfBgLf9GG2s35LlkW/lk1hx8d4k3+wc+n9wq+L8sG5Tr26AfbniCQpQhq68K71xtzADoPoIweDxuBj3Hy5EKCad4ADcOxp1n/L7T+q0MZPI7jQC0aZWybnBcqDtZtI6CpByPG7Sm0GurmPVtxSX3IM/fVneBgrpu/8dAsoEp5h2Euy9Hhb8LQt6xpwiRVRYTb8kNPNjfxkwIJcBrpcL1eZVIRuGEuJJTq0llnhB5rYOLfqsId4NG4SPabo15TcAhhCVqJ4DkIkJeKLRCRvfA7dppbI9s96u6DlwcDwQLT+wWdng3IDi80QCUQFPzpFKvfbjrc/4ZI58bz4+ctErw9jTppVK4w9ROij0QYMy58RL6+3LRtwvHu+eFWmsOI8+7SS1rEt1oanbxDj6rxhHXXc1+INzTFChX+FIn8zzx5NnVRa08DZIEMk0FNn7JpOwGmIVs+2/Xxzw9DtvwRyxLww5zHswXYJ+XjN9sFrLOtkDJwqCyADQV3M0cz1VmSsSHESsDlDdHmPY/yzpsNFHUVZIY53aCaAWlvpWVNisIreABakbGI+iZoL4/1VP5GL0wq8zJuvvcUbNXnlQXCGVGPMlqhSKMjkjUI7u41t0JhoK10GRn5TYTvdrgvNOSDwy0Tddz6ul3R69RmNyen/5QO1V8CKRKveZe6YWjeSax9GYRbEvf2M+dSvZdyAjMPRrlPwHL1F2MRJ/JgUxZKipus9ZWJ1CI8aPaoML64NF0CCIhpdt13hr3JYrzWa+0jKGjHJNl+9EbGgaHfkq4MCdQZIfyiIgX0Dv+vcb90Aq7PVgT0K/qFWV4HjuoxVLyyvHf5Zod40W1+819eOwzbwnn1wNVXcNXCPavPVWt+FPEh7Sh+9PtfEMwK65Nb4QRlOXdBop43KbZ8NeMwC/9A6Wse1aOO/M9WbG+rlxG4WMR8SfU9qQpxqI76ag/elv1lykACxATAfg14RkkFTO9LKAioDKaghnsxGdPU4sOHQjx9TBjNH2+72VG+B1wS3gQAEtK1XGHC1eG+exoPPHBdlcQH5b09SAB+4Rjt60fk00/wsgxxi3dD+akHbtMOlTc4zeJxNf2yiKZWSr5Js6DmXyw3fe5m9+DLdAe8x6ukqf1y48OKd5W6Ou+yO8prk63FZ7iiJX2DsKyeHiyD2uqHieVGqIeffEjKqAl6poFHvV6k81N09WkuM7jsSYUw9syEcn6o1yA8rIM3yBqA9FfFttZNso+wB1KKS0W5f3SO6Pv4tpNLf1JBX6ZuUexphgUESeH X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7d7e9a8e-c42e-482a-ddfc-08dbc06ae108 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:48.0450 (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 12/14] avcodec/lagarith: 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: imHLrhLVlKaX Signed-off-by: Andreas Rheinhardt --- libavcodec/lagarith.c | 14 +++++++------- libavcodec/lagarithrac.h | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/libavcodec/lagarith.c b/libavcodec/lagarith.c index 3288c0517c..9574f78871 100644 --- a/libavcodec/lagarith.c +++ b/libavcodec/lagarith.c @@ -166,17 +166,17 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) /* Read probabilities from bitstream */ for (i = 1; i < 257; i++) { if (lag_decode_prob(gb, &rac->prob[i]) < 0) { - av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability encountered.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability encountered.\n"); return AVERROR_INVALIDDATA; } if ((uint64_t)cumul_prob + rac->prob[i] > UINT_MAX) { - av_log(rac->avctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Integer overflow encountered in cumulative probability calculation.\n"); return AVERROR_INVALIDDATA; } cumul_prob += rac->prob[i]; if (!rac->prob[i]) { if (lag_decode_prob(gb, &prob)) { - av_log(rac->avctx, AV_LOG_ERROR, "Invalid probability run encountered.\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Invalid probability run encountered.\n"); return AVERROR_INVALIDDATA; } if (prob > 256 - i) @@ -189,7 +189,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) } if (!cumul_prob) { - av_log(rac->avctx, AV_LOG_ERROR, "All probabilities are 0!\n"); + av_log(rac->logctx, AV_LOG_ERROR, "All probabilities are 0!\n"); return AVERROR_INVALIDDATA; } @@ -207,7 +207,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) scaled_cumul_prob += rac->prob[i]; } if (scaled_cumul_prob <= 0) { - av_log(rac->avctx, AV_LOG_ERROR, "Scaled probabilities invalid\n"); + av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities invalid\n"); return AVERROR_INVALIDDATA; } for (; i < 257; i++) { @@ -221,7 +221,7 @@ static int lag_read_prob_header(lag_rac *rac, GetBitContext *gb) cumulative_target = 1U << scale_factor; if (scaled_cumul_prob > cumulative_target) { - av_log(rac->avctx, AV_LOG_ERROR, + av_log(rac->logctx, AV_LOG_ERROR, "Scaled probabilities are larger than target!\n"); return AVERROR_INVALIDDATA; } @@ -463,7 +463,7 @@ static int lag_decode_arith_plane(LagarithContext *l, uint8_t *dst, const uint8_t *src_end = src + src_size; int ret; - rac.avctx = l->avctx; + rac.logctx = l->avctx; l->zeros = 0; if(src_size < 2) diff --git a/libavcodec/lagarithrac.h b/libavcodec/lagarithrac.h index a31b054dbb..2c8cb7385a 100644 --- a/libavcodec/lagarithrac.h +++ b/libavcodec/lagarithrac.h @@ -32,11 +32,10 @@ #include #include "libavutil/intreadwrite.h" -#include "avcodec.h" #include "get_bits.h" typedef struct lag_rac { - AVCodecContext *avctx; + void *logctx; unsigned low; unsigned range; unsigned scale; /**< Number of bits of precision in range. */