From patchwork Sun Jun 4 16:08:39 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 3835 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.10.2 with SMTP id 2csp1008745vsk; Sun, 4 Jun 2017 09:11:13 -0700 (PDT) X-Received: by 10.28.143.135 with SMTP id r129mr5388885wmd.29.1496592673354; Sun, 04 Jun 2017 09:11:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496592673; cv=none; d=google.com; s=arc-20160816; b=NJaSRSMS0B9PZAwrUS4F+s/VQNL3O7tudaOTO22JuhPAY5VFdDHuW8Dozf0JY5wfby 9oPcB7Asc71YlzwU/CcRnag7puVKZpCEcPcI4daVZRX/sVX2zHssesSg9Ds/TCzBxTPn eOowQVHT3H18muffibTHyMnQRP5VyLnxa5IcZU0ksqjKvw1F8azHbOU1FiGFxq4dbqvn PEY/GRttMMVmEnzg7Z4Quwv5Q7kmM5/wMRc1uZrzFG34HGay+hxGDaKEvwl32F/70E3u aH7349+iuFkoVYPpPiraY/pfegxRh61Y5Qwogs5MILk60Gl2lHyfDeb2N4ZfN5Au1mrC y6Vw== 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=QExguZvbWnG4tT8cQw8K3tRsBQGs8EflKhKamL0MLqM=; b=E6Smi9RIQKqCpAAZs6gjjhftKdnhiusHrxt4rTlIQIbs0SvXfralj6WcVqy0RBptlr wkb3ah/HjNNA4DXnStBNaeTI9YR6dRagrVqQf+7BOKmUtijB1x7B4CirlU58yDt23ZqF pODfs1FC8BQpVBSGIarrABNEZSvvLtAJAotnD9n/1ddyTGyDW1raKYZxEEG2Rodvc252 hI95lfo9h29fCC1srULeHhX3JSbyglFf/6lM+IoliI2/whwgsiLIlC2dlYr5NYOQDgXC FwXz20Ztgz2Hfew3D2sNJihttWhOsoTmxalQVmRYLVQfrNB0fEO+Vv3Q8c1YBjFQ1Daw WwJQ== 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 13si13721777wrc.166.2017.06.04.09.11.12; Sun, 04 Jun 2017 09:11:13 -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 51443689DA3; Sun, 4 Jun 2017 19:11:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8AE03689D66 for ; Sun, 4 Jun 2017 19:10:56 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id x58so3358050qtc.2 for ; Sun, 04 Jun 2017 09:11:03 -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=4/4bQsG3VD4MWDt/+K2+nKKjqnlCFubvGiyWryVTXIU=; b=OJCAUy60o7UIhnIkDRWAf9I2d0ojimn621wcX3Lm3rIt0Y+Z5QEVJtexiFf5h1h4TG xR5Rz8ZTLAPPT10yt/uwvLRSykh/strlazm/AmCpYJ8iDFfoHVbtKTmjAUvnZoiqHAqe BBAp8ADd5512JBiircX2LFOG+ON2Czcz1OXiaTHvxxKHKAimpWCPjIFDj7/srGYUaBww t2Z076C3SC4ccOZ6hlzhOy24dAg/+O6G19WPbMgqpEpUkbrqj3R/9uB92CiqqIQbLkSs f2bIYSwgdmTNihLJYN7Ty1MXciYuxYs9NP9u7jErIMWBcepg0FXRhvoMM6JbfX8J5Hg9 UwJw== 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=4/4bQsG3VD4MWDt/+K2+nKKjqnlCFubvGiyWryVTXIU=; b=aTxsQR90Lh9arqYA+6Wp7gy5W8uos7RdBKtl2cWMtOEwJnuf3+f+ycHmcfonGmHADP AhQjsiYF5y5sOBmpGewoEXY08h1WE+SGjtxdaVSArBPtj4yjb0zQe4yGdQvCy4ZLemkR tTrvrht9l0G6hBj3nC75PJxRvexIq+r2MBwHz870mgcpVYQ7oyAWHmjgQBA+oLYdodgm KFFkSNuyv4Rv3kg+EeLxfSiw9hsaB3llOB0gybru31RPuxVPTseAcLVskwTvLkUue6G9 ZyGG1GA1UupwcR7x80+M0vjJ5xdpSdu3rGw61qAewO89+lrxFcyFBLA4P65Sialpv/O2 hQUA== X-Gm-Message-State: AODbwcDg/sqRsX7yQYyQKPP2L1dQvDLlcOgf5sR4QpKwN9j2gJFk9t41 +7GcqRp9soazBlEW X-Received: by 10.237.61.145 with SMTP id i17mr18202445qtf.241.1496592661647; Sun, 04 Jun 2017 09:11:01 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id 27sm20013424qtz.17.2017.06.04.09.11.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 04 Jun 2017 09:11:01 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 4 Jun 2017 13:08:39 -0300 Message-Id: <20170604160839.5748-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.0 Subject: [FFmpeg-devel] [PATCH] fate: add fate-adts-id3v1-demux 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" This test the demuxer discarding non ADTS frames at the beginning and end of the input. As a side effect, this commit also enables fate-adts-demux, which was accidentally disabled in 324f0fbff1245f9e9e1dda29ecb03138a2de287d. Signed-off-by: James Almer --- Sample is in http://0x0.st/6gI.aac Should be renamed to id3v1.aac and placed in the aac folder. tests/fate/demux.mak | 3 ++- tests/ref/fate/adts-id3v1-demux | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 tests/ref/fate/adts-id3v1-demux diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index cf69e2fe2c..f3e054f90b 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -1,8 +1,9 @@ FATE_SAMPLES_DEMUX-$(call DEMDEC, AVI, FRAPS) += fate-avio-direct fate-avio-direct: CMD = framecrc -avioflags direct -i $(TARGET_SAMPLES)/fraps/fraps-v5-bouncing-balls-partial.avi -avioflags direct -FATE_SAMPLES_DEMUX-$(DEMDEC, AAC, AAC) += fate-adts-demux +FATE_SAMPLES_DEMUX-$(call DEMDEC, AAC, AAC) += fate-adts-demux fate-adts-id3v1-demux fate-adts-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/ct_faac-adts.aac -acodec copy +fate-adts-id3v1-demux: CMD = crc -i $(TARGET_SAMPLES)/aac/id3v1.aac -acodec copy FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -acodec copy diff --git a/tests/ref/fate/adts-id3v1-demux b/tests/ref/fate/adts-id3v1-demux new file mode 100644 index 0000000000..f201d80bcd --- /dev/null +++ b/tests/ref/fate/adts-id3v1-demux @@ -0,0 +1 @@ +CRC=0x302a4a48