From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 87190471E2 for ; Thu, 28 Sep 2023 21:36:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 07ABE68CBC8; Fri, 29 Sep 2023 00:35:49 +0300 (EEST) Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2022.outbound.protection.outlook.com [40.92.66.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D43168CBDF for ; Fri, 29 Sep 2023 00:35:44 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y2RiTM/UBqzdBPn+C2uPQFLYlOVvggzxi5DcWIM9S6CJPcBS12wI2K/Ot5qXF6qHwIUT5i/Kp7BDQWfCxUxtMZ7q1qNEGTGz7Z1rjfEZeDL1afLfn6bSIjLjfR/Sa91m93HmRlx/Ep4v8C2vF0yoOEtdtpAhZz+MumAVuGdyPdWsb7v2KnlE/DeHGCQ9sTFXLXbySLlZ/NlLpkhNLZJ2PHRSfv2soF67zhRJwHTy9cXToGBpvMaCL8gyeaDYGEn6dkgeBMmbunNv6glZl+pTxAy9hVHl+/aj3eNlX+2MC/1AAhVHAOhSN61QsTusejdymfFDLZxLXucV9dvCNYI4IA== 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=O5LoWekT7WLxayxlKSmCfwpPSSGv42QJI866NBFvSOc=; b=J0Z4idlE1SbKcHeaiDpOun3yZuAfDkqt71l4k10fnBtOVPyfazcls7hfhA8g+tp/zs6rl6POwxvNpXux8eS1a6Wr0jl+aDY2Z9vzP6+OQ1yveKeG9O9xwSvjX9vGxuRt0lkFYwHKcZQ7MXIEXnSQVFN5O4rr958wkxHcqttsbLwplnM1VFhRZMtySDPtTQiqH4R3h7cQzfU+4jczEKCq1amgYmK3ibBX4PjMwbpSglKtWJIbQLubTM2FO7WW+DqikD9Ob1wV6AVORIDDH8315ybbGYn+7FeRtjLY1v5BKK2rs4PL/621gtMelhehAULjuryjT6jTkCm65dDz+p5m3g== 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=O5LoWekT7WLxayxlKSmCfwpPSSGv42QJI866NBFvSOc=; b=RokeXTcAQqUYUVJM3X9C+z8g6wtIURJzLnH0Af8nLHnN6t4Pq5NofxIT5qG12A8M+Q8qpA/Q3NLZXzK7kUKoiamgtETCRA/XQIHhXbRg9ygSVtW7G5KVpZKexQkLHYZK5raFXgM6wV1DJc11f7sARBgfhI1G0XU1yRAwr3V+LRsHAC3MfZ2yuixJcJCZ6iMMxYzSWmA35PlVHvq+1ysYHLCurnduLd/RZrq/Mqz7Tarh8TanC9LXQHxFN8zOwB3GDBoLu3q1fw2vcFaVDEnpJlEox2XHyRtrwlagURT4p2nzm2fM9XYINp3QY2uRko92EzD9LPdBAqLDnDuqwfZ42Q== 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:43 +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:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 28 Sep 2023 23:35:45 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [JugwnXcnLka+1sVZgd94r3CLrMS9V9Sl] 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-10-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: 3d5a307a-0f24-4b4c-7c70-08dbc06ade9f X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ye7g4ifLhFkaUStYhE/BeyKtIDmEpqAVKb/2oHua0ZimVTuOmAG0+TEUvm4iJPMPIETkRc4OFQ1nToL/1Cp4ynMRweqW4CGDb41dJj0u/K4xwgeMbbpzh54dLTomOvgnWkhZDqjSTUGrwGzkd2+8BIs4Qb57ToRgqV0+7JG5mSSA5cBzbjyQbGoiVJPid8dIP3gmyofhMuRMo6nFT0ejuzORNRgQLkAsy13sVY+jbZPgtT8fxiTbFS9N3Nb2GavsC046fWb7B/2LZ8PwzBhER/pEsdc2XSXO6CsnVcg4UaJdIFPMokmWB5EDltKf+uBWG/DWv/YXtQandNdqCzLbfoUporBcQR5g4qkGu5uKcNf8VGTO9msJIbF9PI/xNaw6HsUdp9t2yA/4QM6AoOxxxn0Knxgz7zKuO+Im1jSbvy+lzHMa2e9qn82oeOIpsnmTDaSxH5kqldMaFRYVBX95mbW5GET3BJd4XiVihWjSDxx2uB92Azd24pa+WA0m5fPFvKxfF4+BKgd7RqLPNDHWdsg4jgitKTFPMSHQ2xyqdpz2pV0RXSa+wqBhOgKEtSChnWTFWty3sn6sOcuj/PdIu/JVPjAVTFzXRiDUQao1mXmHfjOnQZ6bopssxsDbhotK X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pVUdellFq2Zm39jSAcpsfdtatj4hO6jgv8d6qbsdduVyG+l4ZyPX3yMY7Nrc?= =?us-ascii?Q?Q9zQSmxIoJ48WWUI3XR7YtwV86I2C+tih6yePuvkjVcmzz38qqHrf8ftTWFq?= =?us-ascii?Q?SzB4yS0+yeMsbkF0EOVhEyQGpr+Ql/nRzu9K8SlfQ6Vxys0569NsQJ+tutty?= =?us-ascii?Q?qcbnSM8v30wiWvLUFeuawCNGWuGzrYP3FB335/9xBHzHkNud8+IW9CGG2i9E?= =?us-ascii?Q?bmrc2FQks36HCinxA0APPDGNNQRuu30c5uQsxeUvxiPJ/bKVWKdL75KruJOw?= =?us-ascii?Q?e7iQ1TtotagC5y52W7NVOkbg68317yHXr5P3m/0t1So7Reju7hfeNcfYeR+i?= =?us-ascii?Q?usn1tDF6q0u9nbrcGlptRALoHFW+qxnhwWcTtd80J1b0dGMQCWjtErM/IzV6?= =?us-ascii?Q?5Wo0c6LI/H4Mm7iv0tTfRgHnXch89Lp4+dUovQBeFDwvlWI7QhJLoCbH3OOu?= =?us-ascii?Q?0sEzpBhIZiB8ng6biVVXYBb6NiGm/HvsNYCOnjfw/tq+hN9Rd+vLaI2EVDms?= =?us-ascii?Q?O0guSEzBrkZUNd+TKD9AvFjsZQO8FuiUUfPo1PO8lUW/yUkH1hngdtFS6Ssa?= =?us-ascii?Q?uQoJCdVNqHQGzfnl4Z8c7BhUhzKmMLuK4sKxPQk258iUBq5tqsIr4hR1OzMB?= =?us-ascii?Q?7g/+KYxP0hCRD2HSEwcTAdjKpyQ6ANQNiEt60qwdisylyE3MwmMzi7n44TcN?= =?us-ascii?Q?4xcc1s0bpgUw9SAvKbLWFe7i1/m6hPPCoMajCFbZPMsD8ODOte2pq8Z05yx6?= =?us-ascii?Q?MGpNb/G+ucreJmj83r/Ejm/+C357L5pORPJ4aKQHoKxeINJPBnlYAI9toPpT?= =?us-ascii?Q?f1N3VKLhRUeGXDPKnrW5xLUinElfKSJp8jQJKzoj+YY25/d0wWIOfc7jVNSK?= =?us-ascii?Q?ubZgpB8ppvTQyLHa6G8kcf9pVT0AFQBOBCKAwJZYB5kTXGXpS894NjG3b2AT?= =?us-ascii?Q?KS3Gi7lgnLrjpM811IcB+Arv1guf4Cyw8gSQyDfNTNsRjeQzPEK3md+YT96A?= =?us-ascii?Q?3sdmz6zcvFft//Q+YTj0u/+Fl//UiiRsMTF+7dUbdU68WJudSb9Eo68uZXZM?= =?us-ascii?Q?nf9y7D602jyL4DilX2YXjsiJOH9yTyMeFCLe5a64L6r3Nnx0jO1QyIXoUdT/?= =?us-ascii?Q?w/p3EwPi6OjIBCDnjOAgv7WyVPlXBnZ34tTRve6QHPyL0/KyS3vH3Sj+tl2u?= =?us-ascii?Q?JVBthY4F228ZUxzqlHcnU7lcE2ApjSrAYx/RvP5y8YjUnQxOOBCxz3wthMiU?= =?us-ascii?Q?sxX8hRwJO6Ko56v8nbAu?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d5a307a-0f24-4b4c-7c70-08dbc06ade9f 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:43.9425 (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 11/14] avcodec/opus_silk: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: Andreas Rheinhardt --- libavcodec/opus_silk.c | 10 +++++----- libavcodec/opus_silk.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c index cf8b16acff..27671516a0 100644 --- a/libavcodec/opus_silk.c +++ b/libavcodec/opus_silk.c @@ -48,7 +48,7 @@ typedef struct SilkFrame { } SilkFrame; struct SilkContext { - AVCodecContext *avctx; + void *logctx; int output_channels; int midonly; @@ -799,7 +799,7 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc, if (bandwidth > OPUS_BANDWIDTH_WIDEBAND || coded_channels > 2 || duration_ms > 60) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid parameters passed " + av_log(s->logctx, AV_LOG_ERROR, "Invalid parameters passed " "to the SILK decoder.\n"); return AVERROR(EINVAL); } @@ -879,12 +879,12 @@ void ff_silk_flush(SilkContext *s) memset(s->prev_stereo_weights, 0, sizeof(s->prev_stereo_weights)); } -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels) { SilkContext *s; if (output_channels != 1 && output_channels != 2) { - av_log(avctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", + av_log(logctx, AV_LOG_ERROR, "Invalid number of output channels: %d\n", output_channels); return AVERROR(EINVAL); } @@ -893,7 +893,7 @@ int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels) if (!s) return AVERROR(ENOMEM); - s->avctx = avctx; + s->logctx = logctx; s->output_channels = output_channels; ff_silk_flush(s); diff --git a/libavcodec/opus_silk.h b/libavcodec/opus_silk.h index 6552c166a4..4b595da2b9 100644 --- a/libavcodec/opus_silk.h +++ b/libavcodec/opus_silk.h @@ -23,7 +23,6 @@ #ifndef AVCODEC_OPUS_SILK_H #define AVCODEC_OPUS_SILK_H -#include "avcodec.h" #include "opus.h" #include "opus_rc.h" @@ -32,7 +31,7 @@ typedef struct SilkContext SilkContext; -int ff_silk_init(AVCodecContext *avctx, SilkContext **ps, int output_channels); +int ff_silk_init(void *logctx, SilkContext **ps, int output_channels); void ff_silk_free(SilkContext **ps); void ff_silk_flush(SilkContext *s); -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".