From patchwork Thu Oct 27 23:45:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Cadhalpun X-Patchwork-Id: 1209 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.133 with SMTP id o127csp829933vsd; Thu, 27 Oct 2016 16:45:44 -0700 (PDT) X-Received: by 10.194.14.105 with SMTP id o9mr8579246wjc.172.1477611944904; Thu, 27 Oct 2016 16:45:44 -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 188si6455726wmz.59.2016.10.27.16.45.43; Thu, 27 Oct 2016 16:45:44 -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=@googlemail.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=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 590FB689F55; Fri, 28 Oct 2016 02:45:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 51C60689C26 for ; Fri, 28 Oct 2016 02:45:31 +0300 (EEST) Received: by mail-wm0-f67.google.com with SMTP id y138so4949335wme.1 for ; Thu, 27 Oct 2016 16:45:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=vkhpvc8ygWeLpjWATn3bnN+q7hM0AcOHMODIaqwGPOA=; b=XN41+FbAovKI9auTzhFOvSVB1HUo9KiUfykdhrHmpDrDy8hO+Ubuw5QLxg2TmQEwpV qeW3QZsIS/7w4i/PaD9lYr8V4h3Qucs/DHD6s68DM8Cfl62ErV/+BjmfHVqqmBshiL28 zaiJFLDTswiIiAmV8gvCZBy3rZX+ReRBfwnTozp0NwHvGYd0onkbUuyZB+fxh6mQm3ot 1/4yaYkcwZfmlGqk7nFkwnXWfo42FWUz3b5EPqyeZHXs3U0TuzK6uNnc3Pd+piuLiOE4 bqMYdFP9JI0+ExExuhPsJLXBq3mMB52OiRkr5O9H86k4KhrA9MX6nJD77Yv8zNf8r9gK 7w2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=vkhpvc8ygWeLpjWATn3bnN+q7hM0AcOHMODIaqwGPOA=; b=dkyWzrvnqW2A+Suq3D8k4rmMQWIKXEj5K6jM8m6Q65D+0IS4hCnOOMIMjGxLkjTagZ WVeI1kFzlldhU/izEFKHEg6qoyH7mKq+y1KyO123quEEQjyEvo2EVcM8R+CiK94T+FHf p7DSTo3t1//M2BfLLYrsPhzZaHvdqvSmGvjj5/kv/ATaYVn85Tnb65WuMsIoC9/vT87A RefbB7ItyG1D+bkLXWeEK/lncW4uUU3vezO/z3Tp5AAMlLQHeFy6fHCBjllOg7G42KfH FYLnLXQmuq+VQD46oHH+DBeSXped/4FSrELO0osoLjGENI7J9NJMYRRdu2L1IzM6m9lC QjLw== X-Gm-Message-State: ABUngvfZyXsu/cPJ3+YBInwei4+W6ujkW+rZD+//tATIoWGZA3cqqNY3832jDHDTpl2PGw== X-Received: by 10.28.24.139 with SMTP id 133mr767822wmy.103.1477611933859; Thu, 27 Oct 2016 16:45:33 -0700 (PDT) Received: from [192.168.2.21] (p5B095458.dip0.t-ipconnect.de. [91.9.84.88]) by smtp.googlemail.com with ESMTPSA id 63sm6776760wmv.1.2016.10.27.16.45.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Oct 2016 16:45:33 -0700 (PDT) From: Andreas Cadhalpun X-Google-Original-From: Andreas Cadhalpun To: FFmpeg development discussions and patches Message-ID: <75921006-cb5c-f3de-968e-8330a6818988@googlemail.com> Date: Fri, 28 Oct 2016 01:45:31 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate: add apng encoding/muxing test 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Also test the fallback to png creation for a single frame. Signed-off-by: Andreas Cadhalpun --- Obviously, the patch fixing this has to be applied first. --- tests/fate/avformat.mak | 1 + tests/lavf-regression.sh | 9 +++++++++ tests/ref/lavf/apng | 6 ++++++ 3 files changed, 16 insertions(+) create mode 100644 tests/ref/lavf/apng diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index 3760e41..bbb1f98 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -1,5 +1,6 @@ FATE_LAVF-$(call ENCDEC, PCM_S16BE, AIFF) += aiff FATE_LAVF-$(call ENCDEC, PCM_ALAW, PCM_ALAW) += alaw +FATE_LAVF-$(call ENCDEC, APNG, APNG) += apng FATE_LAVF-$(call ENCDEC2, MSMPEG4V3, MP2, ASF) += asf FATE_LAVF-$(call ENCDEC, PCM_S16BE_PLANAR, AST) += ast FATE_LAVF-$(call ENCDEC, PCM_S16BE, AU) += au diff --git a/tests/lavf-regression.sh b/tests/lavf-regression.sh index 8d96178..9050027 100755 --- a/tests/lavf-regression.sh +++ b/tests/lavf-regression.sh @@ -212,6 +212,15 @@ do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -q do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 fi +if [ -n "$do_apng" ] ; then +file=${outfile}lavf.apng +do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 -pix_fmt rgb24 +do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 +file=${outfile}lavf.png +do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 -pix_fmt rgb24 -frames:v 1 +do_avconv_crc $file $DEC_OPTS -i $target_path/$file -pix_fmt rgb24 +fi + if [ -n "$do_yuv4mpeg" ] ; then file=${outfile}lavf.y4m do_avconv $file $DEC_OPTS -f image2 -vcodec pgmyuv -i $raw_src $ENC_OPTS -t 1 -qscale 10 diff --git a/tests/ref/lavf/apng b/tests/ref/lavf/apng new file mode 100644 index 0000000..4d35408 --- /dev/null +++ b/tests/ref/lavf/apng @@ -0,0 +1,6 @@ +a4c46fad7716ad094eb3c78b74ca0244 *./tests/data/lavf/lavf.apng +6209864 ./tests/data/lavf/lavf.apng +./tests/data/lavf/lavf.apng CRC=0x87b3c15f +c5900fdd1b2fc30b985793f5226fd0c4 *./tests/data/lavf/lavf.png +248854 ./tests/data/lavf/lavf.png +./tests/data/lavf/lavf.png CRC=0xd8c7b7a1