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 1730D43EA7 for ; Thu, 15 Sep 2022 19:28:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E45FF68BBE1; Thu, 15 Sep 2022 22:28:41 +0300 (EEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069055.outbound.protection.outlook.com [40.92.69.55]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E54668BBCE for ; Thu, 15 Sep 2022 22:28:39 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ERM6xY8EKMilN2gATFluAmHrrQRT/em7IQng9jihXgZ3snSmhNAVPvEOAyacu59sxnp6BlhCmxOv29hOCiQfCjsNOx7c2e3v418HPhtrdvtWMDvFXlj7sOUkZeNDmbHoP0Xe4a4bN0NF+H9gDtU66LYOqpbm/x5IrA1irLpcJbrO3/tyija4FNU1uSvU5jDKgHfepF7ArvWj8F8MJwjUR8pTjgZZG/Kk3dzhBDJGJVqWA24P4XRQkK6jjLr5CAa4fuuPnnFQr8Keol/q8jP/YDfIanSoy9/qY/k9auT9SeOhx+zOcZ0W0IubkqaB1eHvhIOQkI/1069SewkY+ibwNg== 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=uW6h+Zc1S1dFZoLM3tQLB5MQEqfAwNAz6jxugpjaWYc=; b=JfD0Hm5E84ez69YVaN0No1JmB9Ri1N96AEuykVAnshnveubIw9OotTY2OjoGDiHyAbihY01ahXhe+mYwButHADLlDJl1XVsYjOiND4IbatdsdqoVo3Gev0Q1I1rwjMAJ97em30W9pWtx5+XHIcwDWHTJkiFTKWUm+BrwCTmj/7OT1nJ8iTDsQ/bna8vAZnRiY1IutrbvgEVzzjV5rl60cWE8vTvCinGJBO1eNotq8Z9PZODDn5eR7Z0K8gsLh4u9MChUKd/FaUToY9rVXs9eJvzn35v2kcUHTpOnGBK4/ZUHkOiYkhBEz0qdAzn7Y59FsGtvLU3Hf0dyt0Vet26iwQ== 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=uW6h+Zc1S1dFZoLM3tQLB5MQEqfAwNAz6jxugpjaWYc=; b=NzburluXwMAZo0KQayKBmDUZAHPiCXN3ddMtW5sAhHAvZCnwX0AV0p5xScbyqBz3/5yLWkQ5UO54SpAKaUl7DCJxtvMb0tDoFleSY9IWbqfBiK6ARUrPWv9ciOxiVZqxcaRwwFlMh8Hw7953vweeSOu4nWf9ImnMQXFOy8q237w0cJc/m+qu2ccJQwYmUZaGu15/2suXkXPPnTHt/oJKewEuL41ufJO0/sKJNhtl/yLJ/PIsytUZYTzxCRzyyzasmJPpHFFSVB64hCF0rTU551ZtPD/6i3QDQzM09ftnlhLxeUNJmHuiQeqs1rpXF9PcT/gY4IB2vnT8kP0ZZTBCyg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0014.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:2b7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.15; Thu, 15 Sep 2022 19:28:31 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::51a4:ed23:ea45:dfeb%8]) with mapi id 15.20.5612.022; Thu, 15 Sep 2022 19:28:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Sep 2022 21:28:06 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220915192809.2761301-1-andreas.rheinhardt@outlook.com> References: <20220915192809.2761301-1-andreas.rheinhardt@outlook.com> X-TMN: [qx9hRJqoyp9O+G8kAZqGnLCNACrY5MbDXOw4+33yHFs=] X-ClientProxiedBy: ZR0P278CA0117.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:20::14) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220915192809.2761301-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0014:EE_ X-MS-Office365-Filtering-Correlation-Id: 9591265c-45b8-42f0-573a-08da97507909 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKwiAlKx4YLPXfs4dEXJm5ZiKk1hfDeE+x8NuKxjWrqBoxp5gyYz3ALMCuFBfpZHgh9qKqqBPOulNwtxSkF5NakkjXfF0H5F98KO5BoUcJAHlpczS13m393V8hmyKdRDW9DkdgiYWwHXGedAjnMOzywCUY1aXbAWGFwvOXRon9u0bBKT4yN3TGvGc0ZlJRIItwmRpR9S2c61eZk+4muJGqFYPL8S+9Q8MZXtY6BlKmX9XXhIC1w8uRTgOcioc4/7CN7VKtkf0Q/OpNefSL/0jT8eGgzq9WtD3rhke4QjdohQvO4mFefXbAXBiC76DtdNNOkkrJ7w1fa8lMImHtDxBtRC79MnKxb+kZwS6WEbVTTZtHnkdqxj26rfNkqyBjpmrS88v+gB6Dr9Hi/1gM87wOyGIL4EKfcScLeSPtaJ6TalsH97KrHUQApZS4h7LfNgfKhfw2764FB+AyZAd7lxOSxDHJL/7Q1QGz91c0t1S0MjboScAwS3ojqEIoTaDd60uXfZbOGSeZRm3B/26GeG2n6mihBY5QdQFGHTTqp757XEFLnIosLT7fZg/aidhmlw9cerVyZ4ezCSHhHmD5D2VFtzknIEfp1xioEIyQUNMO33SkT7GipaMXrmP6jsjTSq0PLoGVpdGxvTVw/vn6vLKniH3rrQ9bHhflEZadDeMzl8tIRaqtyADmyVVHaEIHtxaZuE17u69usDGKh5wah6lbsleJI5jALL/8M= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oagByH/BOuhRZjLrIrYaxdSCMAjal6i3c7w09RAurIGZHspMSd6tP2wFQ2jafVTNp+RpfZnPzDj+W56wPl10xFYLF/tdgV3frf1XaIih4037ap55pYuNxzrtSUyAeQ7SRclBSztcGn3dGcyA7dszodbmI1RV36fXpfJv17sO67Od5MILoXu3opo8ILsH+EiIGUIVWthmw/ooEGNMICfkrP4VNYsj0xYe7R+N64iReTQ7mfsXU0r4SOjjhmO4C9nGn5E/7XbzD5EzSGJc1WcTUEJK8dAiFnafCZZJl2UqkL3lgsx2ZVo9WuXIhcQ3rBOsE1e1FiQLRxCoZfB0DYDGrdwD/6PlAgHwNDkue56nJ5wqZfm575THpZEQitI6hgQ3u5D1I61AZCSE/wucfE+8zss3Tpk8HNCTBDb+3Ro5yr4wgeGJbdZ8ENBJuR2F+X6GVEftq2r2VsciXdQIgPxqTI5meSRuB8bC6Ymar5/vN+Va+PwTLd/xJV3RjDq8kzlJCdkESHDtrsfe+sm3q/xr8HY8ZHq4ZcF3T08O7UPN28gWJ0yI5lQLtbNW8IaeGX2NC3oOLpURaoogP6aQhPvUSHq8jJW2KEBgYpdwfALzUqm0RvDiEeJWHl7v463+KOF+hr9X1uE9uqRgcRGfewiuAw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?JLyWbnmzJE6Pt8nmuWjNF0ieob60ocW+aQjc/L6IrIBgSTd+sn1dweuGWYq/?= =?us-ascii?Q?rHnKaKI5YCO9LnkrhYZUl/kmwGlS04r6pEMKg0BqGJhdC+rzlKSAEns770QJ?= =?us-ascii?Q?AqcC7LjZKGTNKE++q1D2kpD69kjojlKjgOPCEOo+RtFUxMlU7Zdxnug4ZXHm?= =?us-ascii?Q?GIjC/B1Es1ZEGkLA/myhwLYo2jUm7grrzlo4eDUK5aO9CEqmpgRxZ5TIm6vJ?= =?us-ascii?Q?wAi6UEvmnNKrzm9WS/6G/0Z8ASIiJgiWojDjB9Z7bZfoNYAJ+5JtI04D6b6h?= =?us-ascii?Q?JyzRs6zAncuOilvFE6kmDl/Vbbv+tCtbDsWdwWFIetqwvh2RpPRu3wltHTSa?= =?us-ascii?Q?YL9bKZSk0P7mLnamc87jNDy5g2zFpRoP7zlIoH0ZIsFh3vZ5hm/NBowTOij0?= =?us-ascii?Q?IGNAL2BWSFtfgXTuFnmd0buy1MWKnP9s1Fdz/KzlTp+QJkA6lAEDOmVoplgX?= =?us-ascii?Q?pTg/FA4XpZaHGGRxPgd0xqzNbdMHFpJK+HlQ3bBOTuYJREiMkZId8AfzlJns?= =?us-ascii?Q?JMq2HeWiEIKQyCUNrbs1EehC9w1osuEd2P9f0Rn+0C+zxrRP0wmaeEbJPOsf?= =?us-ascii?Q?ncHUdzUg+CQkLD9Bo2/obJST+UJfrP1r6+rRj7m7lpx7Zi9mpZv3UCdnZdyw?= =?us-ascii?Q?J7k4BvgC7DKvcfD/T22dfS8HJd0TYMs5WjPkOvJyM9iCRj59TnHCjSsIoMmG?= =?us-ascii?Q?9fvBngg6QjcsNI/bsz/Nz8GFA9fuDJXLypj+faRoydBpDQgcWeh7hSqZaQlL?= =?us-ascii?Q?tk8aTclYm0rqHW+oxChJnE4j57bIDGrBil674Vv9k75nm5lysLZG7oizYGVH?= =?us-ascii?Q?iK7ip/8gou3smJJkL6k5Z1cVdHA7I8LroSZ1o4hNefgADqObz4lrCfzGPQw6?= =?us-ascii?Q?7kibO89btYncBk8PG8iUEyq2vZ3251J+Dj9tJKdtaA/WeEV7PIjEwJLumXz1?= =?us-ascii?Q?hnH+v4Uyv3DBsF0rYQymAIEEteCyv8P2KKYmcxjU4lbku13okT6YG7QQEr5n?= =?us-ascii?Q?4cClNeHCJpRNtqu7uTTNLCEgx7nl+RYxspDY+6zxYiIcaySjKGJ40JcNbBEY?= =?us-ascii?Q?LwFNIVdeFpNoGZH8bkMxcp2JsTtZrgukpo6h/3coIqV4+Xspg0UtN4ZiNJhg?= =?us-ascii?Q?8cm7ArGcrIB7wevrLYqOnO9n+R5od1Rpk3VQNo9x15RxxU42CbILT2t5LDLF?= =?us-ascii?Q?SUtc2Jw8fCU/OuGb3WyLW9Zc0oREkfZaLAmkuobhQaQ6CLBexbof6FEVNULm?= =?us-ascii?Q?xDiSycA7e8Zn4qnY14lh5iqbklzSIu/3hv+bHeHx/TEYy7pbDWasXv0PFxa8?= =?us-ascii?Q?RGU=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9591265c-45b8-42f0-573a-08da97507909 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Sep 2022 19:28:31.2210 (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: DU2P250MB0014 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/aptxdec: Process data in complete blocks 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 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: The APTX (HD) decoder decodes blocks of four (six) bytes to four output samples. It makes no sense to handle incomplete blocks: They would just lead to synchronization errors, in which case the complete frame is discarded. So only handle complete blocks. This also avoids reading from the packet's padding and writing into the frame's padding. Signed-off-by: Andreas Rheinhardt --- libavcodec/aptxdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aptxdec.c b/libavcodec/aptxdec.c index 878c9ffe1b..d254b3026b 100644 --- a/libavcodec/aptxdec.c +++ b/libavcodec/aptxdec.c @@ -151,7 +151,7 @@ static int aptx_decode_frame(AVCodecContext *avctx, AVFrame *frame, /* get output buffer */ frame->ch_layout.nb_channels = NB_CHANNELS; frame->format = AV_SAMPLE_FMT_S32P; - frame->nb_samples = 4 * avpkt->size / s->block_size; + frame->nb_samples = 4 * (avpkt->size / s->block_size); if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; -- 2.34.1 _______________________________________________ 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".