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 791D3434F3 for ; Thu, 14 Jul 2022 12:10:30 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 386B168BA4E; Thu, 14 Jul 2022 15:10:27 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2106.outbound.protection.outlook.com [40.92.91.106]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29F2B68B992 for ; Thu, 14 Jul 2022 15:10:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=J0qXnTevFaJ6tRSkFxHtIOPz1eOOcfMzYLbz74xsR/xSo2LGLxmmLllz5wxw9n0AnQ4ktgDlSNi+4mBTWJlxqTtyZDEWg2c4qJEKBD6fg4V66H7xeRdOscjQqjhWc0ZjNxv1S9/VvwuESRTfVVZF7cbNyb1xP8twO5x4cat615G+6e7YbfkWs2/Fh3nkMbi5a0zUKJ1a9GxksZV3bJdZgw70clCgHIi2EG+aYFId4plsLu8Iq6ikr5Nn8USDHJQZM1QZ3tzxi0HtMKvIbDQGzeML9T9uIjWd7u6wDcHQCHHh9h44TcoPYhCM5/GLm7vvvX49z4+rEJk19Ma9PEERtQ== 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=PmCQVQPw3lNM0ecQLmL2AWf3TRD5kVi8xhSfRQqSB7Q=; b=TOY/XwuOuiI4ByupkdKzIibToc/8klh441WilJIC14v31Rujg3TTloTKyO0SEqBHROAtx1XOrCVHezVGXs3Z1v+/QzXt9ExWX7CNBNnqrGb8c4jOU3Gq0qEusyi5Y8ZdPQXffE6sGXyak3u760hSjVtridCojSn5mVvpwK/dy4rxqT+fMKkkH3RUW9MGWAy74HUfYYh3Vy60TYMH8uPMBv1AA/6PvCUvqnfJ2SxLfpfdXm8Rh7nMTzMyU3rt2v6EZA4RxqaSOEk5miHfeemML6urnbgVECy4I4I0x6ngXi7XncMldSM1qoQgMw8pqNbgzVtYom35rS+dg4abMP+rNA== 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=PmCQVQPw3lNM0ecQLmL2AWf3TRD5kVi8xhSfRQqSB7Q=; b=CpaZbx6DiXvV1OXPaAYvhuKa1aFLoC66kVcf4ZOxAI35tbNPu3ieyPSUI3AZ5nUXdLNyr9oxSEWpY0DZDnoYBz+HU1lPx3KuNdB3gxiR7MtrjHVrrOu8KFFTUCw/mRlAMq2kroo12z4Mj837v8WLKbp6frd5gdEgfz08KxRpqiQdiyZRUuoQ9i9MIgbnCAU/Pyoexg64ZDzTPuxNGofcaWOlZppN7ATYH/jx2Oh9ulGhPLxU5rL/MRQMtNG2w1vY0WKcanGu/mZO7W24or0V+cRmHKia/4TQQI5f30hpk65y97lgfyKqv77YhMHaC0qnQkk/Yn4sEp/7jcQTsUR+9w== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DBBPR01MB7706.eurprd01.prod.exchangelabs.com (2603:10a6:10:1e9::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Thu, 14 Jul 2022 12:10:17 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::210e:b627:bcc9:8c46%11]) with mapi id 15.20.5417.026; Thu, 14 Jul 2022 12:10:17 +0000 Message-ID: Date: Thu, 14 Jul 2022 14:10:15 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220713175948.1955-1-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20220713175948.1955-1-jamrial@gmail.com> X-TMN: [kOvMVX6zm3k/sJZz5iOsbJMBINlWLBpL] X-ClientProxiedBy: ZR0P278CA0125.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::22) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <45243534-9d34-186e-589a-ee537bd07815@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3dca8b17-1138-4b31-b2bb-08da6591d08c X-MS-TrafficTypeDiagnostic: DBBPR01MB7706:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KEeSNb/p3JZYUyh2vNOMzVSzKCtp7kJtGRYBx3l9xlnVn2yV3rUbi0TvETONqfyzxOqD7xMV0J19pRhtk1tAoUH+cjxP1iM8iJkRqdQK4nFmtD2G5BCH4MKaHbqN7t1O/rmpZeQ2wPdYYr5FmZq2sHi/b64RFEzZ+NSZhLlJlU2n8A5GVkdxmMqPg+VEYY+quayGkJggnKxyNeRddTj7v0C/9MvGmH9qeEygVhS2QyBW1sUeZc8rLkHWn1hOZA747xG9CDzxc1Odqcy4ofDA5w8SMj8YL2Vp82x4HyKwlHi8PygPUxznKmDAiVPj6wW/V2+2gHbbRBL3f+X1oDS5yHRWlIHXngJQz4CFIXTj1i9xrE4IgpEz+1Q8yivYjhILd0hKKq5me3AvQCbFaySmSouHwhUIJsLv3KCRgHZRakt3sc8rlmnDoU+LNA6dm8YhSB8Ng+b4Vy/TKuL77GnBRTdgab3x6cCfFcbe0m/YJ4llyRiph2D2qzjSTO/OMw0W2F0M0FmhesO7x4XKl3hAk0Na/PmbsL6uscdfmssMkPGTySTuba34xN/m00w/iVkhe+1I73v5THzXlTODwXINgGL8Xzv5UaOhNl/Ej1y/n0bf7WnXE+NqxSgKGMfEmbOFGwdKkhquQ6HQQH6sIaDTegV6tJ1M8VxPTp/qUbLPZA5KwMTePQxMoEqIg+2QHmY7A5H9WqTaj8x1lstqJZ6Ezcj8aiTlQhFVMglKUklsjJE= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?K0lGeXZPenNzOXdBdmg3WS9ocEVENXlvaFVXYnM0Q3NoVWk4ZmV4L0lHblFt?= =?utf-8?B?aWJ0aFdVcXFtVkZyTmtONTdxNXZINjFIYzM0dmxKSktRbkVzNkx0ajVkMnE5?= =?utf-8?B?dWx3ekxwVW1uT3MrQVlmcjVta3lxZUhTdlVIRFJzeGhwcGx6SzEwVUlHQ2tV?= =?utf-8?B?d2piZjFydFpWbUJpZVNFKzUyTHpGd0RRSkdFWXMrcDhsUml6eFJNblV6S3hj?= =?utf-8?B?dGpSQUsyc0dTWHJtL1FmajZHWXoyaHRQUUFMNVZZcmNyODU2c2VZNkRaOHZ1?= =?utf-8?B?TndVMmV2aVpkcGlQb3FSMGR4RXdvR2lwekVhYld1U3hCb2lXQXNIRStkNk85?= =?utf-8?B?TFlhekpyZWtZbkhrSDVhQ3BWT3lpamt0ZUcxY2p3Z3lhNXozNHVYcVEyWW16?= =?utf-8?B?NytpdUl0bkttWkxSNlI1K0pjbEJtTjlqWUJRMTdNRDFRa1pUL0VhYTdaaVNK?= =?utf-8?B?R3FObDM2ai9XcFpJRFZaOFhpVVk1ak9JaHBzY0l3MWh4SHFnUmIrbDJLeDl5?= =?utf-8?B?QWc0VEJtN0svOS94QzNFQ0RhbElMVDk1SVhqVFpIMW9FMkZUT0pIbmdQbE9P?= =?utf-8?B?N21GdmFrS0lsbVB1Q3JGTGVIZHBkdzdmVjFhVERUS2hIbmNlRU4raXUrRjVN?= =?utf-8?B?cUQvb0dDRDBJOVZ6TTBSWW5IWFBJNmplelg0bjJnUDlBZ1B5UDM0b2xSY3c0?= =?utf-8?B?R1lNaVIrTlppSGpQOG9VMzRJMlRHczRXcjFPKzVQbDJvZHIvNVNLVThGS0tC?= =?utf-8?B?RFI2QWNMSmt6MEt4WnhkV0Yyb042RkZNckxWakdPelh5VGc1b2p6bjlsa1J6?= =?utf-8?B?Qk5KeGZBUlhQeEdOMVhrdXFCV1BPNmRhWmN5dGFYbGk1MmNrcTUwNHJ1c2Nv?= =?utf-8?B?cHdwSFA5a29yZktQaE90TlR0UmVadTNxVUFNdGxwem4rU0dyNE1JMjY3REtz?= =?utf-8?B?UWIvd0p5YzJ4R3NjMlVhUmtzMFBtcEQ1ZVUvTDV5bFV4LzBpRWl6YkViUW5H?= =?utf-8?B?M21YYndLZW5zbWdlRzlBMUNmaHEwZDNnc2RsREo3QVdLay93cWxsMUlRdmti?= =?utf-8?B?TGdNUnRZcUd1UHgxMkpZMXFETmxFeDlGQXlJN2hKYnowQ0pHTEFWSG1yTGVY?= =?utf-8?B?aXBsbElIZjNBTXN2V2w4aSttb3Q4OTNkZTlqN3JXdGVsTUhlYUVuYmtkcXRX?= =?utf-8?B?cGw1dlJsQTNIUE1BUjY0dHl0ZllYN1JXejN4N3kybkZxWGozU0g3UjZZOEhE?= =?utf-8?B?TGR1NklzaHNOc1lXckZzZUducDZWckFYTTZ1Ukl0NWJKbnRTaHF1YWpkb2Z2?= =?utf-8?B?R2hBc21QaTJKMUlPeDV1Qk94YWdBQzdxM3haSGtDbHhJaUxGMjZaWnVLZmNT?= =?utf-8?B?SDVwQ0d1T3Y1elptbE0xS2tyQjhLRGJsTDViYzVPZUQ5a0hJNE9RVVNyTHN1?= =?utf-8?B?OFVDcFNXZE5CbDNua1V1V0kxSHM1QXFqMUQ5TXRob1FxcUdiNHVoME95SW1R?= =?utf-8?B?N2kxOHdoQmtDbTBKYUNpSS9uOGNRZkpPdWp4eWljRDNlSkVZQk1JNTI4bHdX?= =?utf-8?B?bTBlMHozVFlLSmFlN3FMWEliUmdHRU4wdHZJSDhnVk9RcC8vOTZ1VDduSDlU?= =?utf-8?B?aGpUMzVRYUhRK0VoMjJkRjl6VWgrcC9sd01QWkwvYkh4akU1RE43azlZVEkx?= =?utf-8?B?K0dXZHEwc1ZkK2xPb0VhZFoweXZSMktBNVBUY0syU1JDS3E5SkVKcjd2TzdD?= =?utf-8?Q?JGrDFrmkmVqyMZOjTg=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3dca8b17-1138-4b31-b2bb-08da6591d08c X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Jul 2022 12:10:17.3797 (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: DBBPR01MB7706 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/aacdec: don't force HE-AACv2 profile if no PS info is present 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: > Should fix ticket #3361 > > Signed-off-by: James Almer > --- > This also needs an update to some fate ref samples i'll upload before pushing > (fate-aac-al_sbr_ps_04_ur and fate-aac-al_sbr_ps_06_ur which are now decoded > properly as he_aac mono, so the .s16 files need to be replaced). > We have both a fixed-point AAC as well as a floating point AAC decoder. Is there actually a test that tests that the output they produce is reasonably close? If not, could we make the test so that the same file is decoded once with the fixed-point and once with the floating-point decoder and then compared? > libavcodec/aacdec_template.c | 15 ++++++--------- > libavcodec/aacsbr_template.c | 1 + > tests/fate/gapless.mak | 14 +++++++------- > .../audiomatch-afconvert-16000-stereo-he2-adts | 2 +- > 4 files changed, 15 insertions(+), 17 deletions(-) > > diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c > index 10fba3d3b2..15c20c07d6 100644 > --- a/libavcodec/aacdec_template.c > +++ b/libavcodec/aacdec_template.c > @@ -967,8 +967,7 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx, > > if (count_channels(layout_map, tags) > 1) { > m4ac->ps = 0; > - } else if (m4ac->sbr == 1 && m4ac->ps == -1) > - m4ac->ps = 1; > + } > > if (ac && (ret = output_configure(ac, layout_map, tags, OC_GLOBAL_HDR, 0))) > return ret; > @@ -2572,18 +2571,16 @@ static int decode_extension_payload(AACContext *ac, GetBitContext *gb, int cnt, > av_log(ac->avctx, AV_LOG_ERROR, "Implicit SBR was found with a first occurrence after the first frame.\n"); > skip_bits_long(gb, 8 * cnt - 4); > return res; > - } else if (ac->oc[1].m4ac.ps == -1 && ac->oc[1].status < OC_LOCKED && > - ac->avctx->ch_layout.nb_channels == 1) { > - ac->oc[1].m4ac.sbr = 1; > - ac->oc[1].m4ac.ps = 1; > - ac->avctx->profile = FF_PROFILE_AAC_HE_V2; > - output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags, > - ac->oc[1].status, 1); > } else { > ac->oc[1].m4ac.sbr = 1; > ac->avctx->profile = FF_PROFILE_AAC_HE; > } > res = AAC_RENAME(ff_decode_sbr_extension)(ac, &che->sbr, gb, crc_flag, cnt, elem_type); > + if (ac->oc[1].m4ac.ps == 1 && ac->oc[1].status < OC_LOCKED && > + ac->avctx->ch_layout.nb_channels == 1) { > + output_configure(ac, ac->oc[1].layout_map, ac->oc[1].layout_map_tags, > + ac->oc[1].status, 1); > + } > break; > case EXT_DYNAMIC_RANGE: > res = decode_dynamic_range(&ac->che_drc, gb); > diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c > index b72c94b76d..f9925b40e5 100644 > --- a/libavcodec/aacsbr_template.c > +++ b/libavcodec/aacsbr_template.c > @@ -954,6 +954,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, > *num_bits_left = 0; > } else { > *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps.common, *num_bits_left); > + ac->oc[1].m4ac.ps = 1; > ac->avctx->profile = FF_PROFILE_AAC_HE_V2; > } > break; > diff --git a/tests/fate/gapless.mak b/tests/fate/gapless.mak > index 68a396e187..7dd8ceb142 100644 > --- a/tests/fate/gapless.mak > +++ b/tests/fate/gapless.mak > @@ -47,27 +47,27 @@ fate-audiomatch-square-aac: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/squar > > fate-audiomatch-afconvert-16000-mono-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts $(SAMPLES)/audiomatch/tones_16000_mono.wav > fate-audiomatch-afconvert-16000-mono-lc-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a $(SAMPLES)/audiomatch/tones_16000_mono.wav > -fate-audiomatch-afconvert-16000-mono-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_he.adts $(SAMPLES)/audiomatch/tones_16000_mono.wav "-ac 1 -ar 16000" > -fate-audiomatch-afconvert-16000-mono-he-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_he.m4a $(SAMPLES)/audiomatch/tones_16000_mono.wav "-ac 1 -ar 16000" > +fate-audiomatch-afconvert-16000-mono-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_he.adts $(SAMPLES)/audiomatch/tones_16000_mono.wav "-ar 16000" > +fate-audiomatch-afconvert-16000-mono-he-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_he.m4a $(SAMPLES)/audiomatch/tones_16000_mono.wav "-ar 16000" > fate-audiomatch-afconvert-16000-stereo-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_lc.adts $(SAMPLES)/audiomatch/tones_16000_stereo.wav > fate-audiomatch-afconvert-16000-stereo-lc-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_lc.m4a $(SAMPLES)/audiomatch/tones_16000_stereo.wav > fate-audiomatch-afconvert-16000-stereo-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he.adts $(SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000" > fate-audiomatch-afconvert-16000-stereo-he-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he.m4a $(SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000" > -fate-audiomatch-afconvert-16000-stereo-he2-adts:CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he2.adts $(SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000" > +fate-audiomatch-afconvert-16000-stereo-he2-adts:CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he2.adts $(SAMPLES)/audiomatch/tones_16000_stereo.wav "-ac 2 -ar 16000" > fate-audiomatch-afconvert-16000-stereo-he2-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_stereo_aac_he2.m4a $(SAMPLES)/audiomatch/tones_16000_stereo.wav "-ar 16000" > fate-audiomatch-afconvert-44100-mono-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_lc.adts $(SAMPLES)/audiomatch/tones_44100_mono.wav > fate-audiomatch-afconvert-44100-mono-lc-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_lc.m4a $(SAMPLES)/audiomatch/tones_44100_mono.wav > -fate-audiomatch-afconvert-44100-mono-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_he.adts $(SAMPLES)/audiomatch/tones_44100_mono.wav "-ac 1" > -fate-audiomatch-afconvert-44100-mono-he-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_he.m4a $(SAMPLES)/audiomatch/tones_44100_mono.wav "-ac 1" > +fate-audiomatch-afconvert-44100-mono-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_he.adts $(SAMPLES)/audiomatch/tones_44100_mono.wav > +fate-audiomatch-afconvert-44100-mono-he-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_mono_aac_he.m4a $(SAMPLES)/audiomatch/tones_44100_mono.wav > fate-audiomatch-afconvert-44100-stereo-lc-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_lc.adts $(SAMPLES)/audiomatch/tones_44100_stereo.wav > fate-audiomatch-afconvert-44100-stereo-lc-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_lc.m4a $(SAMPLES)/audiomatch/tones_44100_stereo.wav > fate-audiomatch-afconvert-44100-stereo-he-adts: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he.adts $(SAMPLES)/audiomatch/tones_44100_stereo.wav > fate-audiomatch-afconvert-44100-stereo-he-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he.m4a $(SAMPLES)/audiomatch/tones_44100_stereo.wav > -fate-audiomatch-afconvert-44100-stereo-he2-adts:CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he2.adts $(SAMPLES)/audiomatch/tones_44100_stereo.wav > +fate-audiomatch-afconvert-44100-stereo-he2-adts:CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he2.adts $(SAMPLES)/audiomatch/tones_44100_stereo.wav "-ac 2" > fate-audiomatch-afconvert-44100-stereo-he2-m4a: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_afconvert_44100_stereo_aac_he2.m4a $(SAMPLES)/audiomatch/tones_44100_stereo.wav > > fate-audiomatch-dolby-44100-mono-lc-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_mono_aac_lc.mp4 $(SAMPLES)/audiomatch/tones_44100_mono.wav > -fate-audiomatch-dolby-44100-mono-he-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_mono_aac_he.mp4 $(SAMPLES)/audiomatch/tones_44100_mono.wav "-ac 1" > +fate-audiomatch-dolby-44100-mono-he-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_mono_aac_he.mp4 $(SAMPLES)/audiomatch/tones_44100_mono.wav > fate-audiomatch-dolby-44100-stereo-lc-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_stereo_aac_lc.mp4 $(SAMPLES)/audiomatch/tones_44100_stereo.wav > fate-audiomatch-dolby-44100-stereo-he-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_stereo_aac_he.mp4 $(SAMPLES)/audiomatch/tones_44100_stereo.wav > fate-audiomatch-dolby-44100-stereo-he2-mp4: CMD = audio_match $(TARGET_SAMPLES)/audiomatch/tones_dolby_44100_stereo_aac_he2.mp4 $(SAMPLES)/audiomatch/tones_44100_stereo.wav > diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts > index 32b2627946..527c9acdba 100644 > --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts > +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-adts > @@ -1 +1 @@ > -presig: 5186 postsig:446 c: 0.9839 lenerr:5632 > +presig: 5154 postsig:446 c: 0.9839 lenerr:5600 _______________________________________________ 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".