From patchwork Fri Jun 2 23:41:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3807 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp419419vsk; Fri, 2 Jun 2017 16:42:33 -0700 (PDT) X-Received: by 10.28.32.8 with SMTP id g8mr889505wmg.117.1496446953542; Fri, 02 Jun 2017 16:42:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496446953; cv=none; d=google.com; s=arc-20160816; b=GbrrFtnkErCgC2XRhNOzM8UuXEZDomLStnAkjJtgrtdnzJLekDo9UgDSXYwfFMtUDq lbNtWSR3EeknaANDbqQPjlvtJdrx8EAOhdmBABAfv8qs1R/vgAAKY4x05e2fAEvnHepc 9HXtKGeJu2SZppjjODiz7+d36/rFm3sKhqBQ+ZfGSg6uQYTBjN0/ID7+E67xlOvXF3T3 FZFjCOGCY0mxVKFbX7DLE6fQMTr/PAi78JeYkJgCi3NpRTkov6vHKEwJ/TKedPsdtK8f V9NjVrFbniNZTpOOmkfWhpCKm0LtbBeWt5/5a5aUO4cn1pjFrztrM4MBJX9AjVCDFAkp Fm/w== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=bgX9MwqSvbSb9vOZbjGpso91PQ6IW8cjw3rts6DH0l4=; b=ZUJ49F6Ri5MZxZztpMO2/DWeP/q11o6c7EfIGfJHCaX1T+yU6MDFgEZ8sFuXCYgkPK CHq5iXiNgNYcdd3n8gCcwNTfvRYPfbs0IIj8JBTNsBq01HmOifISbzWThF6IQloCgnGd lZKZCS30vTO64dhMoe1ObObrI/xqd5Hez2VAtkbGkI0lqi8PovYV8gYv+SpHZeZXD/5r OLCqZzeJX+kDdYs0xE6DZvtP/Z5+dKn8Ij98bxhQsVt0AoPX03Fpf6b+SXW4B6ELWt0z rdM2sZz4vYP3q07K8TFLL75r8gY/g842ye6nY7/5O6ZU/TnhCdBq9dVyaiGBNn/pK2Uw 5Tfg== 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 v49si23686162wrb.306.2017.06.02.16.42.32; Fri, 02 Jun 2017 16:42: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=@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 AE954689BDE; Sat, 3 Jun 2017 02:42:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7790F689A83 for ; Sat, 3 Jun 2017 02:42:17 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id c206so11407041qkb.0 for ; Fri, 02 Jun 2017 16:42:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=dX/KrIrHEUq0OPv06YiPHRaWywtOCqrjNpPwyjHWVk0=; b=sQ+tdkxSEYKPJnQ05k8sRQ7p29xtiL1AtE7+bLMitVQsyoiSwEMGIFhnz1IQc2Xtdm 4pHBlBxPkpEQUC/PKqDmyEH0wCfPQrqEBeat8LFleq/EF0f9xtN+QeLF3OVE+djpdz6E JAa7UK8i88bWm5NKnPTmygULUYzXQcWeAbIh2D3lyp91cH7tcQWEyTZCqZh9KT/buNpa f3U2PoM7kEY0/dZ4ki+fP0F8NjrnRPCnddpTl5fuiBStwyKDWLZxMKItYCgzJbN7lOCO nd9qUesExm+M5iaSDKj8/6yxBSLiML2+lzUI7HeFEatTkNwdHhkiN1gMWttXxmRwNvEj cUyg== 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; bh=dX/KrIrHEUq0OPv06YiPHRaWywtOCqrjNpPwyjHWVk0=; b=hczHrq/tW07tW/fRi4oQw7z+GK6fnFmYcK/wov9xf5NMH0aUiNxTUtBBc8mZokWFkK Jl8/6fP8FAClCNzzfopQDNXhq6VVJn/Y+Ji4hZhTljDRhInLYd4JYS9sIaM5+B7GQQB8 tSUDt5iDPmX4/KM4dH+qzd4YudseKFhiJuUzuBunTyDhLRvbps1cEPvHWaeabay+U1To T1PsEhGXXRNkB5gtHBLXxrVV/+FDEpaeB134uqbbn87h8fKwf1aMwWbD3k+l93iBNWSp fYMakNn6Ln+O6TARfZcluTc/QlIILd92RExyfXjWkMADkLoXTnC382+OuxMsvAXcYjVf kg2g== X-Gm-Message-State: AKS2vOxHjS8KdrIaCkUKOQgeVNrR2/Vc2MGVbJEMueyIy6bVAoyQT7Bn Ptk7m9schmd1KAoM X-Received: by 10.55.3.2 with SMTP id 2mr10751958qkd.65.1496446941549; Fri, 02 Jun 2017 16:42:21 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id u6sm14957441qkd.68.2017.06.02.16.42.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 16:42:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 2 Jun 2017 20:41:58 -0300 Message-Id: <20170602234158.10108-1-jamrial@gmail.com> X-Mailer: git-send-email 2.12.1 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 | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 5ab5197e33..f2bca996a4 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; @@ -102,12 +103,38 @@ static int adts_aac_read_header(AVFormatContext *s) 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",