From patchwork Fri May 10 16:54:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48703 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp717530pzb; Fri, 10 May 2024 09:55:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXj31YsZsmbu7nRPoJYCIbezGFZ4h2WchFXijRWAQ9VA3AhSK+dToAyhBacZ/QiSJnSR9y2UTMptfOgXRwFhQ+T3oIZjZO83L2yaw== X-Google-Smtp-Source: AGHT+IHhAXreSQUitz1oVwITS/BJO8mQr8wEr3Izs5LeJxpQDZuSNAm2vYONLpK9qCRLPiq9nCej X-Received: by 2002:a17:906:3016:b0:a59:c698:41ae with SMTP id a640c23a62f3a-a5a2d30bed2mr284146566b.34.1715360114833; Fri, 10 May 2024 09:55:14 -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 a640c23a62f3a-a5a1ba0d8c5si207941266b.692.2024.05.10.09.55.13; Fri, 10 May 2024 09:55:14 -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=NrwyhoR0; 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 BF0A868D4ED; Fri, 10 May 2024 19:55:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2080.outbound.protection.outlook.com [40.92.66.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 29D4968D352 for ; Fri, 10 May 2024 19:55:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=V3Z7woHpVyb6WXusrPYCTdvuDEPtyJqxHw8LhTulZH87JnkAagTY8MQ9CHBo6kfm/ThpHAWGUp1CGv4fX2jU4j1itKxirm+WLCGwx/bFcuJn/KKq6XvN13LbcYZwNKr+KRcWPQQDHZNrxsER7Aq4a/0oG9TWHayazqZbCHIi/y1OJZKWoKx8sbqTxOPSG5Rs7uABzqjAcWGqYW4MU3qg015zJk+ArpJgg746cZykkW7sQY7kOjKqzNhwTJ2nu/6oylknEKv7ti/ZnAqxOOZ4Ap8kvhObBfNAvA2Fa4na6597oFKobHyO4+dU//hL8SzKYuWM+5gSxNU7k47S1uXMGQ== 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=hMwv9D2DoAEHKVfY/YqHWLtdcFVggoyUxKnT5R/g/pQ=; b=NQTgsvYGZNipcXghh+6tQMKWaFNO3kYCBK8dnfZZGEx2sshtrc/UznbVdUzz4V13W210AsKWyPkjIhc1d7JKvkyqMOFwf5I4W3LAZcfclSVra1b0IE67zA2o6cVMbfIl0f916MXxHDkMB/nQ+byqahP6kvDzpJCKh9/65EprlII9wOV9pYOnNr5/6xqX2kBY0RO4wZ9K/CPX8qjbEAYQmMetswyMa75rRyq5/HG4o2PW5XmYCo/2QfzT8g9kzIhUnNgDk3ww/izqRrgG2VX119AK0Qvb4bZrJn5LYPHj7vjrVoc61Dn2Sw4LPNYqsR/qSk+ECHnmKyOET+lrR48j6w== 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=hMwv9D2DoAEHKVfY/YqHWLtdcFVggoyUxKnT5R/g/pQ=; b=NrwyhoR0ND0i7OB8moUuxkg+k0zFu/jayyOJlRWz/FVqstuzWY1X+nXfN2t2mUE03XnXjVVpwfwaUIbqu2eOySoC8+FMNnnSjgp/HT2QeBqMnzgswf3mQsy/PaQCTiei5V6G8dK15OsuBVjGvxU8QpMpKvD93YiTfZReNvBHw+Jfx+9g0lksn3RbcSrBChjJuBK+utI/WLjzVgDBigMmkTJ2MvPf4YHoM6tKC5FWSXulBfZMf1KTFM6gxc63Zr69Gl1qLVB8lntd46UUoHc9T99XMI414w0yNpZAU8n9U9rFAev0uFnPJyDY5BGB9h5t6dJ2XFRA0z1NZJTQTHffdg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0283.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 16:55:02 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.048; Fri, 10 May 2024 16:55:02 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 18:54:50 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [Ap/Ql0h8TrKSdgfJLOuMGm0RV9yv37NkWEkGQdOg29U=] X-ClientProxiedBy: ZR2P278CA0035.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:47::20) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240510165453.507414-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0283:EE_ X-MS-Office365-Filtering-Correlation-Id: 16dd3e70-7e0e-4abf-9469-08dc7111eeb6 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ERZTGDBqOxDLmn6kDKrgc7X7FpfvLdwcFDPIxPaLnbg6NmGk6DjVZmjJmOM+c/FP7ZuDoXBZsnzOguSVMhBHvpn+uGfn8LDyRLc+lHVd1rItnxpT6O5Mt51CdcfFrUnHEh3Kia3LWkhMkhwkxKfRo2HjIm69Q7eQ9T6G3KuTABtdo3XVmuOrAu6mw1I2wWE2EVrp3hnwfx5iSjkAKy0EHMGcdMzDqsPyllgzVGPHoITd7XxYWgFfK9FEMPHEDIrEVHfyxq9mu0f5MXe3cFJ5Mo0i/kEOAKZgUNlSamwzjvhB3zI3aPKwhlUe6fsTPMnFiEVGRqHWPRmLPiPHUo19c9HQ9bgiQGcHpnQ7LuA/zqtfve0NJlU/7vJVhL3LV+eaRXcx0ya9S4po3JajmzWq478df1fYWaVjAJ88ph5Y9jt2ETetQpQEaExrQb9cTpHoTgKy7OsfOFxd47DO5MqJP/oHcpRbJktVhUGENJearWso5hIHKACyEojjG/XR9XYvqMnsCTyumV4MS9sXxICAl2krgLQpfC7tTOFGMtK1oPl3ZcOpSgDv6sFAyd4TSigUUGYk+X7tOIY7sqpg1yOzMJR3ns/K2MitdwnWMXof9eCnhspvVUVoZGFYNKjGE9M2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Qv2WardXDOa6jJ8Fem8TCwmE3JGpldPrCH/CbJS1BQypUdJjRT07AsRstYArHq4KyDylUa086eNWI5XJe6dZXhDpzaGNQQ02PqGUJst4UNmNUbtI2VcK0XKWsroE3CWAqXAqgOx1/o+aSPSGPQNjdmaxZd2XhoOrK2A8HTyGmDxCD+XoDLsk/141IL+tI6p8EBrKIW/Yqlx4nsiCbG1uUN2v/UL6FGtUpwTjlD7To5jrXeJVnN9ok3qg9yTCmSjQtfJ3UGQYseAA8aDE6phsZie3D2btrk1661NvYRwo58Hc9OWf7nKx74oLX32lY6KRw9h3t7dQgKo0WY8e36JqlqI45DSjOtCWKe73J0B8vwr7b4I1J42Js+cD4uw+7cgiOGlElqHpgP9PfYlB5W9lHMYFk+XLrwVG0ih+qTX6DQ1FEm5/0kE8cv8tzniOrVInui1LvHKqHFw/j32DqtC17tW3PgqhBb2V7e+rxlHHrOtl98HfJ/7aWvyvvCuhX36vcbwHDgXblobGvtZkKw1nXd4ZsE8vjd1cSkBoFW4zAmHB7KoI2VaKGdq/CRMy13MeXaLVyPo5kQjaQna/inAQNYRwR1Y5o5LikKEOmO6n2pDI/4cicbxJSxbnO1HOrw0sEZHuwgoti8Ab8Y9e2hx59MGxGjU3gpfCAHJ9RPkpKstU7Rl2rSS69Hv4c1aqIjMS+BRrLX4nyHOYD8Y4Eq++5WhmUVeEL0dfFQqck1nS9kr6Fq2WuYjSyq8wqZLtWSkpqYaOIOqWNzo10u+sZDJ+hP7PGskVOOIazbCBubjujgt8crDwJgUSBd0IwnzTIgcxW67HC3oQXgEYk6k6EJf5lJy2jGPSxORpRjfwdQRR64DlzhoL7tKqax+6GKmImTtfzWhpb3YBk4zW46L/WU0qaq3gG0CLiKYrHm9lqdXZq82nbSHn9bMtPWcxNMdT51HmkOBHEMTmgvTH1uM1gEWJQIPFksNhFyIqwQv+qzgYPBq9NJR4tn1i09/cvpigOAkQ2tNpkMtnPptlR4XsvdQXuSExBdan0XpHGATYrwmflvYhaKXVAlHy7GaKIdJ+/qg70P5vd+iOBn3M8Pt0ycdponpZnHVHl7yHYS5YCJ6SEgwDRRCYjiiw1vnkbFlMXg1/rwxtKeM915hcu6xTMKbspFu/kS4E+TnZe79qBiwMF2Q5lo+OuhL/VPKBT6VP4MGHNcEkvpsrDzrDPaXRAEjsk/7dFO/zVsytsjdsxbWlkoDnohklhFWkYG+bdxn0Ua6bRxQ/IaFhRqutBqXDR4m71Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16dd3e70-7e0e-4abf-9469-08dc7111eeb6 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 16:55:02.1189 (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: AS8P250MB0283 Subject: [FFmpeg-devel] [PATCH 1/4] avcodec/adts_parser: Don't presume buffer to be padded 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: lTTEsyB+WkIg The documentation of av_adts_header_parse() does not require the buffer to be padded at all. Signed-off-by: Andreas Rheinhardt --- libavcodec/adts_parser.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/adts_parser.c b/libavcodec/adts_parser.c index 6c22c86ef2..81e2669149 100644 --- a/libavcodec/adts_parser.c +++ b/libavcodec/adts_parser.c @@ -28,9 +28,14 @@ int av_adts_header_parse(const uint8_t *buf, uint32_t *samples, uint8_t *frames) { #if CONFIG_ADTS_HEADER + uint8_t tmpbuf[AV_AAC_ADTS_HEADER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; GetBitContext gb; AACADTSHeaderInfo hdr; - int err = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); + int err; + if (!buf) + return AVERROR(EINVAL); + memcpy(tmpbuf, buf, AV_AAC_ADTS_HEADER_SIZE); + err = init_get_bits8(&gb, tmpbuf, AV_AAC_ADTS_HEADER_SIZE); if (err < 0) return err; err = ff_adts_header_parse(&gb, &hdr); From patchwork Fri May 10 16:56:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48704 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp718260pzb; Fri, 10 May 2024 09:56:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVH9Pu0uZ+6U2mUL7L0AUQgvO4GyMZl5g59I79hKIOHrBPNSUa6m9Hgk66d7tRK7RkPo7BYVhSJHyXsaEs230o/IHYEI26M2Wph9Q== X-Google-Smtp-Source: AGHT+IG55qD21wVIqjuIgxbbFCjBX0fOo3QhqDXMZmmtGPryHn5WyaYoHvD2AmPFTraxDjEelq+G X-Received: by 2002:ac2:4284:0:b0:51f:b781:72a7 with SMTP id 2adb3069b0e04-522105846afmr2199306e87.60.1715360206932; Fri, 10 May 2024 09:56:46 -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 a640c23a62f3a-a5a17ba39b8si241925566b.551.2024.05.10.09.56.46; Fri, 10 May 2024 09:56:46 -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=t5WCrKJd; 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 50B7368D352; Fri, 10 May 2024 19:56:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF38D68D4BF for ; Fri, 10 May 2024 19:56:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NCpKHE3OxSN8Ru/EEztKYoR2RxTyr/MIUld1BryE6aCSbVw+4aOq89RYlZewazYp+YAbLYXug0zHm2gF65712J/yASUHPFqGcn4uzmmWlTHXzqAHu2pX+04ys0kooo96w6ZMof+6lzq+5MgdOc/nL7Ya4y0zO03GDL1q3uM6Lbbcw5CDyx4f3dKsNV8wz8ai3ynkBfdwKC9RGK20Qj+ifiSwhb0E0IieZlruUh/zxlDLksK6+YzkmQubt8JK8H1Wgwli22Wz1xDivDnQfgpKeQT9fTA8gEbZjSZZZgrgj+ZWCLKUT6zP+0rQWRed7TpdaFpAY64/dQNt//jMPJVGbg== 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=Mf2Fv1QTMyBfpvkLgHHQhVooQiVRWarSbY+asCxqT14=; b=jCw/7AJ91bjVDCiokwMGPPAQcgyA09ZoOc5aOBhgzcDq3WWYY1r+AJY6D12YJziliAB0tjRczWbdBAFHn+glx+DdxkZrhLTa4ot0wvI+FwikT6WrS9HlxNac3STnRt/n6CWDCZS8n3lxxyDRNa6hFHWjt+FXt4Y3xLUrRpxVe3pwS8M+r7w1rgTBZkZi22R88NG0mEBUh482/w9gD3zoXIwH89sTTQWYcRdgd2AOB85sOQPggYUY5PM8eoJmRm/GEfjV9Zcgw7YSd8VTkttVDbxQN9LDbaJCX3OdpmKo75cu0YW2og80IVuSKdxmoydSOtISiWyJrIwavEpw2syAGw== 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=Mf2Fv1QTMyBfpvkLgHHQhVooQiVRWarSbY+asCxqT14=; b=t5WCrKJd9Bb2UIf7OxKzo5Eq/bAd4OWwL7KzzoM0nlpS3u3JUx48W4QFh01RmwaMzleygn/iOqo8MROF66Df8qNCdLlrhS6edHL0iN478goAVAXEiiiGcIWKoEMPboGLjjWRx5ch3KQNkDHCMKOE7nzzqQGFrhyQyX4cse63PWszsA5+VGEIBS+pZZ2D3ugouLwdAUAOTPTtcpBhvbzHtkxotOyKsO5vM/JMI2DqktzFyjzncMF44Cn0DqUP/2moBjqzVrnifdPbpph1cjDrUEwwJCP4VAISRhhNMAcKa310yW6XHOZAHDvHPabE0bm6yE3jg5/3OA5xbHXkVwsg1w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0283.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 16:56:35 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.048; Fri, 10 May 2024 16:56:35 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 18:56:25 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [AsGcROfLpwd4jPFWWAayum+uQCtDVSdlxxr/rpAQuFM=] X-ClientProxiedBy: ZR0P278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::25) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240510165627.507659-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0283:EE_ X-MS-Office365-Filtering-Correlation-Id: 22d17844-1a1e-4acc-3f4b-08dc71122687 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: xLl0IEESNk6WG1twnq61sLlRI1OXD3wcrGIB34kR5zv3vqgv0Kp6Js2PMbS8qMcVUz7OAPOl8Gydsfx9igWBRip4aS1+bhanObX78UUUBD6l/WCBPWsa10t7r/YkxON82kACmyMaT75aakD0vedzhmMQrBWJmOzg5XdyVTQ3VFLphSRzomYSERMu7ASW/tguE/pwMLcjPWBnr7jHM5Ra+m+24WGDcDu1ID6jeHFA+TarAchH1IlWP/v3Yi2cLqSZe1Cuq/VIQLbYZeeKRsbDzN8j1eLo1mwnAMSAWKQv91zIjEqF6T4mvO4/0Ssl2YKTiR4E22TRsYFLH+jPXgyvie3bwMkkf+qrwRnJKsrJFCFTt/koCiwHrFX9HjGL3pEAy0mJ2KkY/yzam4J6Dj/PZ0PHKTnnxQbBH3WVw/j+DABk0EEulHPTEJ0J4kHqvy9Y97jC4WqHD+Vv4/5ajiBZkzoD9j27RbpdK6vZ//GNbSNOI5V3GbKngw1MQbOTBeqWEbU5GJbre15B9cO5B9HrwZOazy7lBdTs9guz/xd0nH39gqQ1UM17g66JXPtRMJ+CQoADUyMPWeY28NOr3nd5BdIQ9Wlaq8MaxmTjbAyss37JRmRL2xn8CbPj+dySFrhN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MGzYuKzblK7il4aWka67ysrSKrdewdrS2+ci1VAn9v6kyjhe2XhH38NygLXJ8mNIaK7rzH83O3Ckpk2vQaFzG3PacIwhiDY1FqrcVqSwFrRNulew977KosQTKVOaw60QvkQX4SGzC+GB3DwCuMALFXehxzheuaQuSTxW9i3n4K+LJXkoIDu5/vtx1XOvcuVE9twW80HNk/+l6U6P836lwtBlNcIcxlrecS3GkTjCnQludIbbqWy1CBCEkyew4MI+FUwCDHux8i51Fnz3Hmp3/Wi7dSqM1RxfBx3UbmixMu//h2GGaSUmNHjT9ecQQks+5/mk9t8b/HJ4H/2vl0ss6yI6u3SL6M40XKygLzSHIOFXrMRWNRrQggBkiEBFNYuSTlMO04SFci4dS7taT7EIzU+5faLklMgB2eLBYCidldRV5axrVFI/xrTm/db7qKKb3F/Uu3Fo2X8wjahmTrNjO5KcIK8AMb2uj/WdmUd1zGUS2aiwHq9dwANG68ZY7HnN0/Hlh+/K8t9L42/PtlOl1s9JiRYjesLIYor8lvb6ak1xIAM4xdgkZ2XwRYakA34elSLbwvkMcojsbeRW1w0PTRDeNyEdrovPyDHvHvrtJ3JJO33xm4GmDFbSxu5+fkqNOy9Hh7lVR24Njrj6zIsFbrSmZ3+Tyy7adRVwbQHxII8xJFdKIA/+Ff5o6GXJ7mKcDuOOhEf/aRHyz39TWd4oeGqJlXwTcuMFSKVnjeKWjsIpWah5dxb4vNMjmYBc0S+wfhJoNyapzevt/kCJJk5AZKJjRJdcxfiHMstCYJpb2juhC75FKf0u2pjWDIspQ8uRaiuUYjGO6J0C2yytakF9YKSWBK9vz4LIzaHu+Wgy4k5tuCZ9cxk+BwFc95WKHiY/nmDC/ukCG6O5yRuIY39Li8U34u8DrkIReY4GVLwytOhkagdWFTNYbcxESk/AnhoJRgnUCbrEfspKVcBQsoze3hfzRLoAEqkbuqYH4dqOgJ2samjQ67Ah3UA21rTSAqK+tH/yMTxi7MIjydLsrr2rdd2D2q8bGn6geYizrcmTCWgczr1pAL2K+6OJT1dq7fFDf+Y/Yenyp5JnZ0lvYQjlOgdo+Jhy/CGWsz2uRHoG6xzfM1jVySyvoATG/yKti+N6GhBDvb3A1L6q0NP8gtl7gAyLa+UK9Do5BpFAh2NZitC096sDlVukaGwri8h/V2S5oxYtEkpJ3FEhRLbycjOleTnYcMl+g6U+qlIr/QSkSlREixKWON2LpwndyPj4mz2m9A0a16s8vKdfcj8Liq5SzQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22d17844-1a1e-4acc-3f4b-08dc71122687 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 16:56:35.1298 (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: AS8P250MB0283 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/aac_ac3_parser: Untangle AAC and AC3 parsing error codes 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: jCyssQR6OesE Also remove the (unused) AAC_AC3_PARSE_ERROR_CHANNEL_CFG while at it; furthermore, fix the documentation of ff_ac3_parse_header() and (ff|avpriv)_adts_header_parse(). Signed-off-by: Andreas Rheinhardt --- libavcodec/aac_ac3_parser.h | 10 ---------- libavcodec/ac3_parser.c | 14 +++++++------- libavcodec/ac3_parser_internal.h | 13 ++++++++++--- libavcodec/ac3dec.c | 18 ++++++++---------- libavcodec/adts_header.c | 7 +++---- libavcodec/adts_header.h | 16 ++++++++++------ libavcodec/eac3dec.c | 6 +++--- 7 files changed, 41 insertions(+), 43 deletions(-) diff --git a/libavcodec/aac_ac3_parser.h b/libavcodec/aac_ac3_parser.h index bc16181a19..e3259d1841 100644 --- a/libavcodec/aac_ac3_parser.h +++ b/libavcodec/aac_ac3_parser.h @@ -28,16 +28,6 @@ #include "avcodec.h" #include "parser.h" -typedef enum { - AAC_AC3_PARSE_ERROR_SYNC = -0x1030c0a, - AAC_AC3_PARSE_ERROR_BSID = -0x2030c0a, - AAC_AC3_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a, - AAC_AC3_PARSE_ERROR_FRAME_SIZE = -0x4030c0a, - AAC_AC3_PARSE_ERROR_FRAME_TYPE = -0x5030c0a, - AAC_AC3_PARSE_ERROR_CRC = -0x6030c0a, - AAC_AC3_PARSE_ERROR_CHANNEL_CFG = -0x7030c0a, -} AACAC3ParseError; - typedef struct AACAC3ParseContext { ParseContext pc; int header_size; diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c index 4e0ba73481..69989690dd 100644 --- a/libavcodec/ac3_parser.c +++ b/libavcodec/ac3_parser.c @@ -81,12 +81,12 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->sync_word = get_bits(gbc, 16); if(hdr->sync_word != 0x0B77) - return AAC_AC3_PARSE_ERROR_SYNC; + return AC3_PARSE_ERROR_SYNC; /* read ahead to bsid to distinguish between AC-3 and E-AC-3 */ hdr->bitstream_id = show_bits_long(gbc, 29) & 0x1F; if(hdr->bitstream_id > 16) - return AAC_AC3_PARSE_ERROR_BSID; + return AC3_PARSE_ERROR_BSID; hdr->num_blocks = 6; hdr->ac3_bit_rate_code = -1; @@ -103,11 +103,11 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->crc1 = get_bits(gbc, 16); hdr->sr_code = get_bits(gbc, 2); if(hdr->sr_code == 3) - return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; + return AC3_PARSE_ERROR_SAMPLE_RATE; frame_size_code = get_bits(gbc, 6); if(frame_size_code > 37) - return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + return AC3_PARSE_ERROR_FRAME_SIZE; hdr->ac3_bit_rate_code = (frame_size_code >> 1); @@ -138,19 +138,19 @@ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr) hdr->crc1 = 0; hdr->frame_type = get_bits(gbc, 2); if(hdr->frame_type == EAC3_FRAME_TYPE_RESERVED) - return AAC_AC3_PARSE_ERROR_FRAME_TYPE; + return AC3_PARSE_ERROR_FRAME_TYPE; hdr->substreamid = get_bits(gbc, 3); hdr->frame_size = (get_bits(gbc, 11) + 1) << 1; if(hdr->frame_size < AC3_HEADER_SIZE) - return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + return AC3_PARSE_ERROR_FRAME_SIZE; hdr->sr_code = get_bits(gbc, 2); if (hdr->sr_code == 3) { int sr_code2 = get_bits(gbc, 2); if(sr_code2 == 3) - return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; + return AC3_PARSE_ERROR_SAMPLE_RATE; hdr->sample_rate = ff_ac3_sample_rate_tab[sr_code2] / 2; hdr->sr_shift = 1; } else { diff --git a/libavcodec/ac3_parser_internal.h b/libavcodec/ac3_parser_internal.h index 2ac0e67ec2..2c4eb546e5 100644 --- a/libavcodec/ac3_parser_internal.h +++ b/libavcodec/ac3_parser_internal.h @@ -64,15 +64,22 @@ typedef struct AC3HeaderInfo { /** @} */ } AC3HeaderInfo; +typedef enum { + AC3_PARSE_ERROR_SYNC = -0x1030c0a, + AC3_PARSE_ERROR_BSID = -0x2030c0a, + AC3_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a, + AC3_PARSE_ERROR_FRAME_SIZE = -0x4030c0a, + AC3_PARSE_ERROR_FRAME_TYPE = -0x5030c0a, + AC3_PARSE_ERROR_CRC = -0x6030c0a, +} AC3ParseError; + /** * Parse AC-3 frame header. * Parse the header up to the lfeon element, which is the first 52 or 54 bits * depending on the audio coding mode. * @param[in] gbc BitContext containing the first 54 bits of the frame. * @param[out] hdr Pointer to struct where header info is written. - * @return Returns 0 on success, -1 if there is a sync word mismatch, - * -2 if the bsid (version) element is invalid, -3 if the fscod (sample rate) - * element is invalid, or -4 if the frmsizecod (bit rate) element is invalid. + * @return Returns 0 on success and AC3_PARSE_ERROR_* values otherwise. */ int ff_ac3_parse_header(GetBitContext *gbc, AC3HeaderInfo *hdr); diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 2d7e11c5b8..0a4d3375ee 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -39,7 +39,6 @@ #include "libavutil/opt.h" #include "libavutil/thread.h" #include "bswapdsp.h" -#include "aac_ac3_parser.h" #include "ac3_parser_internal.h" #include "ac3dec.h" #include "ac3dec_data.h" @@ -1538,19 +1537,19 @@ dependent_frame: if (err) { switch (err) { - case AAC_AC3_PARSE_ERROR_SYNC: + case AC3_PARSE_ERROR_SYNC: av_log(avctx, AV_LOG_ERROR, "frame sync error\n"); return AVERROR_INVALIDDATA; - case AAC_AC3_PARSE_ERROR_BSID: + case AC3_PARSE_ERROR_BSID: av_log(avctx, AV_LOG_ERROR, "invalid bitstream id\n"); break; - case AAC_AC3_PARSE_ERROR_SAMPLE_RATE: + case AC3_PARSE_ERROR_SAMPLE_RATE: av_log(avctx, AV_LOG_ERROR, "invalid sample rate\n"); break; - case AAC_AC3_PARSE_ERROR_FRAME_SIZE: + case AC3_PARSE_ERROR_FRAME_SIZE: av_log(avctx, AV_LOG_ERROR, "invalid frame size\n"); break; - case AAC_AC3_PARSE_ERROR_FRAME_TYPE: + case AC3_PARSE_ERROR_FRAME_TYPE: /* skip frame if CRC is ok. otherwise use error concealment. */ /* TODO: add support for substreams */ if (s->substreamid) { @@ -1563,8 +1562,7 @@ dependent_frame: av_log(avctx, AV_LOG_ERROR, "invalid frame type\n"); } break; - case AAC_AC3_PARSE_ERROR_CRC: - case AAC_AC3_PARSE_ERROR_CHANNEL_CFG: + case AC3_PARSE_ERROR_CRC: break; default: // Normal AVERROR do not try to recover. *got_frame_ptr = 0; @@ -1574,7 +1572,7 @@ dependent_frame: /* check that reported frame size fits in input buffer */ if (s->frame_size > buf_size) { av_log(avctx, AV_LOG_ERROR, "incomplete frame\n"); - err = AAC_AC3_PARSE_ERROR_FRAME_SIZE; + err = AC3_PARSE_ERROR_FRAME_SIZE; } else if (avctx->err_recognition & (AV_EF_CRCCHECK|AV_EF_CAREFUL)) { /* check for crc mismatch */ if (av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2], @@ -1582,7 +1580,7 @@ dependent_frame: av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n"); if (avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; - err = AAC_AC3_PARSE_ERROR_CRC; + err = AC3_PARSE_ERROR_CRC; } } } diff --git a/libavcodec/adts_header.c b/libavcodec/adts_header.c index 00fa0a5a99..8663d00f4c 100644 --- a/libavcodec/adts_header.c +++ b/libavcodec/adts_header.c @@ -21,7 +21,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "aac_ac3_parser.h" #include "adts_header.h" #include "adts_parser.h" #include "get_bits.h" @@ -35,7 +34,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) memset(hdr, 0, sizeof(*hdr)); if (get_bits(gbc, 12) != 0xfff) - return AAC_AC3_PARSE_ERROR_SYNC; + return AAC_PARSE_ERROR_SYNC; skip_bits1(gbc); /* id */ skip_bits(gbc, 2); /* layer */ @@ -43,7 +42,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) aot = get_bits(gbc, 2); /* profile_objecttype */ sr = get_bits(gbc, 4); /* sample_frequency_index */ if (!ff_mpeg4audio_sample_rates[sr]) - return AAC_AC3_PARSE_ERROR_SAMPLE_RATE; + return AAC_PARSE_ERROR_SAMPLE_RATE; skip_bits1(gbc); /* private_bit */ ch = get_bits(gbc, 3); /* channel_configuration */ @@ -55,7 +54,7 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) skip_bits1(gbc); /* copyright_identification_start */ size = get_bits(gbc, 13); /* aac_frame_length */ if (size < AV_AAC_ADTS_HEADER_SIZE) - return AAC_AC3_PARSE_ERROR_FRAME_SIZE; + return AAC_PARSE_ERROR_FRAME_SIZE; skip_bits(gbc, 11); /* adts_buffer_fullness */ rdb = get_bits(gbc, 2); /* number_of_raw_data_blocks_in_frame */ diff --git a/libavcodec/adts_header.h b/libavcodec/adts_header.h index 354d07e1f8..d89d487025 100644 --- a/libavcodec/adts_header.h +++ b/libavcodec/adts_header.h @@ -25,6 +25,12 @@ #include "get_bits.h" +typedef enum { + AAC_PARSE_ERROR_SYNC = -0x1030c0a, + AAC_PARSE_ERROR_SAMPLE_RATE = -0x3030c0a, + AAC_PARSE_ERROR_FRAME_SIZE = -0x4030c0a, +} AACParseError; + typedef struct AACADTSHeaderInfo { uint32_t sample_rate; uint32_t samples; @@ -42,9 +48,8 @@ typedef struct AACADTSHeaderInfo { * the first 54 bits. * @param[in] gbc BitContext containing the first 54 bits of the frame. * @param[out] hdr Pointer to struct where header info is written. - * @return Returns 0 on success, -1 if there is a sync word mismatch, - * -2 if the version element is invalid, -3 if the sample rate - * element is invalid, or -4 if the bit rate element is invalid. + * @return Returns the size in bytes of the header parsed on success + * and AAC_PARSE_ERROR_* values otherwise. */ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); @@ -56,9 +61,8 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); * @param[out] phdr Pointer to pointer to struct AACADTSHeaderInfo for which * memory is allocated and header info is written into it. After using the header * information, the allocated memory must be freed by using av_free. - * @return Returns 0 on success, -1 if there is a sync word mismatch, - * -2 if the version element is invalid, -3 if the sample rate - * element is invalid, or -4 if the bit rate element is invalid. + * @return Returns 0 on success, AAC_PARSE_ERROR_* values on invalid input + * and ordinary AVERROR codes otherwise. */ int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_t size); diff --git a/libavcodec/eac3dec.c b/libavcodec/eac3dec.c index 5c71751a0c..2b3bffda6e 100644 --- a/libavcodec/eac3dec.c +++ b/libavcodec/eac3dec.c @@ -39,8 +39,8 @@ #include "avcodec.h" -#include "aac_ac3_parser.h" #include "ac3.h" +#include "ac3_parser_internal.h" #include "ac3dec.h" #include "ac3dec_data.h" #include "eac3_data.h" @@ -300,7 +300,7 @@ static int ff_eac3_parse_header(AC3DecodeContext *s) dependent streams which are used to add or replace channels. */ if (s->frame_type == EAC3_FRAME_TYPE_RESERVED) { av_log(s->avctx, AV_LOG_ERROR, "Reserved frame type\n"); - return AAC_AC3_PARSE_ERROR_FRAME_TYPE; + return AC3_PARSE_ERROR_FRAME_TYPE; } /* The substream id indicates which substream this frame belongs to. each @@ -312,7 +312,7 @@ static int ff_eac3_parse_header(AC3DecodeContext *s) s->eac3_subsbtreamid_found = 1; avpriv_request_sample(s->avctx, "Additional substreams"); } - return AAC_AC3_PARSE_ERROR_FRAME_TYPE; + return AC3_PARSE_ERROR_FRAME_TYPE; } if (s->bit_alloc_params.sr_code == EAC3_SR_CODE_REDUCED) { From patchwork Fri May 10 16:56:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp718334pzb; Fri, 10 May 2024 09:56:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUPHbDJcacdg+pf6HfD9TcbzzuQxz1Fc/pqgza4i+JUJal4cd3rnkU3bxolkj78/JU+Jh6NecEF90jWT6DzO79wwjLwEvGQLJnH+Q== X-Google-Smtp-Source: AGHT+IEI5CHeBGPjUKhShjmt442hnVflqZbGCV1BFJvokOaiSpCuN+/o1uAvYVKoq2jNEvkphsIe X-Received: by 2002:a17:907:75cc:b0:a5a:1826:458 with SMTP id a640c23a62f3a-a5a2d668b78mr213835766b.4.1715360216280; Fri, 10 May 2024 09:56:56 -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 a640c23a62f3a-a5a17945f1asi227520066b.70.2024.05.10.09.56.55; Fri, 10 May 2024 09:56:56 -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=HdxSVXOd; 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 819D168D586; Fri, 10 May 2024 19:56:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E1CDB68D56C for ; Fri, 10 May 2024 19:56:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XfGCnvahgbyVG86vIEQglvMX50mw4c5B0f89OsNOgIdJR5nA8cGKxEGeM97Nq6ii1NjMN4GGlYUlgcJNnkf53zkcAHDq5v3qeil7KvvI28AmseJPbrdD/8aZECOVmEmdQayO0OTBP06EuMtVcX5nMGgck8mNrYG924hjrFnLJlXgH+aDtkuu85ifbivn7b9JkqoXRKRq4QTdSblf3nrbuWS4A9NBV+TomUTQR1wq+vqeukspsdeX+G5dZOECT33yNLnzk43uUF2C2pud1OzWdqQeOG7QsNxlwznr8vwzGNKmJUAFg6XF8OPlNUY/QZkx64mNgNbwsnPyb8M+UCOnfA== 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=K4KRh+ML+lBnIvcfwRJTJBnN07MnrrXuqJqZTUhvOuI=; b=O4AJtpSySUev/i6A5vTYu6wGnFcgC93mIMIUr/qpyVxN8F7Vt2LFRkh8goT67qbVlZt8w8Q77GMFn2A0FEyBGKziuBkSHaHGTZd1pYnJBrlGtn29zGVDnL1/Iun8ZyZ8qXsx4Ms+dEkh6AoIb9kHdqhhs/R4+dH/H3q0y55IghHrhkR6XRPAKohY99Y+GtRG9j4BfhdGj6xkUjAe1VOvjJ2gQZ6W+b4PfFYnEtpClQYqIs8R4TnjNw92XBRW1u6aX9Sp0DZ3cx750lusXqpYXfpmGtooPxLz56AbUz10Mkv9E/HRdvX11s4JXATrtsY1wIzxJ7kC41YHNu6DfGM8uw== 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=K4KRh+ML+lBnIvcfwRJTJBnN07MnrrXuqJqZTUhvOuI=; b=HdxSVXOd/RXK5i7jCq0eFe3BGPb7yYxGrXQ20HW716sVx5OVugNZC16eCadH3NWz7UNFESX21lFZ3QAO2Hw3lxhHghDMptpwUu/oNTPKiQ4F6hHB+tDNrWX+5rihIFheJo++J/kQpMs/1L5OgyQUKNmER7e86l7H3E0iU9bx6zr1fkRT3cUJRBtykV0liK5/9TD2nbnJIqhawtOanvBFytBPMhBfiynG6MOiNw8+odyx4FY/A6nM0a/A8LOGeaUqpUu5NSUnB1s5KdnGsHCbF/QZj0iRE05CKAdkJKgdO+C/belUrfP88x7yROOTWZgLhthcFB9DFZWFoRpktIc4ZA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0283.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 16:56:39 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.048; Fri, 10 May 2024 16:56:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 18:56:26 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [meR2L+shRCYa/UXFWCMFCapoz+xcoRGvN0wCWWUXnPM=] X-ClientProxiedBy: ZR0P278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::25) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240510165627.507659-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0283:EE_ X-MS-Office365-Filtering-Correlation-Id: d9d4317a-f022-4aa1-992a-08dc711228da X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: GamgWp1NqZexnE/owhSSQtef/aOSNW3w4sj/PlZBFJAiBmtVg5WuSzy3iVLY5vw6OCthUoEDaXpvSRlN0rEIPn/d+/XbFB6BbNPMkYCqpmpbb8f2XMyiPpdEEs/b9ps8/McaWKrwzhZ9hin/QVe7DPHMC7arryrM+6uqsKjrhwPpCU/BGIbLFKAlVZW1KIwNrKFRahDkFEZZa9VfH9Jxzq0igFND2Rh+uuJBCU24FUfLzslAxkCeWgZueGYN2/abY1Lue0/yoqGVcMYd3ADYiRtOfUNyDO2ybbEH3rtE8pJbupwAh58wDwYPD9k/VgDXiZVZmAFnVav5Cm/thFp2aiV1wJmurO1xE0ruFvmOeThM0EJWlPTG+EH1mhncztfZ3mTDu5qwLAZtKN131tyeBUTEGHY4ALu3NMyB+6idh3kWjf4uoO7h9UHQc/LqcmVG42KbzxMqW2kKtGUJqSTFwFqKcLgt8nncQTsj5tkD4BMsW9ZtgzGt4/TJnN1DbfLUpYei3iPax2w4v7fPLUNNX+V8dxTBdpJkrPRxbE78KRbmjgFMA465iei257ZPy2FU1QkHxAaxom8AFnE75dNRuEuxwvm0SLmhlF2VhgXyQz6pN8T9n1EGkaUL+pdRm2LT X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: cMvbL5efWXUdx4KbB+CoIDOBJf6JOxP/OTw9PwdeHC7z+27BCO6Wqaqa7Ar5iBQXO2urkshy5iZI3+xrTBLqd3nIgFUAEMBkzfu5Qzc0i4j2HB49neb/Liuh07zpQtx/qvHdOpiBgh6KOiOWIdQS1X5ql8LzRiGDVBHbZ5rncErFHn/cHAEHQiEv2MEb1fhErTrOKpj4orW5YyIuirgx2zWkT+TggiX6KtrUETE587epAmlBORW19BvYvSEwQOffkY6zsmH0Ka3U0MgDtxg1Ox+XbYNheZ9MmDHQZOwjKFNfUEZilsNTuTtwZBDjMfd3AZ3oE86Lco3H+yQp1t6EOHDLKeZCU+PjtbP+yRr3J+RGR/G8XkrKf1Dpj9td0FCYq7towsDBL1xdxGHwbPoiL3IAVJnlL/myEH/8K3Ay4p9yHSa547BZ+xXiw47y6kVonieKx/9wfkOAONNBJ8K7vLGwJyNj1nxupI0eUprCUojcjSE0CGgIcfvq8e0s/2FsRlNWRvInf8tffFAP7ibhcDwwgb3uiV+ymd98V3L+CPKtX9H/MfyDAlUc0kMs0N58cccp6gle1ecTec1kZudYe62jX5dhps5jZBzydbo9t0h6h7RX2h/U0uw6VdwcykytfANRU11gIRmDzQjfSbftTSYjM5ixQfqj/SwjGnJbGEVi4m10uAVTkMtvKMicGAdD6vjyQ1JyHQhedsfk7rKlT/iPA8GqgHZamwRHFpD1pl9EvXahMOhzHv4y/KTjOuw7e1WucDUssZ9fTKubIF4VH/W3r0W9wyk8Y1PvyxI5kwlugFHjF0Il1b/xHexCxzlLZH5AP556IFX5nclmvOn/luH399/ouIdA7RCDGjuUFgBvOTWvP7vXDZ6wOpcN5n6mzNG3f2dEe1W40pXFLVcSE0AFK/xYw5ZiyTX9uxMyEBRJgGBFtBr+7kP0VZm126nhy6m1pURwcglM+HfoSZQ2uJTJahTbJnBHI0HvM9JAvyNPMv+7DTRNgFS0ZoezVs1FZu+DMv8rDbG1Anqmw43Awg3/dqIFhStE48+lM7Tib/E2SZb3v62tZOKf5j7kyw+/ZXdzOq0GUJ8LElACEzxfGZwLKAGwAtiEZgcBhQIV9GdVxfODSer+PTVGfWeMdZitV7vfhKOtiHXRZ39dfiIROBfFAQ80GygOL5ki+pMsb8Uk2OoKnfvcNe4Zec4fYZ+IxSUGHY8PYNHy0RE+OHXah31+UlSggRUEiz2JuRYSpEr0DpGX7AMR7orszo3Tt26feyT6sYzGNu2iCw0cRY1M5A== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9d4317a-f022-4aa1-992a-08dc711228da X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 16:56:39.0541 (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: AS8P250MB0283 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/adts_header: Add ff_adts_header_parse_buf() 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: SWDZCckWReUm Most users of ff_adts_header_parse() don't already have an opened GetBitContext for the header, so add a convenience function for them. Also use a forward declaration of GetBitContext in adts_header.h as this avoids (implicit) inclusion of get_bits.h in some of the users that now no longer use a GetBitContext of their own. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac_parser.c | 16 +++++----------- libavcodec/adts_header.c | 10 ++++++++++ libavcodec/adts_header.h | 14 ++++++++++++-- libavcodec/adts_parser.c | 18 ++++-------------- libavcodec/bsf/aac_adtstoasc.c | 6 ++---- libavcodec/ftr_parser.c | 7 ++----- 6 files changed, 35 insertions(+), 36 deletions(-) diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c index f295dfccdd..186fcd887a 100644 --- a/libavcodec/aac_parser.c +++ b/libavcodec/aac_parser.c @@ -24,24 +24,18 @@ #include "aac_ac3_parser.h" #include "adts_header.h" #include "adts_parser.h" -#include "get_bits.h" -#include "mpeg4audio.h" +#include "libavutil/intreadwrite.h" static int aac_sync(uint64_t state, int *need_next_header, int *new_frame_start) { - GetBitContext bits; + uint8_t tmp[8 + AV_INPUT_BUFFER_PADDING_SIZE]; AACADTSHeaderInfo hdr; int size; - union { - uint64_t u64; - uint8_t u8[8 + AV_INPUT_BUFFER_PADDING_SIZE]; - } tmp; - tmp.u64 = av_be2ne64(state); - init_get_bits(&bits, tmp.u8 + 8 - AV_AAC_ADTS_HEADER_SIZE, - AV_AAC_ADTS_HEADER_SIZE * 8); + AV_WB64(tmp, state); - if ((size = ff_adts_header_parse(&bits, &hdr)) < 0) + size = ff_adts_header_parse_buf(tmp + 8 - AV_AAC_ADTS_HEADER_SIZE, &hdr); + if (size < 0) return 0; *need_next_header = 0; *new_frame_start = 1; diff --git a/libavcodec/adts_header.c b/libavcodec/adts_header.c index 8663d00f4c..0d6be1aa0e 100644 --- a/libavcodec/adts_header.c +++ b/libavcodec/adts_header.c @@ -25,6 +25,7 @@ #include "adts_parser.h" #include "get_bits.h" #include "mpeg4audio.h" +#include "libavutil/avassert.h" int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) { @@ -71,3 +72,12 @@ int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr) return size; } + +int ff_adts_header_parse_buf(const uint8_t buf[AV_AAC_ADTS_HEADER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE], + AACADTSHeaderInfo *hdr) +{ + GetBitContext gb; + av_unused int ret = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); + av_assert1(ret >= 0); + return ff_adts_header_parse(&gb, hdr); +} diff --git a/libavcodec/adts_header.h b/libavcodec/adts_header.h index d89d487025..4f62edcbac 100644 --- a/libavcodec/adts_header.h +++ b/libavcodec/adts_header.h @@ -23,7 +23,8 @@ #ifndef AVCODEC_ADTS_HEADER_H #define AVCODEC_ADTS_HEADER_H -#include "get_bits.h" +#include "adts_parser.h" +#include "defs.h" typedef enum { AAC_PARSE_ERROR_SYNC = -0x1030c0a, @@ -43,6 +44,8 @@ typedef struct AACADTSHeaderInfo { uint32_t frame_length; } AACADTSHeaderInfo; +struct GetBitContext; + /** * Parse the ADTS frame header to the end of the variable header, which is * the first 54 bits. @@ -51,7 +54,14 @@ typedef struct AACADTSHeaderInfo { * @return Returns the size in bytes of the header parsed on success * and AAC_PARSE_ERROR_* values otherwise. */ -int ff_adts_header_parse(GetBitContext *gbc, AACADTSHeaderInfo *hdr); +int ff_adts_header_parse(struct GetBitContext *gbc, AACADTSHeaderInfo *hdr); + +/** + * Wrapper around ff_adts_header_parse() for users that already have + * a proper GetBitContext. + */ +int ff_adts_header_parse_buf(const uint8_t buf[AV_AAC_ADTS_HEADER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE], + AACADTSHeaderInfo *hdr); /** * Parse the ADTS frame header contained in the buffer, which is diff --git a/libavcodec/adts_parser.c b/libavcodec/adts_parser.c index 81e2669149..66b988d6f6 100644 --- a/libavcodec/adts_parser.c +++ b/libavcodec/adts_parser.c @@ -20,7 +20,9 @@ #include #include +#include +#include "libavutil/error.h" #include "libavutil/mem.h" #include "adts_header.h" #include "adts_parser.h" @@ -29,16 +31,12 @@ int av_adts_header_parse(const uint8_t *buf, uint32_t *samples, uint8_t *frames) { #if CONFIG_ADTS_HEADER uint8_t tmpbuf[AV_AAC_ADTS_HEADER_SIZE + AV_INPUT_BUFFER_PADDING_SIZE]; - GetBitContext gb; AACADTSHeaderInfo hdr; int err; if (!buf) return AVERROR(EINVAL); memcpy(tmpbuf, buf, AV_AAC_ADTS_HEADER_SIZE); - err = init_get_bits8(&gb, tmpbuf, AV_AAC_ADTS_HEADER_SIZE); - if (err < 0) - return err; - err = ff_adts_header_parse(&gb, &hdr); + err = ff_adts_header_parse_buf(tmpbuf, &hdr); if (err < 0) return err; *samples = hdr.samples; @@ -54,7 +52,6 @@ int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_ #if CONFIG_ADTS_HEADER int ret = 0; int allocated = 0; - GetBitContext gb; if (!phdr || !buf || size < AV_AAC_ADTS_HEADER_SIZE) return AVERROR_INVALIDDATA; @@ -66,14 +63,7 @@ int avpriv_adts_header_parse(AACADTSHeaderInfo **phdr, const uint8_t *buf, size_ if (!*phdr) return AVERROR(ENOMEM); - ret = init_get_bits8(&gb, buf, AV_AAC_ADTS_HEADER_SIZE); - if (ret < 0) { - if (allocated) - av_freep(phdr); - return ret; - } - - ret = ff_adts_header_parse(&gb, *phdr); + ret = ff_adts_header_parse_buf(buf, *phdr); if (ret < 0) { if (allocated) av_freep(phdr); diff --git a/libavcodec/bsf/aac_adtstoasc.c b/libavcodec/bsf/aac_adtstoasc.c index dd5e8b2a31..b821414f2a 100644 --- a/libavcodec/bsf/aac_adtstoasc.c +++ b/libavcodec/bsf/aac_adtstoasc.c @@ -40,7 +40,6 @@ static int aac_adtstoasc_filter(AVBSFContext *bsfc, AVPacket *pkt) { AACBSFContext *ctx = bsfc->priv_data; - GetBitContext gb; PutBitContext pb; AACADTSHeaderInfo hdr; int ret; @@ -55,9 +54,7 @@ static int aac_adtstoasc_filter(AVBSFContext *bsfc, AVPacket *pkt) if (pkt->size < AV_AAC_ADTS_HEADER_SIZE) goto packet_too_small; - init_get_bits(&gb, pkt->data, AV_AAC_ADTS_HEADER_SIZE * 8); - - if (ff_adts_header_parse(&gb, &hdr) < 0) { + if (ff_adts_header_parse_buf(pkt->data, &hdr) < 0) { av_log(bsfc, AV_LOG_ERROR, "Error parsing ADTS frame header!\n"); ret = AVERROR_INVALIDDATA; goto fail; @@ -81,6 +78,7 @@ static int aac_adtstoasc_filter(AVBSFContext *bsfc, AVPacket *pkt) uint8_t *extradata; if (!hdr.chan_config) { + GetBitContext gb; init_get_bits(&gb, pkt->data, pkt->size * 8); if (get_bits(&gb, 3) != 5) { avpriv_report_missing_feature(bsfc, diff --git a/libavcodec/ftr_parser.c b/libavcodec/ftr_parser.c index 05e6cfed98..656fd289f6 100644 --- a/libavcodec/ftr_parser.c +++ b/libavcodec/ftr_parser.c @@ -25,7 +25,6 @@ */ #include "parser.h" -#include "get_bits.h" #include "adts_header.h" #include "adts_parser.h" #include "mpeg4audio.h" @@ -45,7 +44,6 @@ static int ftr_parse(AVCodecParserContext *s, AVCodecContext *avctx, FTRParseContext *ftr = s->priv_data; uint64_t state = ftr->pc.state64; int next = END_NOT_FOUND; - GetBitContext bits; AACADTSHeaderInfo hdr; int size; @@ -71,10 +69,9 @@ static int ftr_parse(AVCodecParserContext *s, AVCodecContext *avctx, state = (state << 8) | buf[i]; AV_WB64(tmp, state); - init_get_bits(&bits, tmp + 8 - AV_AAC_ADTS_HEADER_SIZE, - AV_AAC_ADTS_HEADER_SIZE * 8); + size = ff_adts_header_parse_buf(tmp + 8 - AV_AAC_ADTS_HEADER_SIZE, &hdr); - if ((size = ff_adts_header_parse(&bits, &hdr)) > 0) { + if (size > 0) { ftr->skip = size - 6; ftr->frame_index += ff_mpeg4audio_channels[hdr.chan_config]; if (ftr->frame_index >= avctx->ch_layout.nb_channels) { From patchwork Fri May 10 16:56:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48706 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1706:b0:1af:cdee:28c5 with SMTP id nv6csp718472pzb; Fri, 10 May 2024 09:57:13 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVRQpAr349KvdWzrD6DpmpTfrokvUnwnU4YHGlbeWZ14cfVZE+unrdwKXZGK9T61RKC2dfV9/CLYrV6jB3FPKHDsZF4WSzqm/p1rQ== X-Google-Smtp-Source: AGHT+IEabc8LiaC5ukMmcrm9nMcV6MDkbVHRpDgP5paNfU4QLgKPd6fF3WT/pzKxNHmBU05XvrKT X-Received: by 2002:a05:6512:34ca:b0:51f:51d9:942b with SMTP id 2adb3069b0e04-52210277c40mr2491130e87.60.1715360232924; Fri, 10 May 2024 09:57:12 -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 a640c23a62f3a-a5a17ba2ad7si226129166b.553.2024.05.10.09.57.05; Fri, 10 May 2024 09:57:12 -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=mQf6Gquc; 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 1995C68D5AF; Fri, 10 May 2024 19:56:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2095.outbound.protection.outlook.com [40.92.91.95]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04A1968D59A for ; Fri, 10 May 2024 19:56:47 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ihukCBpdO8uQLzPY6gD6hJZIVO+JShrlC25XM6G6tg/VHvUjF5RrYR+uCeWlkWWv53XsbyoDyZ9oLdgWe9u0kzO0lko4gpWi+lb22H21FwDSkWmvaW2bZTaCcRdDJeaxjHdsZB0e7/UBLLyntBuuxj3LeIrh8w8zZeB1VRGhDVH7feN8/PhHzW0kYmjGWFY6JGenmvJHG76vTwZ50vALSuDIkWWNkO7avcdqpfOE2CJ3q52hVcAkxwBtvcZ2DRH24DF8X6wfzi1/+85CyFJZiC2DSFSUgRQ7W9bbm3Kjf2PQerchGEYWffVlEGdpsrqS0t+cEP8QThvrd8Hd23AwIQ== 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=DrK+RKME5SWFe8z4XpW89Dqj5RDCIpy21rvqAnhcf8Q=; b=cA8csApuBTJiUcmc6mFqRU8RF7owQwERso6Vc3kJsAHFTzdnSgVljcsvQ22G1sbaoMq5D1GGx5FwabO9Nv1Bjf4GllJfUibUAUcJDny1ZcvRQrv3PsVZSkGeqxFWKRPU4ovcRdqwhAboIGhoEUkx3DgUEGa+Sld787VYeO+zmzTqZTrmaZQI1ZnQlGb3fQj64CFjWWBdBkLLwCdMOhTDmkutwMNnbLDZq4YbhVuXEipZikbqRPRAnLrrZk0iQYtU8gwfTKR58VjVRQXF3EC53FSfA+Lw/v2LKoOh6BDv1h6JV97O0BwFw9lwdTzxeSSLW0ANzVFhnbczbVpofl6pew== 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=DrK+RKME5SWFe8z4XpW89Dqj5RDCIpy21rvqAnhcf8Q=; b=mQf6GqucT/zEfaQnNgd2ZGIVsofXHVZB3BTg2SBzyUShrLsrjo7OdDAXIKGdzhdvl4efohrxlxjwMwBuQ43R7jrhOFRFJyxKwXVOfhDIKpO/6l63hzhVJtUhXC4ZrmGtKdHRt1b91AnB+l5wigI/qSadiNqeg2ljiMj1vM4ajzsjJwYTFExixcuk9FLHICOdq3maX5KFelbh26lw33uQD3E0ILyEu389aQ5jtjmw0Vux/8qi1AQPKB+JPb8o6pVg7KbJNs02HrAe1fT23WqzdD7eG9WQWNAj4zR5O6cKtsBgyEX3j56XJzBfsy6z4HguCW+9QkTyuyhGTNoiwpNQeg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0283.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7544.49; Fri, 10 May 2024 16:56:44 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%7]) with mapi id 15.20.7544.048; Fri, 10 May 2024 16:56:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 18:56:27 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [NDQPaAiWKL6Hw6idKxd8Q3wsXgE0UUN0lh8f2nFf6UQ=] X-ClientProxiedBy: ZR0P278CA0015.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::25) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240510165627.507659-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0283:EE_ X-MS-Office365-Filtering-Correlation-Id: 20be4839-e1f1-43c2-eac4-08dc71122c44 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: NB4Nsb4K3gRVmoNjNkIdrB2N37nPlVzPsAViIWR4RNDqJD1Lzvi7PTNg4fGkIQ28oQhMCqmUlueA0bxowaqWy14eOGZ1O0ZZ8UpGrKriUoCFV7kKzfzS9ETXDr0hmmByav0FwkgNvqo0xlX48kR/I9R5+3r5x1HxsjBU8mFCwbGX58nHsnBC6HjYNLUnzQ2+qOCbSgjQRLlyPgNKBrjhFvKiYRjYEzC+VO6AQFujZShcdMI4ArnKVn0T53UvMsChEfvVaT3yKQ5wvafwQe/9E1SvoPTGMfgZx1lDlLer2AMQyCVmodCaoLyWWbMtJNl1QicDzTeYxqXAMuxs2a7pO0e2Cc86kyS1jUwjGyRh/JsSamtX+ieDZ6BhUb/LGlIPThl/AhAZlflHyILSi/YqXaw9NxTa8txxlk4HFytXBqcxuNBocrp3DEg7jPUJSsnLNNbtKKsHSikqsXa2P3YNm1P8Nm49peD1RKm6lIiLkrBZgziSZepsdpdMM0zH9mt1Hss/dWXYAVuELcuPG60dPm3SzjQotBLDczQ0IsoRgDehP+Q58/ywp6K/mFhlZ3n+cJu9OzOTvCvEKfGTRR+OLPdzBF6cAC076i8KXX7muokcrY6TIvHbMHvgKWBGcoQf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: MuF1JZ3BhNMa5euD5YmwMAMOx99O7EevTXLY2tsFcIBzI9vsakqVDCpS2hWigX2TCzt9bvKciFu3TxrnPc4UQ1/08PDyFCri/TWrHUVVxoIakjvdDZMqBvCDxVbEUBSCUSWj8ZuU3VNoZwB37YW66Epvj4vs1o+yQyrKHp9r96x2llhXe8a76Z0t4SoKR502ILTV5fBFTQl3Q7+Gmn/7Z5iQpchV20qXXQSsXg7EcQw3gBPSa1V8QQ+6ANFWqW3l8nQakuQeeLUmyl/urdiymjjVJN22Qp9DydxrTytWrNq+avZrSu3+DGc/V6zzWbN7W6EMBfG3yXYaUzm0i911JnHtmNbpPw4l+k4wG4XiffVTVfqJwAOoPxLdIEz3C3sJDrT8OeioR2+T1vK6eK9h/TMSUHveKfTjp/eONppV7qZV6NVHFhQDY39cFzH0e2ntdljRuvluNfVWIaEyHjz+G0/j/1nrXMBM22N7ik7gbsRyesx8/iYVWNwS6BCca75sxWtWkR3z45NXg/EEbt1jcw7N0Ycc9vvO5DIO20CEbBtbqKBovhPmq4xfSNTtR/jJBmzCo4ICsWrNZO7Wgjfq5KVz2fP832eh24dBwBQmVJDmCMOTXI/x86TUAJH6KAsE2mNWLnLFvpMIvibkW+j8n7c99zrpq3yh7MX76gKiO+f8vsk8/V5AdklQCfEoVyNCuc9H2167TxTw6xayD2t3GI2dCT0zEgXdUkmAMV78Lvd3ERoQbSB3d0e9AiPH7xcONMHHyIZZMFWzf+RU6uFzhU91Ejae8CVOZHpA9ZbR0RKdR4rXW79VI3m9SCT+ULYKju2h0atD8gvkoTsjpk7C0gGqYdciZO6xpecDLHXejTPxq5dwizsxoiKlWD4grYe0EbJPV+CDj2DsQFRnqusbIEqBYMwKw2ASCwLJdyZShtmT5U8KVszo8qsz6Xbgsnr9Cgn+WLiP8LH6brEFmigSy0r42B7zefcHLl3ryoe48U3TIWKEWxyhFduZhJMDOZG8ST4HqKVcVP/QFx8n+iIJtfHdNmxxcKrYzAhvlNygICwi1EpGFl5ucGmSUe6JzLo/z1Lg+idH8GPAQF97Hxa/d53dh36P2MCdrkOsNdqblHxFUXABBNXn0R5e177DRnVo8bm3ENbaWUh8eD1Qb7R5LfirFK9MomnzRkp9k8LCl4GPesEFJ3vR7L1QeExSI12WnyvVYai/EzjIu3vSWX6UHT56aUJnmkI24atAV07kTv9yBQplIKhQyzYEOD7+z2GJNPhX/MJqttyjEnph6D7BYQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 20be4839-e1f1-43c2-eac4-08dc71122c44 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2024 16:56:44.8296 (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: AS8P250MB0283 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/aac_ac3_parser: Use ff_adts_header_parse_buf() 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: W0gJPwiw6isN instead of avpriv_adts_header_parse(). Using the former avoids an indirection. Signed-off-by: Andreas Rheinhardt --- libavcodec/aac_ac3_parser.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c index 9305b4c50f..f45631d09f 100644 --- a/libavcodec/aac_ac3_parser.c +++ b/libavcodec/aac_ac3_parser.c @@ -144,10 +144,9 @@ get_next: #endif } else { #if CONFIG_AAC_PARSER - AACADTSHeaderInfo hdr, *phrd = &hdr; - int ret = avpriv_adts_header_parse(&phrd, buf, buf_size); - - if (ret < 0) + AACADTSHeaderInfo hdr; + if (buf_size < AV_AAC_ADTS_HEADER_SIZE || + ff_adts_header_parse_buf(buf, &hdr) < 0) return i; bit_rate = hdr.bit_rate;