From patchwork Sat Jun 3 03:33:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3814 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp474940vsk; Fri, 2 Jun 2017 20:34:12 -0700 (PDT) X-Received: by 10.223.133.182 with SMTP id 51mr7110558wrt.86.1496460852375; Fri, 02 Jun 2017 20:34:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496460852; cv=none; d=google.com; s=arc-20160816; b=UzLdpN84jFHHLLG89vVwNFDNepZIhcCipNYz+FjBWLkAMDtws8KorKs47bFDSNpof3 HoWeALdNvE9leDjkUt4qULkaZ4kkaVjiZOQLBWzXAiKToBUK9ryFUXbyGI3bai/Tmje6 cO9eY9zMmmKhwhMuVBiCE9OwGLZl/5wUjjvPtfWVsA9pPRssOgG8GEAtcNxoFBeNrYW6 M7gFyRPeux2CaOEHzBL5hBUEjlfxuxwghY87zm+IPDhEnSoxxJsJlznQykezM1NYhKck 8ZzWj+kLYyagQ2m9JJHJWR6gLaXNmz1m+Pn9xxJl09h7u9WpoB7x3ijle2NL7YuADO30 hxng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=5vEYFkxpf+fagQNPT+Z7rGHqz13DnKCARyMGC7DYC6I=; b=0lx5eytjxVq9TfNKEPeAiTU7KQaackgroomkBqhMHt+0HCh9vNFqR3Foq8yRiQTuAa bo4K4a8MNlbCNgoDMIWIvWLF2YxhI2OS9C4f4JCBgfStuDcIq6mIvHusRgfuUWEHM2GA vUDSZcCRSOfVZstNUI/u/ALFq5lj4UBzzOMd8EjkG9/MFlldBCxpxLm22tfBWjwiH/cL ALav5Aq7Ts79PN5rsz4/XeGEQZcXoRguV8EAAcpeaF0ywO3G/IdpI4RaALXYoj7NDgSy OVMzuDUFOqg6UNLK3XfSAsVNTppZ8ultiH/a6zsWcmQsAGVzPNYWvdCM1MBEFBGoPvzi V7Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com; 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=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i133si5122676wme.74.2017.06.02.20.34.06; Fri, 02 Jun 2017 20:34: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=@gmail.com; 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=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 437CA689CDF; Sat, 3 Jun 2017 06:33:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C65AF689C8E for ; Sat, 3 Jun 2017 06:33:50 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id o21so3585499qtb.1 for ; Fri, 02 Jun 2017 20:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=XTTRIDi1mLZEcuB6Y8eTBQ1kUipkJswwpa7kmrUrO6w=; b=DngBCq+QZP9nza93OPLdGR0HPWsU0c7kosoghNjeZPCSNmtZUiXNf5Pz4qqDK47MSM kJYuIvp7fwGIqXXuI7DiHUzPeH6JCrN+R2pcFz/UHofDkIPCOuwll/3dlgCk5HvZAbe2 5qKheEfhnFQhzD6O6HHdiq7t3tLOVdMhXr6di81/7T7PVhQ68UxuQ7jWc1juQVSEQQ1h jxVL9RWgPpWyaxeG0cRYBlPfttPMk4jK+g/h7Wc2JQ2K19It0rd/o70JLOMbWkyyoPbl f/6ePoJWlbnWVL9p7tX07rTGmT6WnP04UTi970lCa2VF9mVd9QWB/2nvlKhSEUtKKn58 DDqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=XTTRIDi1mLZEcuB6Y8eTBQ1kUipkJswwpa7kmrUrO6w=; b=nYRGshMjfkkNR7+SDGYNPFPbBJ1IbKdJVenUEEXDXV+quaJO5XEh9JLqgw/JvtzX1d NzPFe85UYA5hPjAPj9GTqlz/10IhwFrU3bFaf9gSQJk9WCuTh+7PjEevm1Q/RCpEwkxT HFLvwiD0ms8cLwgt/JGxYonJkZFrWY/QCQuHqW5n33Fqboqd4SI74j1CpaDlWvgsK/7A Urj9RLJZrTWq3aQ1Soay/aks4cQKOXCI5dwnRxPv0HcB4WM43oV/DNDKUsHwzTK2rLgW XYGsyJvYkDC66dV2V9xuS9k5+y+E0EC9m9wLl0mLrsrvhvv9LSqvFy8yoq5IYBI9Jyv9 hsEA== X-Gm-Message-State: AODbwcANrr5Av1AxHJCdk87EkOkqreGZHH+QrgnslY6gcAkGCMAtAwFg fSh6JEljQ+jqqhC2 X-Received: by 10.237.41.97 with SMTP id s88mr12749144qtd.8.1496460835139; Fri, 02 Jun 2017 20:33:55 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id d27sm16685528qtc.50.2017.06.02.20.33.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 20:33:54 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jun 2017 00:33:33 -0300 Message-Id: <20170603033333.4436-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170603023148.GU4759@nb4> References: <20170603023148.GU4759@nb4> Subject: [FFmpeg-devel] [PATCH] avformat/aacdec: add a custom read_packet function X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Atempt to read and propagate only full ADTS frames and not other data, like id3v1 or APETags at the end of the file. Fixes ticket #6439. Signed-off-by: James Almer --- libavformat/aacdec.c | 42 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 5ab5197e33..aee1efe03c 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -23,10 +23,11 @@ #include "libavutil/intreadwrite.h" #include "avformat.h" #include "internal.h" -#include "rawdec.h" #include "id3v1.h" #include "apetag.h" +#define ADTS_HEADER_SIZE 7 + static int adts_aac_probe(AVProbeData *p) { int max_frames = 0, first_frames = 0; @@ -79,6 +80,7 @@ static int adts_aac_probe(AVProbeData *p) static int adts_aac_read_header(AVFormatContext *s) { AVStream *st; + uint16_t state; st = avformat_new_stream(s, NULL); if (!st) @@ -96,18 +98,54 @@ static int adts_aac_read_header(AVFormatContext *s) avio_seek(s->pb, cur, SEEK_SET); } + // skip data until the first ADTS frame is found + state = avio_r8(s->pb); + while (!avio_feof(s->pb)) { + state = (state << 8) | avio_r8(s->pb); + if ((state >> 4) != 0xFFF) + continue; + avio_seek(s->pb, -2, SEEK_CUR); + break; + } + // LCM of all possible ADTS sample rates avpriv_set_pts_info(st, 64, 1, 28224000); return 0; } +static int adts_aac_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int ret, fsize; + + ret = av_get_packet(s->pb, pkt, ADTS_HEADER_SIZE); + if (ret < 0) + return ret; + if (ret < ADTS_HEADER_SIZE) { + av_packet_unref(pkt); + return AVERROR(EIO); + } + + if ((AV_RB16(pkt->data) >> 4) != 0xfff) { + av_packet_unref(pkt); + return AVERROR_INVALIDDATA; + } + + fsize = (AV_RB32(pkt->data + 3) >> 13) & 0x1FFF; + if (fsize < ADTS_HEADER_SIZE) { + av_packet_unref(pkt); + return AVERROR_INVALIDDATA; + } + + return av_append_packet(s->pb, pkt, fsize - ADTS_HEADER_SIZE); +} + AVInputFormat ff_aac_demuxer = { .name = "aac", .long_name = NULL_IF_CONFIG_SMALL("raw ADTS AAC (Advanced Audio Coding)"), .read_probe = adts_aac_probe, .read_header = adts_aac_read_header, - .read_packet = ff_raw_read_partial_packet, + .read_packet = adts_aac_read_packet, .flags = AVFMT_GENERIC_INDEX, .extensions = "aac", .mime_type = "audio/aac,audio/aacp,audio/x-aac",