From patchwork Mon Aug 2 15:39:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29191 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp1679440ioh; Mon, 2 Aug 2021 08:40:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaRUWB6xr7CpuzD33bh5SmQ2IBU9Y19mXnchliV7vMH9X0VGL/twrs65dgKzoXeiZYrAnY X-Received: by 2002:aa7:dbc8:: with SMTP id v8mr19619462edt.242.1627918807994; Mon, 02 Aug 2021 08:40:07 -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 z26si13521445ejc.486.2021.08.02.08.40.07; Mon, 02 Aug 2021 08:40:07 -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=H0vuCCI4; 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 89117689CCC; Mon, 2 Aug 2021 18:39:46 +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-oln040092075102.outbound.protection.outlook.com [40.92.75.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03EB3680836 for ; Mon, 2 Aug 2021 18:39:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tq+oATi+Fg7LnBLktufk2Q4BAy1jR9UGK7bjYIpt8fFXiyEggyZvv2A71iXbJECiMGI160jJgk4kVsVsHR88iwakIkc1qpcG/KJj/l6Bv5Bj7NyosqL4+IPnG/YZ+Frg33lP4X+B48BENcBZqFLO6ju8cyq4q0eEwVTLywFpKwbCSCHonOgdhIYxwz1f2J6BN1b12MPbMFBG9vx07yQhILayON3DMToSjwC6sG0bYNdA9Vk6QNRkqMONvWVuhHcvTuDo6aPeEi0z6R6sd2y8uawMv3ULaFG6PDWFdTVC+r/m1JQTWRsjVNVJUoK2BZwywHN7WpTz//xLboXQDZCGlQ== 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-SenderADCheck; bh=t/AC6rLPghCVNExyRGS2FVp6o293e3DMV23xvONr9oc=; b=YBkUtzSnSNruXh3szNPq8TF7hTi3sJyrNP2eqnDS56KCKr2URH5uNgeQdbdzP66Kr3i2zpL9dSQcMu8ypUFiQDsNiZnbjavF+D8ljgypRu1sr3EDbkTUJYOXRMFOktIyaMyi9LKXOcWNoYkNfSg3ICV0WxNNuo9PsAsibieNE7FOLd+Z9+r2HeQ56nRyn908lzgjJDWEugc54gcH7+Pp66jvA6gs9AGHK9pyeMuA0PksJNOlGVJl6e3RAu2NCrzLzsGVQJaiq4h1s8O1F1ej6TiUHffaP7AVBVNQMgmA8EBnunS9DfUV0mz77X4DyOg7hMPKZXouZt65vMLujzA1YA== 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=t/AC6rLPghCVNExyRGS2FVp6o293e3DMV23xvONr9oc=; b=H0vuCCI4CrxwUdb4Q9zxsvMU0v+hSaYI+SIqyICQSDQ3PK1RfOHMyI+xyWOv7BxaGqimAJmQOjpLn0rnY4WiUSJQ+Y+TlxaMKUK+Ri9EE0IVnIDCpNqr6Za5VOi8TU6Q/j3FGiwH/jtUZq36UoQt4Qa5tSHn5zixd+4Tzc1j+e9279w/UlsOELBdyyHtJ66b+gBpXCJW5jzCKujgV8W1953vqwjFZipyGFldYt6cePZDSaFKFu12GGUItADfVRdCXZx45faCef1eebhykSFLSO0SehmxNDFwN4+uw/vqr1DDYzBwe0e4XkCI/9DK10Nk0Jqjn/h59urPFgnDWr4DlA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR03MB3092.eurprd03.prod.outlook.com (2603:10a6:206:19::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.19; Mon, 2 Aug 2021 15:39:35 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::c9b2:14f8:d555:6f2d%8]) with mapi id 15.20.4373.026; Mon, 2 Aug 2021 15:39:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Aug 2021 17:39:10 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [sSNoLMGN8SNq26ivi4osV1iqhVX2fGlp] X-ClientProxiedBy: PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210802153915.1234499-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.94.230) by PR3P193CA0056.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.31 via Frontend Transport; Mon, 2 Aug 2021 15:39:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a1291f87-b54d-4578-6749-08d955cbbaf0 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiT7FzPiew9v5CevtIP+WXD7aPXGzCw+OUzuOCWI3ZLkGZrxRuAR0dsve342nUiGZtIxJG47M+xGT1ToF3xsiUZsyXFkAjHHKVyTxAX0ibYdaL6RXAXEWEs5TdiUML9mLCizKDcoXsjJg8kw70VLPYAnFUmsva7MIQu07fqGfRhXjhz5YAwIAqbfhn13Pa6u6TWI3FtJD03nmegI48rlGCGTiuBX/JtccjukVFTlQP1S7RTKG1Uhgh1xWt6RiSL8TCB5p/Q++d7NCcTL4IvYfCOdfQpIoPrwSK/47xLqyiHXmTc2z8X47g1E785vDTUtjdufU3qjBJmV/AjiKTspCHu85XnFLSXCuDvYEd33qbTsNKIFdoGntkXteJL064YevnjsfOmmH+MilC/PG68GCljs7Lf7QlgIL0IB/1O4S0mm4CeyKyWN+X9tGrKhdUobXKMeUzPTjNcsxZYhQgM27RzpQEHFu7zxyNdaM+1zrCc5AQyvQ2McmZ5DHgof/kNm0gtNrvw4IPXApg56/vJovyzjmAhCoScRqQZ/8dal+CRxykErB5WzVmi0sIj0zl/CX9EgCwytFHCS1FqdL9NvxVZ1Gfs3UUI1Zdb6IDpiagThcLduYgrmXof4+k5NKmSayMY41rNZimyAVDGDPv6TipmkP1RY5Yrw/1t605IUBLxaWL0QMJQkppkEW831YDJDP4liXRuIYxvWflGTRnAAQEukFi4wbEoBn0YEdr/+m4xjKTdk9ci3cQHIZtmAQBpYJUA= X-MS-TrafficTypeDiagnostic: AM5PR03MB3092: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 32WuzyxnU1b44o+D3MM4poUKuYUef/QjNhBxq1F6tBCHjAUuv/B4QqBXMDziBW+mDL1mAbh8S7gglbBOTQkUyyDDNqmFuXQttHAU7WU0cm/EPUyTNFy5SZ/RP8LRH4scWM5abHx8Ku2qF9seEPrNgbTanGMx09KdbNUd0foVjhNWB09iRzV+LHREm7kk+duJGfWW8hX2QEXnUS5ozVGQmIQrlcI3mUAfg1ZNqCEBemQO7Knmog3NgFjmblqQd9/zQG4+NxkzsriOIN5Mic161tU4N4TMKwVUmwSmKNeUooONGf6oMUH60jt49sgPK5CwZYyjjbnYfRDcorZLF2Hs9cZe37e997Nmju0HnhsVOueAxLQQbKa+hY5rwA2qlEszEDnGGYxK/6uwMdoOKalpHmgEpBTYz2FULYex7lpdBMh1JOAMkSLOvjIrs662s8F9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VwUG/b5oEzUq1DOJ0XAo8Fv24VwJR6CNYPNih/zRN5eELSkUtEkKSJqgSqUGIMqKPoklG2BqTMafeVngE66WhvgzGch+a9QnYESkrD18lsXCZwD+6MRBeHgP/ty6egyICltln02+L9MX6/kRxu0hnQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a1291f87-b54d-4578-6749-08d955cbbaf0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2021 15:39:35.4606 (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: AM5PR03MB3092 Subject: [FFmpeg-devel] [PATCH 05/10] avcodec/huffman: Use logcontext instead of AVCodecContext 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: XCXYwHgPC3it Said AVCodecContext is only used for logging; it furthermore avoids an avcodec.h inclusion. Signed-off-by: Andreas Rheinhardt --- libavcodec/huffman.c | 7 +++---- libavcodec/huffman.h | 5 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c index df1141b7e7..be351ba2d6 100644 --- a/libavcodec/huffman.c +++ b/libavcodec/huffman.c @@ -29,7 +29,6 @@ #include "libavutil/qsort.h" #include "libavutil/common.h" -#include "avcodec.h" #include "huffman.h" #include "vlc.h" @@ -154,7 +153,7 @@ static int build_huff_tree(VLC *vlc, Node *nodes, int head, int flags, int nb_bi * nodes size must be 2*nb_codes * first nb_codes nodes.count must be set */ -int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits, +int ff_huff_build_tree(void *logctx, VLC *vlc, int nb_codes, int nb_bits, Node *nodes, HuffCmp cmp, int flags) { int i, j; @@ -168,7 +167,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bit } if (sum >> 31) { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Too high symbol frequencies. " "Tree construction is not possible\n"); return -1; @@ -193,7 +192,7 @@ int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bit cur_node++; } if (build_huff_tree(vlc, nodes, nb_codes * 2 - 2, flags, nb_bits) < 0) { - av_log(avctx, AV_LOG_ERROR, "Error building tree\n"); + av_log(logctx, AV_LOG_ERROR, "Error building tree\n"); return -1; } return 0; diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h index 4f879e6e84..1d5e140e81 100644 --- a/libavcodec/huffman.h +++ b/libavcodec/huffman.h @@ -26,7 +26,8 @@ #ifndef AVCODEC_HUFFMAN_H #define AVCODEC_HUFFMAN_H -#include "avcodec.h" +#include + #include "vlc.h" typedef struct Node { @@ -40,7 +41,7 @@ typedef struct Node { #define FF_HUFFMAN_BITS 10 typedef int (*HuffCmp)(const void *va, const void *vb); -int ff_huff_build_tree(AVCodecContext *avctx, VLC *vlc, int nb_codes, int nb_bits, +int ff_huff_build_tree(void *logctx, VLC *vlc, int nb_codes, int nb_bits, Node *nodes, HuffCmp cmp, int flags); int ff_huff_gen_len_table(uint8_t *dst, const uint64_t *stats, int n, int skip0);