From patchwork Wed Aug 2 10:58:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp571319pzb; Wed, 2 Aug 2023 04:12:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlF53NT9tfljZrqqvd7Cb35jksl0S1KeOt5JCROLrXddDqgeATrs0IIDc08PDJ/NsMOGZjaI X-Received: by 2002:a17:907:2716:b0:99b:f857:9aaf with SMTP id w22-20020a170907271600b0099bf8579aafmr4705338ejk.63.1690974734197; Wed, 02 Aug 2023 04:12:14 -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 g2-20020a1709064e4200b0099bd39dcec3si1102022ejw.95.2023.08.02.04.12.13; Wed, 02 Aug 2023 04:12:14 -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=m5dtqooR; 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 989DD68C5B3; Wed, 2 Aug 2023 14:12:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2054.outbound.protection.outlook.com [40.92.75.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDFA068B26D for ; Wed, 2 Aug 2023 14:12:03 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HAbwUFdp+0DHdxBwzB/xv2HQki8SzIMIJTyY2azgqRyQdIi/+tjDQOQ5sLLUROOoRphtHwePcuVtUpByAugtsWWyRPGtayzZQkrUh7a+uOIRiATmhhynOy9o1H54twt5MA/5gPC6+YlXZFhAR0PlXLIHJWtkyEICTWP3HLAzE10wsTfI3YP0nhuvHKzD8Cn9TJ/zWYqwCTa6FZAevjTqBiAD7Bt26Xz6trJX9fc0aCyMqu7VBEkum0f2KR4ASo9E02aJzfb3Nbn5q6eGvfxSOlUslu39bktJJ2CqSDJRm0OYREP8M6oha+bI8gKNlk088bzsfhXMzHOXbk2i1MDYtQ== 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=dG0bBbkL/eBpF9zhlPZSPXue6z/mSEtuODSsph4rmhk=; b=B4LS6sJTO08yK+SVLnB/TSXKXh7XS4om1ZBHRcS0AidrKPeyvFuf4+eUP+6OrSpgMVnZptBrsdtSMwlLZp6ojGl/fOU3JIxA3vQzGGRMwH/ii+6fWZs6Cx7ML0k/Iw1jUj64pBFFH7z1+uMdyMOTpMeIhCL1LWdgkG91F6oq4VnEfNyB7Ub44NpWOf8sKIA7IVgc1ZbKu/yONYxPhRKddYrR0e6GnVKoLxxhMvIuCjxVZh/2+qTPDrvhqN7c6AF/pG7L5nJGmwgESc3ZMOwR0B+7NvUL+oUF6RSsyxjJEG/Kue5xJ2L2G4eB4TVHBmz7sNf6t1hZg8bRtQKQ/IofmQ== 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=dG0bBbkL/eBpF9zhlPZSPXue6z/mSEtuODSsph4rmhk=; b=m5dtqooR93e74BeD8gVtWXSZhwkCJPe369ViK3TEwfQGEKxlfuO4ZKIhaPvLEITylOidfpYmg2ZB+q5ipuvkbG6yMb/WyXaMKqvFAT7MXbOgg8bwuyXOqkGO7XkXZi8cgzWXcg+RgAiEsQqJXuMOHC/jjXV+P32MmCW9OLgyL6zfIdyP44BPbqaB6YaMJrpKIpUAanzRdPwIMkr74F7RzGgvj37JntmM++8/6PKaqWUzO8AywOsB5dqaVMcV7vELw4PlA+So+UYfoqX2icxBYKyqr/1fa5drQ7HXmba3sh6Ffrbe61p0fxFHiumEstzcAQb5uxIKHZuSx+WmrrL+BA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0159.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:322::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.45; Wed, 2 Aug 2023 10:57:42 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.045; Wed, 2 Aug 2023 10:57:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 12:58:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [cooTuFvBg7hpK8RBpuatwc5NE7N8jtXB2xK2vQsAybg=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230802105837.274253-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0159:EE_ X-MS-Office365-Filtering-Correlation-Id: d9a1bdf4-6e3f-4631-8e1a-08db93474b49 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3kJA0tFqbs8en6JIaQ9AKh8Nq6jJaxQz2Jn1qkMc69q2T9hQ4HCplv9oV6bMxo9/RLKT3LPvilmjUXYQGroTpOnnSNAuRZYAWsc/2pa7nUM5FhR66s+3C5JKrGnM7JkJ3dW7Mxzlwc7NYUE7IgqA3l1AiFWEWCDd9Zq7TEU8Mkw7W3k8hPMq7dRHcIdsFoHq0SiPMHr8LJ+N0NZACyCosXa+ki09Xeqxbg+JJNxdN+J+JbHPR/K+gZG6xfw33QdHNUgFgqf67ChcmlRFLhXZ5kjENA8m5QrJT+8tlHQwGR5d6NlviiDbVgLxcAwiVoO9lBUQ8MafYMTDSO50LPPhxq80bTqM4oFkfYDFLbB33fxxEP6mND95JWBMIfdFxbFOnda8dwElxEadFCv5sxs3zHg5P0ixKDIo9xkrJWM5hHyHT2TPxIQyHciogRsVG1ImZzSIQN3qZc7PJh5SFOC5LCeQCzLVwSbt9bQm2Md5sGxkDaKpvkhQaevT7KfqxjVGfSaJIiGYe7IBp476rSrrAc9L4beKoTwUbjL8/CkUqRNcUb0DeuXB39B3FqaeJ4olw2XuonZ7T1HIpgzjoVDr6dslu+Z0d2snOSsLVAVnALMiaGgJCA2Y94F7YjaHM0y2mbKK4vpfXdBvRgOOYt/CkChW8A3CQe1x3oalPcM9jmf+WAvqAvS9efMPVBZF77z+qDc9SoJprWHP0iyPO4NOjRiWyweI23xfWg/LXRoZafxhf/Q68i5kXX+VYcJlKE3nbobfZ1VpUYWAV11g4SDJy29 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qPYnRU7+Xq1Pg3hR6p9NYseg9a9naiAWlZe2zD5fxGcDWS63rWTLJeaVdGPC2k3JHB0Pz5YLMRXCdkK3FkH9NzmUOO0P6ZFLc72Ap6Ar9PwP6qKja0o2Zq/DrANieHhCVJPtL7oTgfvPFX2TsBjamsgM/iBkeqSjQOor31AdP6l7toK7i/e0PrH77KrA2LpONxSXlosKhPZavMbCbzq94mbK3EeBUpF8F1HH58lULpp/ySdTGGGOK4j2y62b8HoUsv9kXl3QuTIH+jXR397n4+5bnOugu5bcsPPbCF7SnU1tBxw7Tf4pxAv1qClX7oKZzJqmZC5xmx7OIY1zDSmTuXmJi3oiZ7VUtulII/XdECrj2H7UOPrw/gu46Irx4WwbQq3YtMw7ur/5NPRtpD+feyu5GdOnrAHjN6VlhSUsRBsT/tgz0LLQUYys8oxWX+cKvSABS+NYTWqbUP4XvkPBJ/OvWMXrPbOq5BXUmpg5VS/QW5q/2VeDZpa5AIeB2HcrPROr6iC6CNr4n+CZruFBDVJNXzRtZB4tdVCMIxfk3animB5Wul3sfLrpz6LhIZ5YfboAFiUItD/9DYNS+5FPZ/uwi9SS0dUQLV9XuhmL1jrW/NB/Yd63XFnoXwDvP9pO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MFdn8ATA/xSNKVcRnxsWRpFF3A7bnDfXlSeRE0pAfZjoy8P+rZPcc9/lpQDGmPDu+ckfeas1hv5TGIer5PghsZ5DzPSb3L7zz0JHho3h6rTMmhfc+DRxB99VZd3aivwcoSxc26fEbOTFKWNbUaJoMaoRBdwbrnMSjd/amkuLGXTAmoPS7aUB1TZOEwzZxDKwZfvGjjy0LUNENOw8cB2dNbzYHuEdz8TOO78xaJuYh2/X0DrCEnhIskMGLCX41eJsxjHIsheXrQMj3fiV3Nl5Cl6eZxWaHq1XaOvXzu74YSop4rlN5UD2WZyEFhVWQBOIMxDHeBSIwHoeiROi+8GtPnfjB1+aJNVn4dEQyzvFCVm9I6y62AZmzrhJeR9IHXsnWkQJkmSobaBwSYBpS1eEus92cPppErKjT/r74STFb7yN3pKWq/CANSBT/SGDvEccziR7x2Sttikm8HsUaUSlrTD/X3pbBQ4EqN1ynAHZcjxWDKt3KaeY6mO1q/DzJUg7e286NjLzCI/dHr66kpWWsqAZPhOslQ8if4a0UtUxMPis2/wuQAPpOFUBKH9Oj1rf0ixO20PsVCGwvDNN+7hYpe47nUATf6Kz9KKGcN17P9wBg6ewoME4Zry7/TTRAjHxCnr9udkUeABiaTx9pNiWTWk1EEOvAYdVhPDphMBdCAS2zA/+HmiG78smFhWrrQoKRNdUAbyqoS5E+SBWF5L3S8HffMP5sjaCckc9hpjsvSzU4sLI1yuxgSfu1jVddbNtZuxuYhVKFcoC6alMOOjUAVxvaUth5y0QqRRaS7pXIXuNhg/lGccjJPvPbCJaUary8Dm5nV727xIO7wSNHp3CmPrrzzfhbUKnFbo+CCCPbrxA7r9lEF/9usdxP4P9uCWmn8MdWW0KDdSVbbuymjPl5+OeZWGWCJ9tBOM9H+T4YoWoi+u6wIDTjr6YRtpy/q8UDCGj/Q6hxvfYiX2m4VHDlU1blqU/zWY9KWVWojfUsegAHi0kmLjZ67xvLMN9FJL5HiH3YAizjwGBnneQF0/1XvNTpvnBoqLuis+6XhTNYXIa7QKjzyVtd9p0NUWIp4cZAQiuii/D8SO4va6pmJXMaFF1ga0rt5+wp/bg6QULojpFbiqA2BQ7Kt9OhElbEUhFvoacvp08lB8qZ/DzePgZIzzy0YCKKKdxwg+nuTdp8P6dTwjClIs0VSBXYg1jY8W88c0wJLSv+ACKlJgUMts2xyILgB51qV+YcM0/LyAaFitfc1HDkV0x7Zg3esWgiWn2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9a1bdf4-6e3f-4631-8e1a-08db93474b49 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2023 10:57:42.0705 (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: AM8P250MB0159 Subject: [FFmpeg-devel] [PATCH 08/15] avcodec/tak: Use void* instead of AVCodecContext* for logcontext 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: xLMiRbQ89Xrt Avoids implicit inclusions of avcodec.h in lavf/takdec.c and lavc/tak.c. Signed-off-by: Andreas Rheinhardt --- libavcodec/tak.c | 4 ++-- libavcodec/tak.h | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/tak.c b/libavcodec/tak.c index 99678e9887..91feac5451 100644 --- a/libavcodec/tak.c +++ b/libavcodec/tak.c @@ -144,11 +144,11 @@ int avpriv_tak_parse_streaminfo(TAKStreamInfo *s, const uint8_t *buf, int size) return tak_parse_streaminfo(s, &gb); } -int ff_tak_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, +int ff_tak_decode_frame_header(void *logctx, GetBitContext *gb, TAKStreamInfo *ti, int log_level_offset) { if (get_bits(gb, TAK_FRAME_HEADER_SYNC_ID_BITS) != TAK_FRAME_HEADER_SYNC_ID) { - av_log(avctx, AV_LOG_ERROR + log_level_offset, "missing sync id\n"); + av_log(logctx, AV_LOG_ERROR + log_level_offset, "missing sync id\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/tak.h b/libavcodec/tak.h index 5e43598de8..1d1ee645e8 100644 --- a/libavcodec/tak.h +++ b/libavcodec/tak.h @@ -29,7 +29,6 @@ #include -#include "avcodec.h" #include "get_bits.h" #define TAK_FORMAT_DATA_TYPE_BITS 3 @@ -151,13 +150,13 @@ int avpriv_tak_parse_streaminfo(TAKStreamInfo *s, const uint8_t *buf, int size); /** * Validate and decode a frame header. - * @param avctx AVCodecContext to use as av_log() context + * @param logctx for use as av_log() context * @param[in] gb GetBitContext from which to read frame header * @param[out] s frame information * @param log_level_offset log level offset, can be used to silence * error messages. * @return non-zero on error, 0 if OK */ -int ff_tak_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb, +int ff_tak_decode_frame_header(void *logctx, GetBitContext *gb, TAKStreamInfo *s, int log_level_offset); #endif /* AVCODEC_TAK_H */