From patchwork Tue Aug 31 12:42:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 29912 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4889229iov; Tue, 31 Aug 2021 05:44:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzegAcFcoC4YGHjPTU7pwDgZ2mX7Y8G209TM4g0rIyn0HXbkZIcBVHNUmtNKuQ/z2UVQ+30 X-Received: by 2002:aa7:c54c:: with SMTP id s12mr28593804edr.96.1630413882601; Tue, 31 Aug 2021 05:44:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jg17si11027002ejc.92.2021.08.31.05.44.42; Tue, 31 Aug 2021 05:44:42 -0700 (PDT) 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=@outlook.com header.s=selector1 header.b=ukWqaiCz; 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0425068A4A8; Tue, 31 Aug 2021 15:43:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073086.outbound.protection.outlook.com [40.92.73.86]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EF1FE68A3BF for ; Tue, 31 Aug 2021 15:43:30 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U5yRA+xr2qqSyces7ybGfkk/e8ULI2OaXtFjM/3dRIYsh0Uu0q/0xg06SlEsSS+fA8WUHe6v5Bxnacsg94EHW5LXKsV1IB/DLVwxV2dnmAgs7tOxQCJLA6rEuTSRX8gwXcmTrNrFTG5sdqs1oGu5IWojDRATos6Z01plTkW+owWl85ZjXw8bdK7DL7jKeOsa5wcnFXfUiWCbph7VTiEJ33shinm+9EhDXyqCoGhjX0yJbZ7Jpft50GlrLEdeM+OazZKgu1pXk8XJTVZkfdSWWuEct2WYNnXAHv5JQUIekdkPV+L55/RMSle3pp24lQClc+tnCnmAJ2JWSuY4c+LjDw== 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-SenderADCheck; bh=tdwzbfdaV8J53AQc7h2LBMZygoBdMmbCmbP5gxVEjfk=; b=oNiw7QSRFWeJgkcuYaRMgddLpd7NY4SOvdTqZ5V5BEkfX4F9yNrpVcomd6X7a/Zupvu9d1TPBE5iZcLEX8qkswfdc9yBviLywIWTcpm0pcessjNnDVQOjx2Etcm+MkmWHZCeRLUM4HmPV7YAVhTty8msmtP1P/xGmE8UB+TvnRby/gdISQS7YllT3PqMOVFQKV2KQnXJwyUTZIDOcH/hElBN5NH6kA4ehqjxZfUPJPY4uOjeUvYa1iH4OlWF4GID2TzwYj5p9HZLs4yBppHEQ2YHiXbvs5qI03nBjzfI5TXJEi9nWJo5+L5HJGl06n+UnE5NTsnzdZ3do2maar7ffQ== 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=tdwzbfdaV8J53AQc7h2LBMZygoBdMmbCmbP5gxVEjfk=; b=ukWqaiCzHERo8FanYgsmjWM7iOPGmtbuFDzAvIOrvaIEFzOAvZU5imkMYhL65JNVLIlcDYQebKnqdPn3UkDcSoNXCYK8JWi2tqMorRJ1Ns4gnqBHMLBwKkKiR+/p+O//ulfvjBv/Bt5GULO2MzjyRqePk7qpGRiw92iqAaB7Fg4Bjej4k3uARzBtDFGA3TiZ3Rd19j2j7uNwAXuEaEUMoNaQlhETdLwdRYS47iqIooYyZwKw69BIhCZVLNdCTyMrTljWnXkP9N9KNc5k9+cB65LNk4cl10H5yg1410Qg71zVy82LqDdvsewXVFrG8USZR0S+y83DN9T3SjS8Ho5/uQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (10.141.218.86) by AS8PR03MB7270.eurprd03.prod.outlook.com (20.183.133.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.17; Tue, 31 Aug 2021 12:43:22 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f8b5:1ef2:89b2:f8c5%7]) with mapi id 15.20.4457.024; Tue, 31 Aug 2021 12:43:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Aug 2021 14:42:58 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [hqsQB4fzFTRk/I/z5FtCpFlh/0n+PFgz] X-ClientProxiedBy: AM9P250CA0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210831124258.1715917-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM9P250CA0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:21c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.23 via Frontend Transport; Tue, 31 Aug 2021 12:43:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 713afbac-f3b3-4872-29aa-08d96c7cea75 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNVAewO3OwszBVL1NI+kAPIBGlUN6d+qDo7Zpo8/AfooYpLIJWwzwv4gRDo8w6D94cMD1E7aH5XTesDDGPB/7uIs0F60+plDm6ZjGNBJsj0e1zoTE/OvCETyw9Hd9zZl4MbNPg8zjqQd8u2BpO3ClAeNaHCF0J4ZMFBm89bon9e26FLlF+wSZuH9WgSu4AqSHI+mo6MMw0zr63v8PPtc3cF3JYohR3vgum20kjO4pu++/gviZMCNhsvodagXlfI8PWH/dqZB6ZHG++aZTou4b6YulldiNkDTJAtE9Q5rDwvBOvaoRxhiPGJGwX6+dcUs00xcgl9ZsbQI31wvjOOxqnszjU7lhk9wBriuDTXljJDNM7E0G87cSJs802hqvmOAn8FPP2DgeDU7N7kzfeVnxEqVwGjubt6Gto1NIisMlkcTkIPlDbvgUnF70nuCJ3eMykx3ZZfJ4EdIXE2l/F1D9EXy2Dy8K8tnvURgV5YmcQ8To+XakySxv9yn4gm5JuWN4L82Fesl6Z6IxJ4UqL998TTNVYcDdyM999hWaXBbchOw6m9YI9l3lXBZnBpSeqqzec4t+IriLHeEyEoRLq+LXn7qw0imoW7tyQE1aBgqRrYOuQJEsDr5uNmi6oyUoKG2DZFAyvOM0ArrtDwftCWZaU+ckt2eRVl2z4OsLtTPVFq+3A/ft7h63QZFrvUlP0sTOAPYqYquyUjgyyDGd8UyWVADNdJ+Vadufcc= X-MS-TrafficTypeDiagnostic: AS8PR03MB7270: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: w36SwgJlNU+auCKDAiqdawrLflppnOc1HqH8D0aQx6BOsVtHmx7MgDQk2OzAJ0Z60LesKVvOmEyFn+9wP1AQtGEtTXizhIFtJoBCWNAtJbELTI68hhIBF/95vSFfo5qrqM3zzG7v7JTyMGrH+gjLm0xdfHCG8ynBgyIz/cd9XIWKIsJCzYGvuI+Rri5L9rKHMZ0JQyCD4Z0//M/+CsVdAZ3rgeqiYbgBzJtQMlfEmEHuKUfmoKizjl679+Ol3YyIzhwauPOq6Jd/urX3ob+adjONbmaQslbuIWejUibQdvmjieJ3gH5sa/9US9tWfGvKYVxE0pikUbHSQUEWEphLqJq2DnEg3wMXAGatRc/Q8WU4kWZObnkXQOnQI9nESUM/w5t+GGLS5G59f3blcej1Pj6JXSbivFg3PV6V6bOZd+PTNuX0hUcaGBxhZfFtcjgv X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b69ENiBH814H70G3stZjueZva2Ag3fbsODOQ+KuK6vECDCCqclFAk+Iui/i2Dc8FcrVEqIpPIoQkv3muZdss0P3qWbsEsjUSJdZK8L1zoxguJSxY0ZmIhY8ED8c+M52ulGturqiSs79llOa5kwWRIA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 713afbac-f3b3-4872-29aa-08d96c7cea75 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2021 12:43:21.7197 (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: AS8PR03MB7270 Subject: [FFmpeg-devel] [PATCH v2 10/10] avcodec/aptxenc: Process data in complete blocks of four samples only 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OIkSzd/XAtIy Otherwise one could read into the frame's padding when one encounters the small last frame; furthermore, one would indicate a packet size that is not a multiple of the actual block size and one would write into the padding of said packet. This actually happened in our FATE tests (where the number of samples is 2 mod 4), which therefore needed to be updated. Signed-off-by: Andreas Rheinhardt --- libavcodec/aptxenc.c | 5 +++-- tests/ref/fate/aptx | 4 ++-- tests/ref/fate/aptx-hd | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/aptxenc.c b/libavcodec/aptxenc.c index 5ea6053c26..0760d1932e 100644 --- a/libavcodec/aptxenc.c +++ b/libavcodec/aptxenc.c @@ -215,7 +215,7 @@ static int aptx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if ((ret = ff_af_queue_add(&s->afq, frame)) < 0) return ret; - output_size = s->block_size * frame->nb_samples/4; + output_size = s->block_size * (frame->nb_samples/4); if ((ret = ff_get_encode_buffer(avctx, avpkt, output_size, 0)) < 0) return ret; @@ -229,7 +229,8 @@ static int aptx_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, aptx_encode_samples(s, samples, avpkt->data + pos); } - ff_af_queue_remove(&s->afq, frame->nb_samples, &avpkt->pts, &avpkt->duration); + ff_af_queue_remove(&s->afq, frame->nb_samples & ~3, + &avpkt->pts, &avpkt->duration); *got_packet_ptr = 1; return 0; } diff --git a/tests/ref/fate/aptx b/tests/ref/fate/aptx index 35729b77c7..ccc3a49ac9 100644 --- a/tests/ref/fate/aptx +++ b/tests/ref/fate/aptx @@ -1,5 +1,5 @@ -b5d8a297c0e8d9854f19d9d3e8b82859 *tests/data/fate/aptx.aptx -418950 tests/data/fate/aptx.aptx +966f4391a8472208409a52603494846f *tests/data/fate/aptx.aptx +418948 tests/data/fate/aptx.aptx #tb 0: 1/44100 #media_type 0: audio #codec_id 0: pcm_s16le diff --git a/tests/ref/fate/aptx-hd b/tests/ref/fate/aptx-hd index fe611de03e..a3cb78daa5 100644 --- a/tests/ref/fate/aptx-hd +++ b/tests/ref/fate/aptx-hd @@ -1,5 +1,5 @@ -48ecaa81ee5adaaa62ed3ff6574b6666 *tests/data/fate/aptx-hd.aptx_hd -628425 tests/data/fate/aptx-hd.aptx_hd +0bb7bb4313bd33fe44e409c67d392fd0 *tests/data/fate/aptx-hd.aptx_hd +628422 tests/data/fate/aptx-hd.aptx_hd #tb 0: 1/44100 #media_type 0: audio #codec_id 0: pcm_s32le