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 18AA845571 for ; Wed, 1 Feb 2023 14:55:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 531DA68BE50; Wed, 1 Feb 2023 16:55:36 +0200 (EET) Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3507668BD86 for ; Wed, 1 Feb 2023 16:55:29 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1675263335; x=1706799335; h=from:to:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=S7LvL9717ld9e10ZH2ngLZytebJUN+O6BXW2dfw/L5s=; b=HM5rrbtgvabccNYZxWS83lWIMqjVZgvo0P/lD/BLaZJH9xjrX71ZjvRx lMRLfUX+IbXnXSHxfI6RnW/+1qEMM2Zv+qh1AWVwVxtnq3vVA/3Adh/bR H408vK6KeRP4Xuj57GTP1T5uBsNjTmvGXoDwdpd7UwRtkLSVjWpHH4NTt Lznrq2BPspI7/QCkimfl81iekdQZA3a5D9nAv/9D5NFoWo4umRAw3kt4R zPusjj8nw0dboKvdcywbKAUiSOx6AwRvtxW4xlEFy577VnLJ+VmH1wW8L aKOINSS0yH9cbDUsUnTtdqNpWLKCjANpFoTL/vPUTvL8gsnymakpSK76i w==; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mV3siNle2Xtuh8pV+LSvKcko9sbaqot/AOOeUxmeor9n7eTVUFLZXrKqnjPn0qvWCuQzwOxCH2DsNduPOE0JMUmb20zeErfAoZK5KhqEjXJLsXIwfWBm8cWgYyVjuQixBK/w1QO/NJ/LxN5tktFx72fn3+Amh1HZEVxvfa5xcHRwbnba+35cgOrlf9AQfFyogDiNRnU6CB5i8IGOMTB5jCJenZqVHl0cC2y525hDqpdP9AvsUqyrvDT5AuhsQKdycBu2dK7lC5Nthr3WbEaop0BZvsku46cpYYos4y1GgTjIMA/+Q8qgoQIZuMfFz+oOyab4cclPJSXB2/GCSES2QQ== 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=S7LvL9717ld9e10ZH2ngLZytebJUN+O6BXW2dfw/L5s=; b=ZYr+ur8YMIQtAFjsLGy4t6Xh8+PtRYShnsPeIlnKgd2nbNI5iO50Jtreys/Do3yqsJSeVryXV7CYTovzpJHAEMY/dhAERpLg1reoNX4gn4R62bF8LQQC8XGldqGgttR7vQwb0znGP0L4KbznSw+EL5i8l3aeVmTFRNPG3PBk+bCBJkh9rIZcnIr9gpt0d4nHO2gKdNRE+BWeMzKe+/O50/Y2pfD9O6VQHa+bQ58Cf24m6CTyypXHyfXHMOGq1uqIwsbKDOEV2dPryTqYx1uHhey2eFPOoA25RkRIaV2z+JTaZttXIQrxA4eSGpQnSzJSMJtEreZLO0pXogOjGMpYMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=axis.com; dmarc=pass action=none header.from=axis.com; dkim=pass header.d=axis.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis365.onmicrosoft.com; s=selector2-axis365-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=S7LvL9717ld9e10ZH2ngLZytebJUN+O6BXW2dfw/L5s=; b=Zb171dCtVz5hPKtxrVPAT4tR6fe/T8AuC5vF4GAW/IHK/S8x4Q3qCnfUJK6BUaeUrO/ZqxPShaT4qX2EerGbuKkMBqXX4Z78msWJdvs37HaZ4kRWGo7pBWqIPO5dwxjWv6AJooUaOMScQJXDg805Amzmv5NlSpcCKy9HJpZFFoE= From: =?iso-8859-1?Q?Kristofer_Bj=F6rkstr=F6m?= To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [FFmpeg-devel] [PATCH] avcodec: add ACC_NON_HE decoder Thread-Index: AQHZNZFr/kNhfBHr/0GxNn8IVHIRTa649zEAgAE2G2Q= Date: Wed, 1 Feb 2023 14:55:27 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=axis.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DU0PR02MB9171:EE_|PAWPR02MB9127:EE_ x-ms-office365-filtering-correlation-id: 2cc54519-789a-4cc8-7710-08db04645b1c x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7Zk6EPGsfBappSkl7bqXIYHLHfVNjXPm7ldchGZjnxOUP1P3/YjcKW9tfnGjEH7rWSTdfxqrkLtHbRDnMF9jrqWhGBqlc8IUwm5YPklSC472IDdrpLJsUKLqU+3agIxakA+sXojFvIDNaEsWFriRlHr7ROWOUkl2VjHYQybyZzDpo1yoBq3DcxNHrPysDL6vAWlBH0yKmzibl3c0sX3JDKeodraTwZssQBJ9gUziLHHLryKqo+acYw1e9HLLScg23xIvqmz1hSLZQBmWN3HETXcqSzXD2vr7FzgB7yKwSfVqzZiOgMpk/TQo1gyUEw7YMshpwFmq/YlWG+ztLRSfbFLomRntHovSP9Vw6WVHcGD4Tf49ktuYgY0QKaqjnPWPxxIIl2RdYITpUgeK55ZRqRinS3Og6SymTQFe2Eqov+QZm8PDFhXVVSNE3hHHfVEuvNvuSkJRvql/W+8etmYfD5ynE6i7tGl5Y5zhHheXszsDRLigCJJe1C2u4/wu+Ltpt03qkjMyPrOSBGKNrgXfhGV7NtbXGLBd/Kcie0/atDXPsn4wFkQOmPypwySMm3yylT/o3X7yU0u7QJOIEqxGhLmcsouPdaU2l16i4wmmlHJZ+1gmsnN7jamj695rNA9subsL76C0HZWTc1+ZamRh+zGaOz8+um59EhIOyVkgjLxrhjinYSl5Ke85/xQfN9g+N34129HG2wePABBTlvprF7XjkaInyGZm9tGzOxVxpH4= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR02MB9171.eurprd02.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230025)(4636009)(136003)(346002)(376002)(39860400002)(366004)(396003)(451199018)(66476007)(66556008)(66446008)(66946007)(41300700001)(76116006)(8676002)(6916009)(64756008)(8936002)(30864003)(52536014)(316002)(91956017)(2906002)(5660300002)(66899018)(966005)(71200400001)(478600001)(6506007)(186003)(9686003)(26005)(7696005)(66574015)(83380400001)(38070700005)(55016003)(38100700002)(122000001)(86362001)(33656002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?nCuz/QJAgtP36DI+6cTW4DNIfjd7c59YWhawOQpYceloCKNvS4hxA9azSf?= =?iso-8859-1?Q?/yCpMeYzTl6Tv/PXc+QZadsKmSkXccDzsCxgResLEDXX8yY6Ec6EUd3kEU?= =?iso-8859-1?Q?484udnY+gax8Q//TvgWxlTriYE5yIN1FMfMA2mfny6kj2Ihvm6lOvwfhBW?= =?iso-8859-1?Q?q61GT0GHthusW9AbAXHTInbPPsxafug+/QKV/pOa3S/tkt9jUvPhACuUAr?= =?iso-8859-1?Q?LeZG5jRbXfYrDjkVpL5NYsjyM73m8p4E2e3aimTsX6i7aZOl61LG9DcvCr?= =?iso-8859-1?Q?8AIunRAEHBZwJ66bkGP/bYf2lT6uNVDHUItnctBejbWIcTklqeQRJhOcTz?= =?iso-8859-1?Q?di1aAn9JLHxkRKUrojTJfNdVV++pU4UKdB48zwdnyWpElJL5v8PM3OU0n1?= =?iso-8859-1?Q?gMAfsEKKQruckWEIHaQg9IXe9AKD8baYPEfiD4k0JlEn+0eqjgJtD+CAv4?= =?iso-8859-1?Q?MhKztmIM24CTIfkIpNeCtHC12a+apHzkYJKhAvbNGgOCnufvTo35TQoOz6?= =?iso-8859-1?Q?m1V8DxN4oW1aSETTsQVRuA9WRIC/SMBVGogxg0X15c6PYdYZem5Rvvj19Q?= =?iso-8859-1?Q?zZ1vUIsKGdqYJXq9UE/D5zIynJCAAWM2G9qWlCqrSg6VluOluleFESIgfo?= =?iso-8859-1?Q?BXQFWt490Lfopm56nLk91TxbJeXSDI7XuKYIArE/RTL2N7cPYKhmgBJICg?= =?iso-8859-1?Q?/yRXjwYlXc3KtwB5cuLUKJ5HJS2EORHrGUv5Ft/+tuYO92Li69w/Emf0OM?= =?iso-8859-1?Q?lx5nDzG7CgQPp4DMeY0ipE72xn8UF0+NmDFLyAKLicNz+6A2JegGxITDYs?= =?iso-8859-1?Q?SQ3hbp9LnIEFElg8XZtrjGq2NVIVCH0HCefO7Nawwmc5UygzJmbOl/Pm5s?= =?iso-8859-1?Q?/FaAetF0EkuVywHtSq6mDGcgtP6bnUjhxee/DNFdocySNnyhL5Z8NqgNU4?= =?iso-8859-1?Q?VIh6pyov4a0Oz+c94KNGnziFf+yGqj46WECUGSEPCsRYLeafl1w5iafsXw?= =?iso-8859-1?Q?Ds0jq8ZfqOtkJCnoc7qPos4O8ZjB6u+Fj9OgDQdtVshoRBpn9ySQuVJjCB?= =?iso-8859-1?Q?GS2ots3uiLRGlPuMdq2mXbNrWufqTIaDmx2zqyB3IKX2jIUGfIPg+No7RN?= =?iso-8859-1?Q?vl7pN4/mok9B0vdOKwgV2qF04YsHbGyI0VrNbZbQYJSMW/iSPm5neDkH0m?= =?iso-8859-1?Q?0QkM6d6dMRiGWz/INvDO5w+n71O4AJCI7pMxJ/TAdW/nnyr7HYZKPFGfYW?= =?iso-8859-1?Q?zhxtUnSFhmFYd9IFma/cItKkD+un7ynB+JrvElaZ1yAPql2OXMmlcw3NJ8?= =?iso-8859-1?Q?k7hEiv3lz7EjznukgM9N/839IsCUj8+kxTA16p3G4C2M9Eirmkw8OiMgpE?= =?iso-8859-1?Q?jIVzlk0CQZEr9xJXU5d3IjrVLQMz6in/TtyXeT2Zsy3csJ6icxItcxFxLe?= =?iso-8859-1?Q?NGe/2n4AC2JEpXJmDPaOKQ8cYFgPK/v0MYPZztMEZAU8laVC+jvrBT9A+n?= =?iso-8859-1?Q?M5ItJ9pXqKtgvgRkkhzHnvjk0vJwIbxU8/MEA10+Pdj2xFlJKWOEXxn1BB?= =?iso-8859-1?Q?n9F5CjXYB02x/rNBq39wS3M8TXZwIaCmBEVN/DDcdpJF1pTOCwbCplIdWI?= =?iso-8859-1?Q?L4kgawjwEP2iw=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DU0PR02MB9171.eurprd02.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2cc54519-789a-4cc8-7710-08db04645b1c X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Feb 2023 14:55:27.4265 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 78703d3c-b907-432f-b066-88f7af9ca3af X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: HEIGwpXatcJv+BwiYdFYf7eAwPe6LGvOSJqIyUcZS804loKfex0liEkTCryX/nqANSRtXxTT9vP2BcWWheLH2g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR02MB9127 Subject: Re: [FFmpeg-devel] [PATCH] avcodec: add ACC_NON_HE decoder 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="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: >Kristofer Bj=F6rkstr=F6m: >> As ACC decoder but with HE and HEv2 disabled. >> = >> Signed-off-by: Kristofer Bj=F6rkstr=F6m > >> --- >> Changelog | 1 + >> configure | 1 + >> libavcodec/Makefile | 3 +++ >> libavcodec/aacdec.c | 21 +++++++++++++++++++++ >> libavcodec/aacdec_template.c | 8 ++++++++ >> libavcodec/aactab.c | 2 +- >> libavcodec/aarch64/Makefile | 4 ++++ >> libavcodec/allcodecs.c | 1 + >> libavcodec/arm/Makefile | 4 ++++ >> libavcodec/mips/Makefile | 4 ++++ >> libavcodec/version.h | 2 +- >> libavcodec/x86/Makefile | 4 ++++ >> tests/checkasm/Makefile | 2 ++ >> tests/checkasm/checkasm.c | 2 +- >> 14 files changed, 56 insertions(+), 3 deletions(-) >> = >> diff --git a/Changelog b/Changelog >> index aa0dad13a1..a9f5b54baa 100644 >> --- a/Changelog >> +++ b/Changelog >> @@ -35,6 +35,7 @@ version >: >> - ffmpeg CLI new options: -enc_stats_pre[_fmt], -enc_stats_post[_fmt] >> - hstack_vaapi, vstack_vaapi and xstack_vaapi filters >> - XMD ADPCM decoder and demuxer >> +- ACC NON HE decoder > >What is the aim of this? Is it patents? To avoid patents in AAC HE > >> = >> = >> version 5.1: >> diff --git a/configure b/configure >> index 47790d10f5..7a06c1a34c 100755 >> --- a/configure >> +++ b/configure >> @@ -2746,6 +2746,7 @@ rdft_select=3D"fft" >> = >> # decoders / encoders >> aac_decoder_select=3D"adts_header mpeg4audio sinewin" >> +aac_non_he_decoder_select=3D"adts_header mpeg4audio sinewin" >> aac_fixed_decoder_select=3D"adts_header mpeg4audio" >> aac_encoder_select=3D"audio_frame_queue iirfilter lpc sinewin" >> aac_latm_decoder_select=3D"aac_decoder aac_latm_parser" >> diff --git a/libavcodec/Makefile b/libavcodec/Makefile >> index 304c2bc2e3..43d86e1899 100644 >> --- a/libavcodec/Makefile >> +++ b/libavcodec/Makefile >> @@ -180,6 +180,9 @@ OBJS-$(CONFIG_A64MULTI5_ENCODER) +=3D a64multi= enc.o elbg.o >> OBJS-$(CONFIG_AAC_DECODER) +=3D aacdec.o aactab.o aacsbr.o = aacps_common.o aacps_float.o \ >> kbdwin.o \ >> sbrdsp.o aacpsdsp_float.o cbr= t_data.o >> +OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D aacdec.o aactab.o aacsbr.o = aacps_common.o aacps_float.o \ >> + kbdwin.o \ >> + sbrdsp.o aacpsdsp_float.o cbr= t_data.o > >This will require keeping both these lists and all similar lists in all >arch-specific Makefiles in sync. This is maintainence work and prone to >fail; the usual way to achieve this aim is by making a decoder select >another one in configure. New patch "[PATCH] configure: add --disable-he-aac option" avoids this > >> OBJS-$(CONFIG_AAC_FIXED_DECODER) +=3D aacdec_fixed.o aactab.o aac= sbr_fixed.o aacps_common.o aacps_fixed.o \ >> kbdwin.o \ >> sbrdsp_fixed.o aacpsdsp_fixed= .o cbrt_data_fixed.o >> diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c >> index ca31540d3c..b55de9e180 100644 >> --- a/libavcodec/aacdec.c >> +++ b/libavcodec/aacdec.c >> @@ -571,6 +571,27 @@ const FFCodec ff_aac_decoder =3D { >> .p.profiles =3D NULL_IF_CONFIG_SMALL(ff_aac_profiles), >> }; >> = >> +const FFCodec ff_aac_non_he_decoder =3D { >> + .p.name =3D "aac", >> + CODEC_LONG_NAME("AAC (Advanced Audio Coding)"), >> + .p.type =3D AVMEDIA_TYPE_AUDIO, >> + .p.id =3D AV_CODEC_ID_AAC, >> + .priv_data_size =3D sizeof(AACContext), >> + .init =3D aac_decode_init, >> + .close =3D aac_decode_close, >> + FF_CODEC_DECODE_CB(aac_decode_frame), >> + .p.sample_fmts =3D (const enum AVSampleFormat[]) { >> + AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE >> + }, >> + .p.capabilities =3D AV_CODEC_CAP_CHANNEL_CONF | AV_CODEC_CAP_DR1, >> + .caps_internal =3D FF_CODEC_CAP_INIT_CLEANUP, >> + CODEC_OLD_CHANNEL_LAYOUTS_ARRAY(aac_channel_layout) >> + .p.ch_layouts =3D aac_ch_layout, >> + .flush =3D flush, >> + .p.priv_class =3D &aac_decoder_class, >> + .p.profiles =3D NULL_IF_CONFIG_SMALL(ff_aac_profiles), >> +}; >> + >> /* >> Note: This decoder filter is intended to decode LATM streams transf= erred >> in MPEG transport streams which only contain one program. >> diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c >> index 444dc4fa9d..bdadecac54 100644 >> --- a/libavcodec/aacdec_template.c >> +++ b/libavcodec/aacdec_template.c >> @@ -93,6 +93,7 @@ >> #include "libavutil/thread.h" >> #include "decode.h" >> #include "internal.h" >> +#include "config_components.h" >> = >> static VLC vlc_scalefactors; >> static VLC vlc_spectral[11]; >> @@ -1019,7 +1020,14 @@ static int decode_audio_specific_config_gb(AACCon= text *ac, >> *m4ac =3D m4ac_bak; >> return AVERROR_INVALIDDATA; >> } >> +#if CONFIG_AAC_NON_HE_DECODER >> + if (m4ac->>ps >> 0 || m4ac->>sbr >> 0 || avctx->>profile >>=3D FF_P= ROFILE_AAC_HE) { >> = >> + av_log(avctx, AV_LOG_ERROR, "HE-AAC is not supported\n"); >> + >> + return AVERROR_INVALIDDATA; >> + } >> +#endif > >1. This is completely wrong, as it does not distinguish between the >non-HE decoder and the ordinary decoders (i.e. it will cripple the >latter one). >2. Although you only add a floating-point non-HE decoder, you also add >this check to the fixed-point decoders (and cripple them in the process). > > Thanks for pointing that out. Hopefully better with new patch: "[PATCH] con= figure: add --disable-he-aac option" >> skip_bits_long(gb, i); >> = >> switch (m4ac->>object_type) { >> diff --git a/libavcodec/aactab.c b/libavcodec/aactab.c >> index 0f4941d5df..cf75904958 100644 >> --- a/libavcodec/aactab.c >> +++ b/libavcodec/aactab.c >> @@ -39,7 +39,7 @@ >> float ff_aac_pow2sf_tab[428]; >> float ff_aac_pow34sf_tab[428]; >> = >> -#if CONFIG_AAC_ENCODER || CONFIG_AAC_DECODER >> +#if CONFIG_AAC_ENCODER || CONFIG_AAC_DECODER || CONFIG_AAC_NON_HE_DECOD= ER >> #include "kbdwin.h" >> #include "sinewin.h" >> = >> diff --git a/libavcodec/aarch64/Makefile b/libavcodec/aarch64/Makefile >> index 02fb51c3ab..016371a166 100644 >> --- a/libavcodec/aarch64/Makefile >> +++ b/libavcodec/aarch64/Makefile >> @@ -17,6 +17,8 @@ OBJS-$(CONFIG_VP8DSP) +=3D aarch64/v= p8dsp_init_aarch64.o >> # decoders/encoders >> OBJS-$(CONFIG_AAC_DECODER) +=3D aarch64/aacpsdsp_init_aarc= h64.o \ >> aarch64/sbrdsp_init_aarch64.o >> +OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D aarch64/aacpsdsp_init_aarc= h64.o \ >> + aarch64/sbrdsp_init_aarch64.o >> OBJS-$(CONFIG_DCA_DECODER) +=3D aarch64/synth_filter_init.o >> OBJS-$(CONFIG_OPUS_DECODER) +=3D aarch64/opusdsp_init.o >> OBJS-$(CONFIG_RV40_DECODER) +=3D aarch64/rv40dsp_init_aarch= 64.o >> @@ -36,6 +38,7 @@ ARMV8-OBJS-$(CONFIG_VIDEODSP) +=3D aarch64/v= ideodsp.o >> = >> # subsystems >> NEON-OBJS-$(CONFIG_AAC_DECODER) +=3D aarch64/sbrdsp_neon.o >> +NEON-OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D aarch64/sbrdsp_neon.o >> NEON-OBJS-$(CONFIG_FFT) +=3D aarch64/fft_neon.o >> NEON-OBJS-$(CONFIG_FMTCONVERT) +=3D aarch64/fmtconvert_neon.o >> NEON-OBJS-$(CONFIG_H264CHROMA) +=3D aarch64/h264cmc_neon.o >> @@ -56,6 +59,7 @@ NEON-OBJS-$(CONFIG_VP8DSP) +=3D aarch64/v= p8dsp_neon.o >> = >> # decoders/encoders >> NEON-OBJS-$(CONFIG_AAC_DECODER) +=3D aarch64/aacpsdsp_neon.o >> +NEON-OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D aarch64/aacpsdsp_neon.o >> NEON-OBJS-$(CONFIG_DCA_DECODER) +=3D aarch64/synth_filter_neon.o >> NEON-OBJS-$(CONFIG_OPUS_DECODER) +=3D aarch64/opusdsp_neon.o >> NEON-OBJS-$(CONFIG_VORBIS_DECODER) +=3D aarch64/vorbisdsp_neon.o >> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c >> index ff82423a88..72ae363fbf 100644 >> --- a/libavcodec/allcodecs.c >> +++ b/libavcodec/allcodecs.c >> @@ -423,6 +423,7 @@ extern const FFCodec ff_zmbv_decoder; >> /* audio codecs */ >> extern const FFCodec ff_aac_encoder; >> extern const FFCodec ff_aac_decoder; >> +extern const FFCodec ff_aac_non_he_decoder; >> extern const FFCodec ff_aac_fixed_decoder; >> extern const FFCodec ff_aac_latm_decoder; >> extern const FFCodec ff_ac3_encoder; >> diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile >> index 5d284bdc01..f813cdc65f 100644 >> --- a/libavcodec/arm/Makefile >> +++ b/libavcodec/arm/Makefile >> @@ -35,6 +35,8 @@ OBJS-$(CONFIG_VP8DSP) +=3D arm/vp8dsp= _init_arm.o >> # decoders/encoders >> OBJS-$(CONFIG_AAC_DECODER) +=3D arm/aacpsdsp_init_arm.o = \ >> arm/sbrdsp_init_arm.o >> +OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D arm/aacpsdsp_init_arm.o = \ >> + arm/sbrdsp_init_arm.o >> OBJS-$(CONFIG_DCA_DECODER) +=3D arm/synth_filter_init_arm.o >> OBJS-$(CONFIG_FLAC_DECODER) +=3D arm/flacdsp_init_arm.o = \ >> arm/flacdsp_arm.o >> @@ -134,6 +136,8 @@ NEON-OBJS-$(CONFIG_VP8DSP) +=3D arm/vp8d= sp_init_neon.o \ >> # decoders/encoders >> NEON-OBJS-$(CONFIG_AAC_DECODER) +=3D arm/aacpsdsp_neon.o = \ >> arm/sbrdsp_neon.o >> +NEON-OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D arm/aacpsdsp_neon.o = \ >> + arm/sbrdsp_neon.o >> NEON-OBJS-$(CONFIG_LLAUDDSP) +=3D arm/lossless_audiodsp_neon.o >> NEON-OBJS-$(CONFIG_DCA_DECODER) +=3D arm/synth_filter_neon.o >> NEON-OBJS-$(CONFIG_HEVC_DECODER) +=3D arm/hevcdsp_init_neon.o = \ >> diff --git a/libavcodec/mips/Makefile b/libavcodec/mips/Makefile >> index 05ed63bf3e..1070b5e77f 100644 >> --- a/libavcodec/mips/Makefile >> +++ b/libavcodec/mips/Makefile >> @@ -20,6 +20,10 @@ OBJS-$(CONFIG_AAC_DECODER) +=3D mips/a= acdec_mips.o \ >> mips/aacsbr_mips.o = \ >> mips/sbrdsp_mips.o = \ >> mips/aacpsdsp_mips.o >> +OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D mips/aacdec_mips.o = \ >> + mips/aacsbr_mips.o = \ >> + mips/sbrdsp_mips.o = \ >> + mips/aacpsdsp_mips.o >> MIPSDSP-OBJS-$(CONFIG_AAC_ENCODER) +=3D mips/aaccoder_mips.o >> MIPSFPU-OBJS-$(CONFIG_AAC_ENCODER) +=3D mips/iirfilter_mips.o >> OBJS-$(CONFIG_HEVC_DECODER) +=3D mips/hevcdsp_init_mips.o= \ >> diff --git a/libavcodec/version.h b/libavcodec/version.h >> index 2ed4ef5547..499c6bb175 100644 >> --- a/libavcodec/version.h >> +++ b/libavcodec/version.h >> @@ -29,7 +29,7 @@ >> = >> #include "version_major.h" >> = >> -#define LIBAVCODEC_VERSION_MINOR 60 >> +#define LIBAVCODEC_VERSION_MINOR 61 >> #define LIBAVCODEC_VERSION_MICRO 100 >> = >> #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR= , \ >> diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile >> index 118daca333..64fec2ce59 100644 >> --- a/libavcodec/x86/Makefile >> +++ b/libavcodec/x86/Makefile >> @@ -41,6 +41,8 @@ OBJS-$(CONFIG_XMM_CLOBBER_TEST) +=3D x86/w64xmm= test.o >> # decoders/encoders >> OBJS-$(CONFIG_AAC_DECODER) +=3D x86/aacpsdsp_init.o = \ >> x86/sbrdsp_init.o >> +OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D x86/aacpsdsp_init.o = \ >> + x86/sbrdsp_init.o >> OBJS-$(CONFIG_AAC_ENCODER) +=3D x86/aacencdsp_init.o >> OBJS-$(CONFIG_ADPCM_G722_DECODER) +=3D x86/g722dsp_init.o >> OBJS-$(CONFIG_ADPCM_G722_ENCODER) +=3D x86/g722dsp_init.o >> @@ -151,6 +153,8 @@ X86ASM-OBJS-$(CONFIG_VP8DSP) +=3D x86/vp8d= sp.o \ >> # decoders/encoders >> X86ASM-OBJS-$(CONFIG_AAC_DECODER) +=3D x86/aacpsdsp.o = \ >> x86/sbrdsp.o >> +X86ASM-OBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D x86/aacpsdsp.o = \ >> + x86/sbrdsp.o >> X86ASM-OBJS-$(CONFIG_AAC_ENCODER) +=3D x86/aacencdsp.o >> X86ASM-OBJS-$(CONFIG_ADPCM_G722_DECODER) +=3D x86/g722dsp.o >> X86ASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) +=3D x86/g722dsp.o >> diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile >> index a6f06c7007..dd8ac1f278 100644 >> --- a/tests/checkasm/Makefile >> +++ b/tests/checkasm/Makefile >> @@ -20,6 +20,8 @@ AVCODECOBJS-$(CONFIG_VIDEODSP) +=3D videodsp.o >> # decoders/encoders >> AVCODECOBJS-$(CONFIG_AAC_DECODER) +=3D aacpsdsp.o \ >> sbrdsp.o >> +AVCODECOBJS-$(CONFIG_AAC_NON_HE_DECODER) +=3D aacpsdsp.o \ >> + sbrdsp.o >> AVCODECOBJS-$(CONFIG_ALAC_DECODER) +=3D alacdsp.o >> AVCODECOBJS-$(CONFIG_DCA_DECODER) +=3D synth_filter.o >> AVCODECOBJS-$(CONFIG_EXR_DECODER) +=3D exrdsp.o >> diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c >> index e96d84a7da..8f7796ca3a 100644 >> --- a/tests/checkasm/checkasm.c >> +++ b/tests/checkasm/checkasm.c >> @@ -74,7 +74,7 @@ static const struct { >> void (*func)(void); >> } tests[] =3D { >> #if CONFIG_AVCODEC >> - #if CONFIG_AAC_DECODER >> + #if CONFIG_AAC_DECODER || CONFIG_AAC_NON_HE_DECODER >> { "aacpsdsp", checkasm_check_aacpsdsp }, >> { "sbrdsp", checkasm_check_sbrdsp }, >> #endif >> -- >> 2.30.2 >> = >> _______________________________________________ >> 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". Hi Posted a new patch: [PATCH] configure: add --disable-he-aac option _______________________________________________ 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".