From patchwork Wed Feb 1 14:32:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Kristofer_Bj=C3=B6rkstr=C3=B6m?= X-Patchwork-Id: 40203 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp387170pzj; Wed, 1 Feb 2023 06:33:17 -0800 (PST) X-Google-Smtp-Source: AK7set+ZH15qXNwZLq9PjmvgkAu7K0M5zGNou1UurOuC2w5XaWXNBs1rFOCq41FAujAcnIOaiZOk X-Received: by 2002:aa7:d383:0:b0:4a2:34dd:2bb9 with SMTP id x3-20020aa7d383000000b004a234dd2bb9mr2182773edq.41.1675261997168; Wed, 01 Feb 2023 06:33:17 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v13-20020a056402348d00b004a26577c1e3si8431083edc.526.2023.02.01.06.33.00; Wed, 01 Feb 2023 06:33:17 -0800 (PST) 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=@axis.com header.s=axis-central1 header.b=gq5ToHtR; dkim=neutral (body hash did not verify) header.i=@axis365.onmicrosoft.com header.s=selector2-axis365-onmicrosoft-com header.b="pq9vlh+/"; 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=NONE dis=NONE) header.from=axis.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9E8A968BE41; Wed, 1 Feb 2023 16:32:56 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88CD168BDA0 for ; Wed, 1 Feb 2023 16:32:49 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1675261974; x=1706797974; h=from:to:subject:date:message-id:mime-version; bh=FLOWNbhOxdGQziHYG/wJBmi2yYnX6i4CrHOMroHKPCA=; b=gq5ToHtR9XqM/aP5XZBaVu+GeSH60E3+i94386RQEMrEQv3WyKcPONX0 r4SZ4zJ9J3hyVLDaySDmxav8DGZNqQW0DtL4WIJCWndTz8gf8V5lsI0A2 vY1yHLd0itqnTyv5xGLiEhFUQAYZWh/289yJtyEaLDjFUYvTGSMB3o6Eg Gu/21y/P47VE9p7hoWInQW0buxg1J6XkSglTePpcsQx++MX646UMCn9Os +rVDBmcLR+HPFr1SlBggU2vq8W7PFkIl02w3VknPimLCArb28xv/4CcS7 tsPTyYhaUL8/a+AghfqXpmHD90LRlhkyxLlFdmEMOQKcsuLvVK3UFHYb1 g==; ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bYwboLOyv2ocECz5jJuOc/xWuKg/KWNF/ja7kMP/tjjNuiCEFkfECahukO/8oCezvKoT6pHYl+jY7AN7hvsZgaQg0SW5CtZP0JgYSnli0W1NVwyPEPJX6lLNUTNzWCxd6drN05YL2hohWhKg/IiTBgFWPBloZX9SStJyv4CmZJmAkdDpwYiiYOkELDZFB2X28ULaSkghBd7ySLCZSg+nlDU0vLPIMoaDG0vpqaeLOAhD+QWDEBwL1zX6/K+PXlAeH2w3rjKD0kW9/WXjD/VnJ78f+pY0quQYL8sVz4iK3ohdG1H1pi5aUlYnyxrSmYJUl3mrsPX6hQ3x5HHVTf83ug== 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=FLOWNbhOxdGQziHYG/wJBmi2yYnX6i4CrHOMroHKPCA=; b=YXAC8dxJtPCyecpRo95gRvI94IqKoLXUAaiDroTGLBHTNVfeD+cUj5kuqEppYlJ8T1jbGpJQ4EwNJBO42MuVVSQy0H32/LGyWKBUDu4Zety2NXyOX/+lw+H3W0cYcBqUxT8Hhz0Zag61g0Kp0MErRQ9eHz/p9m2hotMsmvQUMoaACJRUfBoCaRH3/VSnEiL7idqSpou0eaFDUdybAg5cXgcO2L7pOyWx0j8YYOtK+XTSZkAzxqI7nP9hbtuEK4Gc3JXV66Vns/1Hs3RB5zNZBHQBBzwWbxA9exM0FWa25pk0cEJDO02qkaBQARkE+k0GtuE1olsjeCbx6J1gA6sOeg== 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=FLOWNbhOxdGQziHYG/wJBmi2yYnX6i4CrHOMroHKPCA=; b=pq9vlh+//nhQGFzjQOWK61tICisK0S3wus+92wTWWRh0J67aY9qyo56Y8HH1p+kmB/bzAkFpKXYYjmiwhfybSQp0jWvDygLHbddunZdlpGYjkL9jyoWXciot47gvNPAkBcMPwlyH78fxYbld+gpq+w/5ieAP0ytyJMmIATa0AHM= From: =?iso-8859-1?q?Kristofer_Bj=F6rkstr=F6m?= To: FFmpeg development discussions and patches Thread-Topic: [PATCH] configure: add --disable-he-aac option Thread-Index: AQHZNkndNgb8j2w4bk+dhLs+2GEoMw== Date: Wed, 1 Feb 2023 14:32:46 +0000 Message-ID: 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_|PAVPR02MB9986:EE_ x-ms-office365-filtering-correlation-id: c9c1d9eb-fcd6-486b-99cb-08db04613024 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: gbLc99WWF5mW0k4FqUGrlrZK/+WFqFfZB86JMojAmxB7+vCUmtfj9K9brzV566hU1qcYaR3b552PtqTc7cucW0BSsOO0NnB5bfvZxSykD2loPBxGU52wVCuZHTfOYxoiOioCVqN8SIgfNaioX2IIscRONgGvl/dh4ZbzwsA3uIKPMr4A/EL20IG10civN2Op7xo+1f+DToxFgc6k73/99hrLomap9ObK712S+67SY0xCzWDzlNsyXQjgdj7l7YtFqWazI2HmmmucFJ/28B6XIs+3pO4JuYRe0MWRhGDpjaSh+0veO5YCTu5FQILiDlHfSh6ENreqW89QY1FEMnz7pF12WzVx2qkyWRKoRTJtOOZB5Y04qB7eZKL8qm0mM7IQqZpn2YqetCnxcqJ/nurEesMbRA/HeKcd/v9LsRe/H2Jl9ZhO28vBhHLT7Dp3BgDbhXBz4w8vW9K0V3vWk9eCahWfWM+aC5hX7APSB3Okh1SXyILHlPznyQTeyBYYWvLd3Z4KYLF4Tj2bpSmXHr/JD4mrvc7YmwCwwHty1W2VqzrI2nV7XAFr6mxcYXMGzZu/HIxwjtQ+rACKciW1ioW8YsMNsD2mwNMQQb6RifAW35CS6daozbJckmuS8cbl/GGVEukWHZJFZyC1t5rL9Zkr8rsim1LI9FfuvVPT+HCxrw0OCO24Z4lO6Oy2a6SOh3oyYxWKcOgq8ZZKTvFPgCi2Yw== 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)(396003)(366004)(376002)(39850400004)(136003)(346002)(451199018)(19627405001)(71200400001)(7696005)(316002)(83380400001)(66574015)(2906002)(33656002)(122000001)(38100700002)(6506007)(66476007)(66556008)(6916009)(53546011)(91956017)(76116006)(66946007)(8676002)(26005)(9686003)(478600001)(186003)(52536014)(41300700001)(55016003)(86362001)(64756008)(38070700005)(66446008)(5660300002)(8936002); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?yTBHUGcfl1oFiIzcmMHmHc4?= =?iso-8859-1?q?eDXxdCZwtt8MKh1aGYaQ/Ik5LvhkxaVA+Hm2FhXrCFTtiZVJeZjUibxDCZOJ?= =?iso-8859-1?q?JRF8whfskRVjyCsOPYDHYJPJ/7UyEPa0jF9EEjjfp4vVfat3cR1mtzFsHyYY?= =?iso-8859-1?q?mkngIxoKrTGEH04P0MsSrsbebORckGHVA8UGdh7gTrNt7xDsHrl9QzoksPu+?= =?iso-8859-1?q?s5dIRfJoe0BB+dYAr6Xwmzihcfh/0kzKPSrKOjLDjU6aETBAWUQvDamqHPWF?= =?iso-8859-1?q?YViRIZv6ZTAYRYwYGzgj4b2uL4qIVmVejShb7y1B69hPaZM90ItO/PXbZjjD?= =?iso-8859-1?q?V+0071Y76n3ZXd9tbgcgTGUgBtyALh4Maa1B9IBBtKisiBQ/2nYnJ3PHOdVN?= =?iso-8859-1?q?U0ZBKvzAHKzu7qumIVng1gLKfuhDJHrZj2Z0KAHk7y10YYg/ucCXXm4hCEiF?= =?iso-8859-1?q?orkyiBmQmpP3Wapc5TAIvzvfutYDsaKXcJ7uDWQ4O0glpCN6jNN75A49xaHY?= =?iso-8859-1?q?Om1h9CW66Btl6DECDgTMf58RiOqVyZvyaQM+GfYWxsmZkfbD3QCEflnTAwVQ?= =?iso-8859-1?q?k8Pag2F9gMrxbhGZWxhw3WzMdVQ/z5zblkkfUIXPkvp6nP6SZlbackn9Cset?= =?iso-8859-1?q?i5oMI3s6jCOmv9eyEsJRUZFcJexHIshRkn9qzpC7BssRdhKpjTMl5SNiB2ZV?= =?iso-8859-1?q?b0IIVM8vUa6YlBvm9qrBCYtEhn+6QcChVZbaCQn8031BRLAh5ZBbE0Oz10UJ?= =?iso-8859-1?q?cyMDCZPOeJ3nKTgWqKciB+pO9JHv+Nu5c2lXtqzj+D/C0tIN7Xv/7qZZ9KiY?= =?iso-8859-1?q?bMhMwk93kINVQ3XAsHEJb6Proa3AskXEht8XJVebvk0luoN2XZZzz3bz0M/t?= =?iso-8859-1?q?w8/GyRff0LB0ew95bTUDNg9sNYay3irKQ1cu80JG1tkpBtTdMabRFBAuQc94?= =?iso-8859-1?q?/dZagZQfZaoDSFEYYtFU7Du6AHpCrcp7nSTtR6LPi30ftqvZuwPIW7m7GvYO?= =?iso-8859-1?q?NlCLd3HJHiXr2WRbC5sGt++p+Qy7AEv5niHUFUyXX+iocE3Mj/RqdcgzhEDy?= =?iso-8859-1?q?0z3sl7e/JPrQsmLNWN9JRdNDMRkz5OltXqfRJIxLSDiq5o5LQohQNkaElzRE?= =?iso-8859-1?q?3aDopSXazjsOuyAkSUtTPhbWm1TLGFfIbX4HvfefGsYJzwkxsxyAanVwk4Uf?= =?iso-8859-1?q?D5q0LCVPp4CaAgCNJXQf+InjjsaTowFZQgjTFOvPkxSn2EBu3FSZPSvjwmq0?= =?iso-8859-1?q?ioYRWZ9MrF4vfMCxuRDkRMdhausjW5KQZMthS9mMjeCuOZhmpa/uXV8M4EVB?= =?iso-8859-1?q?6N3TZf6KfoNM59GQkVjzY3JpQM1kLIRWqONvm7VP2HIhlloI/u3QvwYRWjB5?= =?iso-8859-1?q?Y2Gl2KWQscT7FjzVD+SjIGkc5RPI6bkxDsGf6K4EGN0LEFqThqSRNGiYSkaU?= =?iso-8859-1?q?Pq1LVotvM8yLx1iuwXLp59s+keRLVKzxS8nodTF8nqkXHfQdE2FJst+xE2jY?= =?iso-8859-1?q?+UeuZTnvt9Ry8Cm2E8Jn/hhWWD80r5OEWQexbUWHSPlHY0jgypVZGEoZqUf/?= =?iso-8859-1?q?rU3aWdRCrTTC5XOLXVn1MIiKbOOEoHKNPRQLiZbGphDxSINRNmpHpAKU=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: c9c1d9eb-fcd6-486b-99cb-08db04613024 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Feb 2023 14:32:46.8788 (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: fNFIjwSX6MScfpep5KZQGvmMtd6l7ljkdIt32IYvpe7QsOEqZgOYDOsSOgocZsD601ENreFJbk10QspfK/GDng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAVPR02MB9986 X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] configure: add --disable-he-aac option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +doMZXT3g5lj From 6828ea418f0209dface9fbb23ff4657f66988f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristofer=20Bj=C3=B6rkstr=C3=B6m?= Date: Wed, 1 Feb 2023 15:15:14 +0100 Subject: [PATCH] configure: add --disable-he-aac option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make it possible to disable HE and HEv2 support for AAC. To avoid patents in HE-AAC. Signed-off-by: Kristofer Björkström --- configure | 6 ++++++ libavcodec/aacdec_template.c | 6 ++++++ 2 files changed, 12 insertions(+) -- 2.30.2 diff --git a/configure b/configure index 47790d10f5..e51dd0027a 100755 --- a/configure +++ b/configure @@ -145,6 +145,7 @@ Component options: --disable-fft disable FFT code --disable-faan disable floating point AAN (I)DCT code --disable-pixelutils disable pixel utils in libavutil + --disable-he-aac disable HE and HEv2 support for AAC Individual component options: --disable-everything disable all components listed below @@ -1989,6 +1990,7 @@ CONFIG_LIST=" $SUBSYSTEM_LIST autodetect fontconfig + he_aac large_tests linux_perf macos_kperf @@ -4227,6 +4229,10 @@ for e in $env; do eval "export $e" done +if disabled he_aac; then + add_cflags -DHE_AAC_DISABLED +fi + if disabled autodetect; then # Unless iconv is explicitely disabled by the user, we still want to probe diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 444dc4fa9d..3b95468067 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -1019,6 +1019,12 @@ static int decode_audio_specific_config_gb(AACContext *ac, *m4ac = m4ac_bak; return AVERROR_INVALIDDATA; } +#if HE_AAC_DISABLED + if (m4ac->ps > 0 || m4ac->sbr > 0 || avctx->profile >= FF_PROFILE_AAC_HE) { + av_log(avctx, AV_LOG_ERROR, "HE-AAC is not supported\n"); + return AVERROR_INVALIDDATA; + } +#endif skip_bits_long(gb, i);