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 E4E5343146 for ; Wed, 20 Jul 2022 22:21:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9F2ED68B5F2; Thu, 21 Jul 2022 01:21:00 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2069.outbound.protection.outlook.com [40.92.91.69]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E65568B28D for ; Thu, 21 Jul 2022 01:20:54 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DtDEFUmLJO/kupkLTa7shR1VDXn3vKzjlJRAUBG3nxjKiYcUvK7rBzZVq1lqRsLpX02AdAJcngWbVsAyjpmHuVIXTt1+SyqI9UWGpl6Dd5vO9c+F/24x3Cbi1jhYt7bnPno6w54bxpotQUDDlMT5R9wbGyG22l/Z0yeJbsvoA6Bma0gIlgvVdqnavnaZfj0klEXB5LnMHLLYPpj1suGe8G0srrUQgpJCSDaf2ehaO5FsQxwPuhi1PwV/jv2HGUc7GIVVYN8K0+F4sdj6CwVq3OgspMCBblZBz2YA28OKo1bAFGwNXFq5CKkdrm/4l+fWMU2jcmnDXlGsBp/gN4J0OA== 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=JWHoNeDSNsXAoBDbfyEWFTCp66Kfb2aQuenD6yPikfg=; b=OID5DLPE8tuHeLBqGHgkCUItW3IG7E0CZgze9Bz455ThfRyJ5daAmw6IMZfv6+Hdc3TTP4Pbq4BhHYctL3rO6DH3KQiVNuYOUsvd4ww6/NIpWoO6Wvdzkros1Y0i1jZWiPWTD3e4iT7WN3dJ2JnVAdwO21RxvFcGEP3ZXNqUlJ80cwo5iQ8p0TsEAFuZhvBwL10uCW5zW3IIc3DcRMtP0uiK1DD8OtphrsKmXf+pxf5odxgwke0/vKS76zKqoivLM0cfQtV8RbfyVk6o4RtDd/uW2wAC4IW3zU1k+eSPAUOJiHZWJHdVQJkC1r/EgMdHxY3Yqnr5WuL9+0or7VRJEA== 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=JWHoNeDSNsXAoBDbfyEWFTCp66Kfb2aQuenD6yPikfg=; b=T1ctMEjKo1gAM/uQZjAmzIehKzDFaq01W3oqAJVfxF6ru+8BOFyRNy9ZhkeU6r1RwA1+ufBLHQTGOY9Z8lu3WXGlT3k9hFr+ulsLjXVHgEGG+FUSiqNO17r3r4s6qye8HKtr/6fNJ19y/Jzc5O3YWw/+4H0yKxDU8Z/+ovnvlwD3lggWs+K0DrQLnnU8p/D6JS2QxGUKOUFr0Bn30HDBp2UKPi65HSiKPKrPPMaJk608ZZvYeBjH7uSGCHsJ8Hx/HKEbLxD3RGlWK0ZuuH9uXjp0OSGcwKMjfApQfbJ1etRTdiNbbUfKYBdtqlkR47ehYigeVE6Usse5qN/wuwq4zg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by DBBPR01MB7628.eurprd01.prod.exchangelabs.com (2603:10a6:10:1e3::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Wed, 20 Jul 2022 22:20:52 +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.5438.023; Wed, 20 Jul 2022 22:20:52 +0000 Message-ID: Date: Thu, 21 Jul 2022 00:20:51 +0200 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220719112748.374-1-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20220719112748.374-1-jamrial@gmail.com> X-TMN: [T+CK75xGVW2gBeoPNCzhc9URQvAA3CMs] X-ClientProxiedBy: ZR0P278CA0134.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:40::13) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <7eb26524-d67a-d872-557f-479778a2a8bc@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f5a4a2ad-8bca-433e-08a1-08da6a9e1b82 X-MS-TrafficTypeDiagnostic: DBBPR01MB7628:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rsfbtpgDs/AvcZKTAZewPTNt19kF/ZzLoylHKOL0eHcnYdl7AnXToHzyZzFXf/DrwooIDF1VfC2s4lf8u6LRRSP4RgR5iDcmMISNG42kcIyqZNysC3Rihdd6pKrZ4LLo+VLwbcBTf7R/gEoKRx17HrG5a+Ri15uOrYhubWMCU7WiCu3vDP/VnE3jkXiUbURjEBSYHtcEYnEX6+PWcfKDyEJnV/B3EZJLYm4SkvX9Gv+KC/rD0IIDE+TlWkSa5fKWOn+hzRE08iP27a0l3VUhRMRZaIKCS0mGEQbAj/ZjyfaIFoGHYkCrWnKJdEy15VRX1ucpZXt+C3gfBOUvLRKjAoJMhbCLSNaxciYwn6XiV4wlFDNLRj+TB6c4+6glpfrZj0k8Jae0y78Rcf8xansi9ViHfwfXb9BouotAmAnpIu5yIW3TbPYM8vUI++aEP6iXvJkQ0CBHBzuR/x8Bkq86KzPc/pYarnrszGfoqaA85ftBhQU++rwr2HkxM9fiDuF/jANv/w1umQo2MpSGWptgt6ozcFrHInlfiCRCNFQvpb/5TAB8tutr6cjjLHcukeM/tGxSP4Smy3C8HlnItMq8ImH8yCkAQ2vUDQGwEWFkbzxnLTroldi9Hq54CIBjCQSJgB4ai/arkpsQ8cse+Fkjc84K/YTZ3omE5vICXFIuADLBWlPBO4PKTYKAji70k4vS X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Sy9ZL0lRdnVvUXk5dFE5VzJrNXNYZlY0MTRiazQzVkIrbXFENnArdFZMQXRz?= =?utf-8?B?cmV4QVVMbmFRZmNnTi9qSFR6Z1orRlNHTldoT3RtOHpXZlltZ2xxRGhnUWhP?= =?utf-8?B?ajQ0SUlJZm1hUzMvNzNZbkJ6cEVlT054bnFwRXI3ckltNVp1YkN2dWpYWjZh?= =?utf-8?B?c1J2RlkxM2JVRHp1VEIxQjZsTWxjTkgvTzlGdU1uNXh5Zno0WlI0c2V3aFlH?= =?utf-8?B?OEkrTG9aYUFKa1FNQ3V4NXBpc2J2WUg3SVIxMExpeXRIcWRldHVuUE9RTE9T?= =?utf-8?B?dXZtbkhJUzN6bDJZMVVEdHkyYUswM29IdnNlWXpneTlLYUpEOWpQMVBqTG5G?= =?utf-8?B?WU5LZW41c3Z4MDVLTFNjZS9KMTYyVXFCY1l2dWxZSjJSbXV1alNQMUtPdGdo?= =?utf-8?B?SlFPT09vb2RPbWhRUi9WbmR3T1EyM2h5NHUwZnZIakNDS2VMS1ZxNmEvNnh0?= =?utf-8?B?N01YRHIzWjFuaklUcXU3aDVXRy82bmxFUnBaeVgvd1kvMnRKamNNM081OHR5?= =?utf-8?B?eXJFYko4ekcvME9yeW5QR3BEVFkwNUgzb0l4QnBHV1dmaE1kL1h4ZkR6bEJi?= =?utf-8?B?NVczRXloSTlWTUpDb2QxT0tXOHpVQzJZSngvakdEMThtYkRXT080YUd2Tk5Q?= =?utf-8?B?MkQ0cGtKbFRkV1hZNG91ZWE1VFk2U1ZlTnV6MXQzbFF2TDFEa21FUmlCUmVi?= =?utf-8?B?U0dsV3BTa1Nyb2lteVJZNkJzM3lpZG1TWDFiSGU1OTlSYUx3Q1pOQnkwZFZK?= =?utf-8?B?SGZnaHUzU1BZelVUVjdBNjVBL2RUV25hVlZTQ2k0M25EaEFpUXRrUDlHVVRX?= =?utf-8?B?RThrT1VLN0x2ajJ1Z2J0WkhlZkFpNE1PdGMxSzRLdXl4N3hhYllwMEN6Ynpi?= =?utf-8?B?b1JOT0hOU1pFVDFoWkRFM1NNeVI0THBuWm5IMlpYRzUveGg2SUU2QkROTjhi?= =?utf-8?B?ekpXVUdIZUpyZmR6cW1MZGVLUW0xYVFqTjRZaVNLMEVoZlQzWGY4WHJzZFg0?= =?utf-8?B?RnI5ZnZmQkg2anU2TVRaZE1OSmdMTFpFeEFlM2piMEQ1TDMrL1JrdEdyM3NF?= =?utf-8?B?bWMvMTMzUGVkZUQrK25Xc0ZLMjloUVowaW5ZN01XenJIYW5sS3J5ejhzV0lF?= =?utf-8?B?bkxxOWlMT3FkVmIxOHdnZ040cTBCVnJPRXI2RDRBemVnelNZUnQvUXNxcWR0?= =?utf-8?B?NHhYOGp2MThBWDhhVXFBNjBBemRBTUNRWFRHQjE1RXVKd3JsM3ZkN1phZTN4?= =?utf-8?B?bVhTWjhTL0xLamduOFRmRXhvcEt0b29Dckd3ODVBYXRGNjFHNWZwOVVCaWNR?= =?utf-8?B?blJtU1VTQW4xL2tETHBCREw0OWUwRkpFZjZlMFBxV3NIdEtSbXlEV28zVjc3?= =?utf-8?B?RUJJaitlRk1NT3owN1RaU3c4dytNSTRHYlBncFdpYjY4c1I2SWpKYWVRWGlZ?= =?utf-8?B?SStnQno4dVdTSmVtNEc5MlJ5bGcyaEdpUHhLa05PdFhvcnN3aEdQdGtibGxL?= =?utf-8?B?eFlRT1ZkZHN0S3JvY21lb2gxMGd0dG4wWjFTYjdMYTNZNy91cUNkSDJkN1pk?= =?utf-8?B?dE16Z3BuNWh4enZwNTBheU1KdjBQL1IyNWRoeGlWcHhaVlROMUMyWlN1SElj?= =?utf-8?B?Zmw3UVJ1Z243L21qMWVFSEVHcVhrN01vSjE3VVVJa1QrMnJyY2JqRUt4RUc5?= =?utf-8?B?VTNzRVJMd2wwLzFDQXBzL2g3TjVVK0lkOFZxSGpreS9Zdk9RaDArV2VudEIv?= =?utf-8?Q?iF+uvDaqI7nNDO+xQ8=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f5a4a2ad-8bca-433e-08a1-08da6a9e1b82 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 22:20:52.7886 (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: DBBPR01MB7628 Subject: Re: [FFmpeg-devel] [PATCH] avcodec/aacdec: remove skip samples multiplier 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: > The amount of padding samples reported by containers take into account the > extended samplerate in HE-AAC. > > Fixes ticket #9671. > > Signed-off-by: James Almer > --- > libavcodec/aacdec_template.c | 3 --- > tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a | 2 +- > tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a | 2 +- > tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a | 2 +- > tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a | 2 +- > tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a | 2 +- > tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a | 2 +- > tests/ref/fate/audiomatch-nero-16000-mono-he-m4a | 2 +- > tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a | 2 +- > tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a | 2 +- > tests/ref/fate/audiomatch-nero-44100-mono-he-m4a | 2 +- > tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a | 2 +- > tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a | 2 +- > 13 files changed, 12 insertions(+), 15 deletions(-) > > diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c > index 10fba3d3b2..119976aa19 100644 > --- a/libavcodec/aacdec_template.c > +++ b/libavcodec/aacdec_template.c > @@ -3418,9 +3418,6 @@ static int aac_decode_frame_int(AVCodecContext *avctx, AVFrame *frame, > ac->oc[1].status = OC_LOCKED; > } > > - if (multiplier) > - avctx->internal->skip_samples_multiplier = 2; This is the only user of the skip_samples_multiplier field. If you remove this, you should remove the field and its remaining redundant occurrences. > - > if (!ac->frame->data[0] && samples) { > av_log(avctx, AV_LOG_ERROR, "no frame data found\n"); > err = AVERROR_INVALIDDATA; > diff --git a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a > index f6f8df5e00..b8fd03942c 100644 > --- a/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a > +++ b/tests/ref/fate/audiomatch-afconvert-16000-mono-he-m4a > @@ -1 +1 @@ > -presig: 481 postsig:223 c: 0.9835 lenerr:704 > +presig: 1537 postsig:223 c: 0.9835 lenerr:1760 > diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a > index 9ba0ef2338..b0381bfa0f 100644 > --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a > +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he-m4a > @@ -1 +1 @@ > -presig: 962 postsig:446 c: 0.9895 lenerr:1408 > +presig: 3074 postsig:446 c: 0.9895 lenerr:3520 > diff --git a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a > index d4fc21bda5..0b16a523f7 100644 > --- a/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a > +++ b/tests/ref/fate/audiomatch-afconvert-16000-stereo-he2-m4a > @@ -1 +1 @@ > -presig: 962 postsig:446 c: 0.9839 lenerr:1408 > +presig: 3074 postsig:446 c: 0.9839 lenerr:3520 > diff --git a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a > index 0ad4911ff8..34921ed8b5 100644 > --- a/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a > +++ b/tests/ref/fate/audiomatch-afconvert-44100-mono-he-m4a > @@ -1 +1 @@ > -presig: 962 postsig:822 c: 0.9911 lenerr:1784 > +presig: 3074 postsig:822 c: 0.9911 lenerr:3896 > diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a > index ff5540b572..3bab086939 100644 > --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a > +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he-m4a > @@ -1 +1 @@ > -presig: 1924 postsig:1644 c: 0.9890 lenerr:3568 > +presig: 6148 postsig:1644 c: 0.9890 lenerr:7792 > diff --git a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a > index f8214cfbdc..27341f54e2 100644 > --- a/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a > +++ b/tests/ref/fate/audiomatch-afconvert-44100-stereo-he2-m4a > @@ -1 +1 @@ > -presig: 1924 postsig:1644 c: 0.9909 lenerr:3568 > +presig: 6148 postsig:1644 c: 0.9909 lenerr:7792 > diff --git a/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a b/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a > index 4ee764e967..fb62ae0c36 100644 > --- a/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a > +++ b/tests/ref/fate/audiomatch-nero-16000-mono-he-m4a > @@ -1 +1 @@ > -presig: -4 postsig:196 c: 0.9736 lenerr:192 > +presig: 2332 postsig:196 c: 0.9736 lenerr:2528 > diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a > index cdc31c12ef..4a30beca9d 100644 > --- a/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a > +++ b/tests/ref/fate/audiomatch-nero-16000-stereo-he-m4a > @@ -1 +1 @@ > -presig: -8 postsig:392 c: 0.9777 lenerr:384 > +presig: 4664 postsig:392 c: 0.9777 lenerr:5056 > diff --git a/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a b/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a > index 74d549780d..22aed2aa03 100644 > --- a/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a > +++ b/tests/ref/fate/audiomatch-nero-16000-stereo-he2-m4a > @@ -1 +1 @@ > -presig: 2 postsig:2590 c: 0.9934 lenerr:2592 > +presig: 5618 postsig:2590 c: 0.9934 lenerr:8208 > diff --git a/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a b/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a > index b5dcd9daeb..66ebd92730 100644 > --- a/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a > +++ b/tests/ref/fate/audiomatch-nero-44100-mono-he-m4a > @@ -1 +1 @@ > -presig: 0 postsig:1336 c: 0.9973 lenerr:1336 > +presig: 2336 postsig:1336 c: 0.9973 lenerr:3672 > diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a > index 42a87c08e3..a7d1d9f249 100644 > --- a/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a > +++ b/tests/ref/fate/audiomatch-nero-44100-stereo-he-m4a > @@ -1 +1 @@ > -presig: -2 postsig:2674 c: 0.9986 lenerr:2672 > +presig: 4670 postsig:2674 c: 0.9986 lenerr:7344 > diff --git a/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a b/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a > index 3fa2cdba2b..4da8519ee7 100644 > --- a/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a > +++ b/tests/ref/fate/audiomatch-nero-44100-stereo-he2-m4a > @@ -1 +1 @@ > -presig: 2 postsig:782 c: 0.9980 lenerr:784 > +presig: 5618 postsig:782 c: 0.9980 lenerr:6400 _______________________________________________ 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".