From patchwork Sat Sep 4 06:54:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: sunzhenliang X-Patchwork-Id: 29999 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp1966853iov; Sat, 4 Sep 2021 00:10:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwZGdp8SOCEP30zQa4dX4NhU9CS7deapwfBbkkQHzgiyjJF8x19kunwhKuYqVBVX9Rr7BJ1 X-Received: by 2002:a17:906:d29a:: with SMTP id ay26mr2860346ejb.107.1630739433379; Sat, 04 Sep 2021 00:10:33 -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 p1si1435104ejm.169.2021.09.04.00.10.32; Sat, 04 Sep 2021 00:10:33 -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=PRgUZHy+; 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 0FC53688051; Sat, 4 Sep 2021 10:10:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from JPN01-TY1-obe.outbound.protection.outlook.com (mail-ty1jpn01olkn0186.outbound.protection.outlook.com [104.47.93.186]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB4DB68A0F9 for ; Sat, 4 Sep 2021 10:10:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jX1N757AnVPplwsuvK3bYR95dsl8/RkRR9JqW4wWapyEVdRfJdPfDKIYpOUmuw4dhdP5lUNSbiwPlKGufMLoRXExZXk08BlNH6q0v/Tx1Zw/V4CJqb5GqsF6NAh75vzxK4kQ8XSpPK+TbhtZlD6j7Rd6SCphG5tXrEKZyeTDSrhw9ILtUOPRix6ZKY2usRyYuIRJgqypgHbN+KeyUIqVEhWvJX9HQ/CZlgPedlJ2TUt6FDU8ymkFC4zGqNVSLHuzsXBnZm5g+uNHlJm6UUkT79qfTcu0SkDQj8qNWtUl8F7fFbAtPhRQMS4g1O6FEQdfagnepRk+EwiPNNda1M8ECQ== 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; bh=NCseMMMvlJwK2dFejPiHxeuWRy+s+uutaoIZ0Qnasnc=; b=LadjEV60ASyNxLWJKXW1FffBYykdVCYyRSsagwO9X8bm53NKuxxkotiwBRxNcupWOcVvdWSE3YrHJwGlpwATOVRDa05Qs+AeEit/6OP6GOf/oL4z9YH6OgNNKFlH9lBLdD0ONKKouInAxtl4xmBX8dywSY0lxJXiZFYkj7mJRsZDIgncIgGZ+wKSRl98Jb9T83WM1epktFlNvgZ3MMQmBLQ/imnA4Je9m6Ab2kO5OMBzkmeqFUJv5CF45sroLtTKfcvpkKbSv1VFTI2IRMRqJr2VbHzNJEDQ9gwQBq02JM9Teddgz3GztL8knlkHhNITilvGz0sAa6tBEAHBn7HzLg== 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=NCseMMMvlJwK2dFejPiHxeuWRy+s+uutaoIZ0Qnasnc=; b=PRgUZHy+BFStGALTZ2CgdMSdB3TTmlgJvFbsLid5UDcAzNq0d0YfiuPhTlPSLkwmDIsF447JEblOLq1PcK5dXd2apvX0WZbfPag5W/TOX3RpfaTlZE3JkocQIDOmTcddlxHd42szgHdHdun7U12cLjr/tFdL0QNMCo3nA+gylNx2TGU496oNgy6wKbUs5YQne8IMWxcv+e8OITemjLB6wXkYVgJQSxMiPlkqN5bvGSUBqHpWj9IsXDSiTV85uY1bYHug8AvjdWGIDeRuW8gKtUVetn9FHB8saCRwr+O62wzMJ8A1NYxGLgKAitNhDjGF2LeBBE2WmrF/5GGXDQij9A== Received: from OS3PR01MB5976.jpnprd01.prod.outlook.com (2603:1096:604:d8::13) by OSBPR01MB5255.jpnprd01.prod.outlook.com (2603:1096:604:7e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.20; Sat, 4 Sep 2021 06:54:25 +0000 Received: from OS3PR01MB5976.jpnprd01.prod.outlook.com ([fe80::8424:5db9:adef:aafd]) by OS3PR01MB5976.jpnprd01.prod.outlook.com ([fe80::8424:5db9:adef:aafd%5]) with mapi id 15.20.4478.024; Sat, 4 Sep 2021 06:54:25 +0000 From: sunzhenliang To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Sep 2021 14:54:13 +0800 Message-ID: X-Mailer: git-send-email 2.30.1 (Apple Git-130) X-TMN: [X5jl209DmR6kp3Ijk6P754iIyW/gmdJ+oIvps9nAtNBlzJ5nfmYNg7hNpH3IIoHl] X-ClientProxiedBy: HKAPR04CA0017.apcprd04.prod.outlook.com (2603:1096:203:d0::27) To OS3PR01MB5976.jpnprd01.prod.outlook.com (2603:1096:604:d8::13) X-Microsoft-Original-Message-ID: <20210904065413.30406-1-hisunzhenliang@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (240e:39a:344:dd41:577:5567:708e:5e76) by HKAPR04CA0017.apcprd04.prod.outlook.com (2603:1096:203:d0::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Sat, 4 Sep 2021 06:54:24 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39453514-763a-45ec-c181-08d96f70d4e9 X-MS-TrafficTypeDiagnostic: OSBPR01MB5255: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TXB1PAdescziiVFiPIVFDpLlAS+IGuGmZ423XGW6cGMshoYEmSTIdExcuY1jAiAwhOqcBvaPv27bp/tdWcg8DLrps2tDtY6xeLguELB9PD5Nv2lFbXPMn4M+HScvDdOINx3PFR4+xpIXl0+FRE4N5QANro6N3dB6TJAUj0WzOurlDujeZvspaO+l8kNFdxVL6Tr0g22rpR6d9L5XptIszc5j2ZM2jFWheBg44FVfgti7DphA4k/2hxRqUehUJMYQYQSA3jhPbkkWO+EcxJcIO2vBAR7zyKWqSWuDTNmJ01hnK5gJta3tu6h4rnNYMSLNdpQoq61ujfcpUhT79P2ptKX6OPiLYy2/g3xZ80EOlnxPqW9aL2bVRxcgb0dodYZzNF6lfxRfo8k1ds47Kp177vkK8wmi3NG43QYCgnM0tNuCTvgn+S6M3X36N0zF5IgR X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 9puBjuwpOJYBZG3NDZF3i624ZAl4B/7WCNcovZD+KcNLlclvWbY/2wbOvpJrZoUqr+24XMMtAwOP8xW07V7ocr0VODo2MBkX+LH4RTi52cvnmZ2qRTzIfN9WXK+LKQ59w29uiwmPv30Jti1rv6U1642TXZ6bBvnpx+bwDrI8fVd9MRy89JUw2+Ue7mbERlTpGaBiBa0Ih1PvTDPjTDW/Jw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39453514-763a-45ec-c181-08d96f70d4e9 X-MS-Exchange-CrossTenant-AuthSource: OS3PR01MB5976.jpnprd01.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Sep 2021 06:54:25.1533 (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: OSBPR01MB5255 Subject: [FFmpeg-devel] [PATCH v1 1/1] libavformat/amr.c: remove mode range check 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: BKdThFjCdmVl Those comfort noise frames and empty frames should be considered the correct frame. And amr.c/amr_read_packet() also takes them as correct frames too. Signed-off-by: sunzhenliang --- libavformat/amr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/amr.c b/libavformat/amr.c index 836b276fd5..540d8033d8 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -178,7 +178,7 @@ static int amrnb_probe(const AVProbeData *p) while (i < p->buf_size) { mode = b[i] >> 3 & 0x0F; - if (mode < 9 && (b[i] & 0x4) == 0x4) { + if ((b[i] & 0x4) == 0x4) { int last = b[i]; int size = amrnb_packed_size[mode]; while (size--) { @@ -234,7 +234,7 @@ static int amrwb_probe(const AVProbeData *p) while (i < p->buf_size) { mode = b[i] >> 3 & 0x0F; - if (mode < 10 && (b[i] & 0x4) == 0x4) { + if ((b[i] & 0x4) == 0x4) { int last = b[i]; int size = amrwb_packed_size[mode]; while (size--) {