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 E26A6462E2 for ; Thu, 11 May 2023 18:16:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C354868BDBC; Thu, 11 May 2023 21:16:18 +0300 (EEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2053.outbound.protection.outlook.com [40.92.75.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9D6668B680 for ; Thu, 11 May 2023 21:16:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+d9l3hhLjodGRlQoI90iRpIskf7l24r0YLdV8DqCk0u81be8ZxMYzA5fyjA+lT+ZOqHuOp8RjPwULk1YAiIexDbw/1n8H2D3diCxkJ2MW5G/BFTWkKcpP+Syc1Nv2z0WT0jo5CSi9PJDhhMfNoyN3vHDE/jLDefesoHLBfoEi33IX+j70gBJU+QdLde4d4LZA0faBp6cixZCtBjnIGSyRNhEzUBF9XcYXkZDHDvlAQP/ZwlXuG6eh0zgfyU3yRjcnBLFn0dep4/86p6f7LFkcycQII0HFlAEiW6LWNXh8sTV92XVCEgp/N2zti0awKDkR29hOX6p1FjVE5KidHxoA== 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=re7f4vX9UH4Dgsfpf0+XLhkAUK549NXr98zsa9SXJPA=; b=GMRDBHylcYp8DtL7gs/l2PNo8UB0yibIzjd0TK7zy/9upLBiRc2iRBFgbom896UGljumNMn+N+hD3i8RVm2ssXpEAye+IqRHmy2zWOQi6bFVdhr4RVMtSCoZt6Rp9lxiXni76TdyU26N93VPOIGRP8wr388arstatlZk5r6xnbXRP5My7kBUfve+3KmTnVK7sQhTIjdfA68or8eP81KtdOaStgW04fojm815SdRlFXrw97BPvRdlbBlAKhT1IxmkViaQQfr2FSKUcOaiwHcFj3mRJVUet07R52clVKxlJ3stsBhB2O7ag5ZxRd2bhi2jS1mrrcxexVzl24xBIuisqw== 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=re7f4vX9UH4Dgsfpf0+XLhkAUK549NXr98zsa9SXJPA=; b=JBg6v26K4iEnagg/hJVO/2YSHYkfxOk72Enr/mucLsCMSscmi3+5e+XJM0+2BtFbNVj3AFpqyM28E8lZzsnqIQJFF+Yrw/rVwHXSanHoBQ6ET+idq0diZf2nctZi0B23Qyz85ojhwo8927uQbymSEgY//ZQsUt5VazAh1j+liEfjVrZIE+Kk4tqJLDj+yMZj4iavQGUNky4U5VDnNqo6+puer3a7K+3ShB7kiDbGx+1bpW39P/K+kolvU3qAjcVC0WHfzlc7QssqFm+0b74ARhc+aokjMIzMf3XR/dzeyVeX6FqhD4DNHO5p339xRmZO7YzLoMcgEuWbjMp+VxnxQA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DB9P250MB0402.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:330::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.21; Thu, 11 May 2023 18:16:11 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::e17a:a918:63b0:41c6]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::e17a:a918:63b0:41c6%6]) with mapi id 15.20.6363.033; Thu, 11 May 2023 18:16:11 +0000 Message-ID: Date: Thu, 11 May 2023 20:16:53 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230511180215.14940-1-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20230511180215.14940-1-jamrial@gmail.com> X-TMN: [r3F1A+QCLtD4v2ruWwlgFXFi3r4RscpZ] X-ClientProxiedBy: ZR0P278CA0039.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::8) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|DB9P250MB0402:EE_ X-MS-Office365-Filtering-Correlation-Id: 86e7862c-6361-44ab-c0cb-08db524bcc67 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2RD4peWfeCF9lRdzeWx1A+RcvKqLUqm/BIqqAJlYnEN3p1CpUtbq8m+cQVujcQzw6UIVCZqGG9qsibfnOSUpPJwiNSbVjCJxXCGhFM+2v+5715nwcS+mKk0j9a+PZ0EFsJQipDmHdJgi6IXC0f1FYGvZUoLgykBOmiKd6htfr+7eW9RLNivVckm/ksddkzu0G1NCbTLlh/yPV5PF5GNKZ/Q0/e9M5OQ4bzXJLoRnDBfmcAPIO3CuSn/Igd9yn45ZKQWka0a6udeYPupYE3FeGyptv4saVllUckBMLPgAyTdhmuYT9hS2XqBN3vp/Y7kUKn2/Mw8vRYXpNm2y+MB2mfo85cZO4UnbEgM8vFTx6vppSt1+gh8Hu6TbpaMzT3BtLMukOk6oc5/wH8X1fnk+iodAwIsMabGmGGYYOZCiTqAiHhYuHYP8X/lAJjo5WvpFQ9YEEYbmnWF8Xf3l29hFyeGbaUYTnw8L+aMKbYJ5E55nH6vrM5IqhRlzIH35W0PSaC+BNHpcRGDCRcaOrtwmjGtPKQ2g5SztNLO2IDKu6kRm6weLtNH5ouATiVY9J0NyAKAuK/SDC1ZhoiYiZBh6EHKV9TJbDkqtXFDYOtLXoRqrcD1AwE8gegH3R+aPk5+W X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TDJudDR5aDZORE5RQ01HaVpXMGxrYmVxM0xPT2RUclFJSFZUYWlaa1JqOTA4?= =?utf-8?B?dW80SVFwcGdkU3htVUErS2pjQm9IbE95Q2trdXIzYm1RVEpkU1FYTnJKM0pC?= =?utf-8?B?Ny81ZDV1UmQ4VUUzT3VFNjZaNlhWei9VRHV2V2NlVnFIelFIbk5tK29XTTdz?= =?utf-8?B?OWlxSWJib21obzRJeTVGbkYzaFRHcll4Rkx1dzZHSWZRK3JSOGtpUE5QNWN6?= =?utf-8?B?ZjhLQzNweGhKZ2hhYVVqakE2SnRoeDRxY01BaTJOLzQzWGJkcUp3TWN0WVJU?= =?utf-8?B?UVo2M3RPVklxZm9iZkZPeGgxNm5qUE1hbTFOQkpjdklxWEpUZExObFJPZllF?= =?utf-8?B?RlNseDlrSjIzeHE2QW44ZHl4NC9HVlVSM1JpVEkwNmYvMWhFYU1lOURFSGUr?= =?utf-8?B?WHVUMmwzTi9hQVdSYmtDbXlJTlE1YW95Z09qSHBsME16NWQ3cWtrd0dhTGZo?= =?utf-8?B?OThEa1dVWGdJbXVUcXAwQlFKcGtZU2JwN2RySU1sNXBsMHQwK3ZKZlB1SjJP?= =?utf-8?B?eFlpbThCbXUyZC9TT1JZT3c5WFcxZjNERHg5Q2E5bjhmaUJsOVV3MkdlTVE0?= =?utf-8?B?TmhaSnppQnl3TkZnL295TmhjdVJodkdsMmQyQUNveGNESDUvVktpeFdQMXBr?= =?utf-8?B?YWZGakY1NE5LRWg5aEY2TDU5RndtWUl3U0ZKbWJZeGRNbmYvN2ZVeHpTRFFZ?= =?utf-8?B?ZEtWL01ySUEvWnJpSXFMUzV5OGV0SWUvVFR5NWhoOGI5bUt5blhtME5lUnY3?= =?utf-8?B?WGZGNWpwcGdsc1dOQzBiTE9sSnY4SmFiRGFEVnZud01VTFZVT2FPNXNKMGgv?= =?utf-8?B?YmsyL0FURTRpc2RpOVdnSFg3NVVCaFFoSlNKUys5SWxQUXBlOG9oMm9PdzQ1?= =?utf-8?B?MDRiVkRGcUwzNkMzRnZDTG5ob3lWQkIrU3dmeWdsSk1OS3NvRml5dXFrdEta?= =?utf-8?B?UzBqbHJwQWJlS1Fpa1BiU0ZVemxrRmt2TnExSFAveE8ycXB4b2hPRzJEcXRL?= =?utf-8?B?MC8vQkNVV1lZaEg4a0hORXRoUTBTRVlOTDFYc1pSNDR2TGRoYnZ4YnN0R2Z1?= =?utf-8?B?RWlyNEdKM2cxdjZ2Rm9ibkpKd1hEK1pTRkJGUFkyZnB1RVhMUEhLeVNrSElz?= =?utf-8?B?N09SMW9Hci9mSE1CWlQwVkhraU1mRkIzaGFvcmFadEN1a3ZWQTIyeEVxYzlU?= =?utf-8?B?QW9nVVJvVGM4L0YxYjM1S1pYUmgyRnFoMW9TTFVneTdwczFGZm9GQXZwb3dl?= =?utf-8?B?bHk0YU9xK2pPbGppaWJXeTNFVnQyWERweTU2NEtrbU9yUk9NalZ5OW93bGZh?= =?utf-8?B?RlJIMzdkZjNNUlRLL2UwRkVHT3FNbHErcy9VbklRNXNoNDU4QnAwWHBzRjZj?= =?utf-8?B?TWdTMlNKcDRpdG5iT25Oa2xDWU5ReEZyU2ZqczZCSFpiWnU4d29tbmo4Y1ZS?= =?utf-8?B?MTRHcGtIS2NsMXBncVhmQjZHUStJRFJ0ZlVUR3hSRGlSUENpeTVQRC9rN3U5?= =?utf-8?B?cTBGbE54bUx1L1g5L0RwY3ZyTXpBdFU4WEMvdkQxRmgwemRSZHMwOFZsbWdG?= =?utf-8?B?dmYrRlV6WjBFalRpSU1JRHJzRkRQTHVoVXBrL2dRNGF6M1c5eEY5Nmg1dDV1?= =?utf-8?B?dTJKMFFpQ2JEUUVOMnBXYU1ZYXB1TW1iNmduenNKUlNKZjhKYko2NWlBUENY?= =?utf-8?Q?ZLB+BkBeHX4emujyJ0Du?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 86e7862c-6361-44ab-c0cb-08db524bcc67 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2023 18:16:11.0923 (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: DB9P250MB0402 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/eac3dec: remove function duplicates 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 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: James Almer: > Thee are not part of the float/fixed ac3 template distinction. > > Signed-off-by: James Almer > --- > libavcodec/Makefile | 2 +- > libavcodec/ac3dec.h | 6 +++--- > libavcodec/ac3dec_fixed.c | 1 - > libavcodec/ac3dec_float.c | 1 - > libavcodec/eac3dec.c | 6 +++--- > 5 files changed, 7 insertions(+), 9 deletions(-) > > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 3cf4444b7e..deaf233021 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -336,7 +336,7 @@ OBJS-$(CONFIG_DVVIDEO_ENCODER) += dvenc.o dv.o dvdata.o > OBJS-$(CONFIG_DXA_DECODER) += dxa.o > OBJS-$(CONFIG_DXTORY_DECODER) += dxtory.o > OBJS-$(CONFIG_DXV_DECODER) += dxv.o > -OBJS-$(CONFIG_EAC3_DECODER) += eac3_data.o > +OBJS-$(CONFIG_EAC3_DECODER) += eac3dec.o eac3_data.o > OBJS-$(CONFIG_EAC3_ENCODER) += eac3enc.o eac3_data.o > OBJS-$(CONFIG_EACMV_DECODER) += eacmv.o > OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o mpeg12.o \ > diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h > index 98de7b5abf..99729adf0d 100644 > --- a/libavcodec/ac3dec.h > +++ b/libavcodec/ac3dec.h > @@ -259,20 +259,20 @@ typedef struct AC3DecodeContext { > * Parse the E-AC-3 frame header. > * This parses both the bit stream info and audio frame header. > */ > -static int ff_eac3_parse_header(AC3DecodeContext *s); > +int ff_eac3_parse_header(AC3DecodeContext *s); > > /** > * Decode mantissas in a single channel for the entire frame. > * This is used when AHT mode is enabled. > */ > -static void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch); > +void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch); > > /** > * Apply spectral extension to each channel by copying lower frequency > * coefficients to higher frequency bins and applying side information to > * approximate the original high frequency signal. > */ > -static void ff_eac3_apply_spectral_extension(AC3DecodeContext *s); > +void ff_eac3_apply_spectral_extension(AC3DecodeContext *s); > > #if (!USE_FIXED) > extern float ff_ac3_heavy_dynamic_range_tab[256]; > diff --git a/libavcodec/ac3dec_fixed.c b/libavcodec/ac3dec_fixed.c > index c9e5cda69c..0909c363f2 100644 > --- a/libavcodec/ac3dec_fixed.c > +++ b/libavcodec/ac3dec_fixed.c > @@ -152,7 +152,6 @@ static void ac3_downmix_c_fixed16(int16_t **samples, int16_t **matrix, > } > } > > -#include "eac3dec.c" > #include "ac3dec.c" > > static const AVOption options[] = { > diff --git a/libavcodec/ac3dec_float.c b/libavcodec/ac3dec_float.c > index 39d3cbd282..9756829643 100644 > --- a/libavcodec/ac3dec_float.c > +++ b/libavcodec/ac3dec_float.c > @@ -34,7 +34,6 @@ > #include "ac3dec.h" > #include "codec_internal.h" > #include "profiles.h" > -#include "eac3dec.c" > #include "ac3dec.c" > > static const AVOption options[] = { > diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c > index 5c71751a0c..491f663d3e 100644 > --- a/libavcodec/eac3dec.c > +++ b/libavcodec/eac3dec.c > @@ -55,7 +55,7 @@ typedef enum { > > #define EAC3_SR_CODE_REDUCED 3 > > -static void ff_eac3_apply_spectral_extension(AC3DecodeContext *s) > +void ff_eac3_apply_spectral_extension(AC3DecodeContext *s) > { > int bin, bnd, ch, i; > uint8_t wrapflag[SPX_MAX_BANDS]={1,0,}, num_copy_sections, copy_sizes[SPX_MAX_BANDS]; > @@ -194,7 +194,7 @@ static void idct6(int pre_mant[6]) > pre_mant[5] = even0 - odd0; > } > > -static void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch) > +void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch) > { > int bin, blk, gs; > int end_bap, gaq_mode; > @@ -287,7 +287,7 @@ static void ff_eac3_decode_transform_coeffs_aht_ch(AC3DecodeContext *s, int ch) > } > } > > -static int ff_eac3_parse_header(AC3DecodeContext *s) > +int ff_eac3_parse_header(AC3DecodeContext *s) > { > int i, blk, ch; > int ac3_exponent_strategy, parse_aht_info, parse_spx_atten_data; Won't this uninline functions needlessly in the float case? - Andreas _______________________________________________ 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".