From patchwork Fri Jun 16 23:24:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marton Balint X-Patchwork-Id: 4005 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp1510134vsw; Fri, 16 Jun 2017 16:25:11 -0700 (PDT) X-Received: by 10.223.132.130 with SMTP id 2mr9650272wrg.157.1497655511792; Fri, 16 Jun 2017 16:25:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497655511; cv=none; d=google.com; s=arc-20160816; b=K9trgD39SbZc3OclrM62oDGlHstaQ3SA3Gq4/R50pRPBGKdt5BjnRo1NZw/vm073SL mFdHdJ7DvVIm0B6V11pCroZviLDn5VzwgBI9TZgQw2qtDaCPtoUVVMMtHxnusOywrlk0 cbt3EILkvywVKiPkdtwcKF3wrcOunWEqXPaON2l7MigQ7sn+Xna5wbvwPAGi0JbqTVYB s415VJo+jdf7fX7AXN28GVzoxTN0Gq4pfo2sCAyhAnAFqYUheCtejr71hDvUlmUQI4NW ttDOWt6gKo7Eyd6iOAoOHT1htdVuCNcrZVL9vCwi75M1eygwdVVDA7VaBrs7C+c/z8oN SvEQ== 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:cc: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:delivered-to:arc-authentication-results; bh=JbyKT2y+N7C8oIKrFRIMXceqTDqWMblS8DnugESU1/Q=; b=dNUeqYgWwZwR+jBaarLn3HEoUDSif/8V1AjWYtrRQbQ6p+TGybymW7XOo81A4HDeAg jbY6pJODpDhmbDfsuhhYo8qVZXN7OFPBCJ3eEONJUegfxikgI8yYQjSqnVgR9KZgupmS l8vo8/ueip4xr3qDjNYLvc+qsC7pUG+WjIBfDe7nbZDkS1jByQJES7VOZbDN04aiNur+ y7rK2ctYQxvA6fqIl0x74ndHmHsk2LveNYLs8CQB4QSlmTYx6eZqS8a4SYGS2FH+DUnI gXj1K66+hcbhY3nf8UDZ36jAxDvE75nvPsr9VVqzY/zQ5ky9MydfnlX3c9V2fF6mi+BM axHQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i9si202382wmb.164.2017.06.16.16.25.11; Fri, 16 Jun 2017 16:25:11 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3A81E68A417; Sat, 17 Jun 2017 02:24:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C165468A3B8 for ; Sat, 17 Jun 2017 02:24:51 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 58B67102E28; Sat, 17 Jun 2017 01:24:55 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id S3Z0mzdwm9VZ; Sat, 17 Jun 2017 01:24:53 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 9CDDB10318C; Sat, 17 Jun 2017 01:24:53 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Sat, 17 Jun 2017 01:24:42 +0200 Message-Id: <20170616232442.20537-2-cus@passwd.hu> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170616232442.20537-1-cus@passwd.hu> References: <20170616232442.20537-1-cus@passwd.hu> Subject: [FFmpeg-devel] [PATCH 2/2] fate: use do_md5sum instead of the md5 protocol for md5 fate tests 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 Cc: Marton Balint MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The md5 protocol has no seek support, but some tests use seeks. This changes the fate tests to actually create the output files and calculate the md5 on the written files, which also makes the tests independent of the size of the output buffers and output buffering in general. Signed-off-by: Marton Balint --- tests/fate-run.sh | 5 ++++- tests/fate/filter-audio.mak | 4 ++-- tests/fate/matroska.mak | 2 +- tests/fate/wavpack.mak | 4 ++-- tests/ref/fate/binsub-mksenc | 2 +- tests/ref/fate/mapchan-6ch-extract-2-downmix-mono | 2 +- tests/ref/fate/mapchan-silent-mono | 2 +- tests/ref/fate/mpeg4-bsf-unpack-bframes | 2 +- tests/ref/fate/time_base | 2 +- tests/ref/fate/v410enc | 2 +- 10 files changed, 15 insertions(+), 12 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 931150b5a6..20dae9ea13 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -143,7 +143,10 @@ crc(){ } md5(){ - ffmpeg "$@" md5: + encfile="${outdir}/${test}.out" + cleanfiles=$encfile + ffmpeg "$@" $encfile + do_md5sum $encfile | awk '{print $1}' } pcm(){ diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 5d15b31e0b..8030641ed6 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -215,7 +215,7 @@ fate-filter-channelmap-one-int: SRC = $(TARGET_PATH)/tests/data/asynth-44100-6.w fate-filter-channelmap-one-int: tests/data/asynth-44100-6.wav fate-filter-channelmap-one-int: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_int -f wav -fflags +bitexact fate-filter-channelmap-one-int: CMP = oneline -fate-filter-channelmap-one-int: REF = 428b8f9fac6d57147069b97335019ef5 +fate-filter-channelmap-one-int: REF = 8cfe553d65ed4696756d8c1b824fcdd3 FATE_FILTER_CHANNELMAP += fate-filter-channelmap-one-str fate-filter-channelmap-one-str: tests/data/filtergraphs/channelmap_one_str @@ -223,7 +223,7 @@ fate-filter-channelmap-one-str: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.w fate-filter-channelmap-one-str: tests/data/asynth-44100-2.wav fate-filter-channelmap-one-str: CMD = md5 -i $(SRC) -filter_complex_script $(TARGET_PATH)/tests/data/filtergraphs/channelmap_one_str -f wav -fflags +bitexact fate-filter-channelmap-one-str: CMP = oneline -fate-filter-channelmap-one-str: REF = e788890db6a11c2fb29d7c4229072d49 +fate-filter-channelmap-one-str: REF = 0ea3052e482c95d5d3bd9da6dac1b5fa FATE_AFILTER-$(call FILTERDEMDECENCMUX, CHANNELMAP, WAV, PCM_S16LE, PCM_S16LE, WAV) += $(FATE_FILTER_CHANNELMAP) diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 48b710c26c..9e233cf510 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -4,7 +4,7 @@ FATE_MATROSKA-$(call DEMMUX, MATROSKA, MATROSKA) += fate-matroska-remux fate-matroska-remux: CMD = md5 -i $(TARGET_SAMPLES)/vp9-test-vectors/vp90-2-2pass-akiyo.webm -color_trc 4 -c:v copy -fflags +bitexact -strict -2 -f matroska fate-matroska-remux: CMP = oneline -fate-matroska-remux: REF = 1ed49a4f2b6790357fac268938357353 +fate-matroska-remux: REF = 53be067cfaee3626d1c94b4a0fd5ac10 FATE_MATROSKA_FFPROBE-$(call ALLYES, MATROSKA_DEMUXER) += fate-matroska-spherical-mono fate-matroska-spherical-mono: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream_side_data_list -select_streams v -v 0 $(TARGET_SAMPLES)/mkv/spherical.mkv diff --git a/tests/fate/wavpack.mak b/tests/fate/wavpack.mak index 32ae3f6100..1cb414447c 100644 --- a/tests/fate/wavpack.mak +++ b/tests/fate/wavpack.mak @@ -91,12 +91,12 @@ fate-wavpack-matroskamode: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/special/matros FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-mono fate-wavpack-matroska_mux-mono: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/mono_16bit_int.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-mono: CMP = oneline -fate-wavpack-matroska_mux-mono: REF = 11773e2a518edc788475f3880d849230 +fate-wavpack-matroska_mux-mono: REF = 31c0b4e71b532103bbfd2e284795cac1 FATE_WAVPACK-$(call DEMMUX, WV, MATROSKA) += fate-wavpack-matroska_mux-61 fate-wavpack-matroska_mux-61: CMD = md5 -i $(TARGET_SAMPLES)/wavpack/num_channels/eva_2.22_6.1_16bit-partial.wv -c copy -fflags +bitexact -f matroska fate-wavpack-matroska_mux-61: CMP = oneline -fate-wavpack-matroska_mux-61: REF = 9641abdf596c10c2e21bd9b026d4bade +fate-wavpack-matroska_mux-61: REF = a0e5ad857d57a50869c21f1621e55674 FATE_SAMPLES_AVCONV += $(FATE_WAVPACK-yes) fate-wavpack: $(FATE_WAVPACK-yes) diff --git a/tests/ref/fate/binsub-mksenc b/tests/ref/fate/binsub-mksenc index f247d9d22d..a0a58b880d 100644 --- a/tests/ref/fate/binsub-mksenc +++ b/tests/ref/fate/binsub-mksenc @@ -1 +1 @@ -f80f42e646fce972e73aa6d99dcfa470 +cdc96049a5aeaccec0126f19600d88aa diff --git a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono index a47c85cd6b..9ac4dba261 100644 --- a/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono +++ b/tests/ref/fate/mapchan-6ch-extract-2-downmix-mono @@ -1 +1 @@ -2727e5418eb5b8f89954f140d9f3a19a +6ededcfc9f0b26d200a7295205e87663 diff --git a/tests/ref/fate/mapchan-silent-mono b/tests/ref/fate/mapchan-silent-mono index f720c318f4..93f519e0ee 100644 --- a/tests/ref/fate/mapchan-silent-mono +++ b/tests/ref/fate/mapchan-silent-mono @@ -1 +1 @@ -16dc73c037897dff9b1d3e3d8561dc73 +b6b034fffa8639e64d79be84f16d9ebe diff --git a/tests/ref/fate/mpeg4-bsf-unpack-bframes b/tests/ref/fate/mpeg4-bsf-unpack-bframes index 162d436625..703ae3a8e8 100644 --- a/tests/ref/fate/mpeg4-bsf-unpack-bframes +++ b/tests/ref/fate/mpeg4-bsf-unpack-bframes @@ -1 +1 @@ -c9535e459c2ee4ead6d84b93bc7e9f46 +a0c4ba21ab9d68966b8fce7cc848e2c6 diff --git a/tests/ref/fate/time_base b/tests/ref/fate/time_base index eec4b21aa5..7923556b35 100644 --- a/tests/ref/fate/time_base +++ b/tests/ref/fate/time_base @@ -1 +1 @@ -ef9896ce045941607782e895aea930b6 +d26a35b141551b36c5b8bd716451cfcb diff --git a/tests/ref/fate/v410enc b/tests/ref/fate/v410enc index 139da7b875..9fddf5a35c 100644 --- a/tests/ref/fate/v410enc +++ b/tests/ref/fate/v410enc @@ -1 +1 @@ -5fd2d9a7b3311f5c19dbdd647bb9eae6 +465bcc7477104a8295f47b35f1b987df