From patchwork Thu Sep 8 00:18:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 471 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.134 with SMTP id o128csp568173vsd; Wed, 7 Sep 2016 17:31:16 -0700 (PDT) X-Received: by 10.28.144.2 with SMTP id s2mr6017481wmd.22.1473294676047; Wed, 07 Sep 2016 17:31:16 -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 k10si38222023wjg.139.2016.09.07.17.31.10; Wed, 07 Sep 2016 17:31:16 -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 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 76CEB68A20D; Thu, 8 Sep 2016 03:30:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92C9968A1F5 for ; Thu, 8 Sep 2016 03:30:51 +0300 (EEST) Received: by mail-it0-f68.google.com with SMTP id c198so2997867ith.2 for ; Wed, 07 Sep 2016 17:31:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=ZAH3tKEWynB9heELdwc4XGFAtEaQuHihnjRMKYkZwu0=; b=JWzjgtML6KQRtjvyfqqXQsT6tNM7r4vUT4VcPYVC39QUn+6lMoJDE+59ytSc7TQycY YApeL5Q6kpfLMv+ZmOlgqD+s1OhCqEp+G9mzbRS7FAuuhg1teA240cm8BRVPfHZW4Qyb eq4aXIIIBjkWDsvaImBOpaNuctCh03gk6YdmQSTySrk5ijp8LMnT1jUU0botosIueTlj rUzjOY2XbkNguFMaUL0xnBMmpvdOutXiHeJBD55UM/BdvKgpnFL9WIBaIjZToBxXiGOB FzDMDEcTgwlg6nHJCfLx6Blb4tE2Y/dDaUnmDHGQcl6hUk38N5qnBesELjzhfjPzLUx6 dhAQ== 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:date:message-id:in-reply-to :references; bh=ZAH3tKEWynB9heELdwc4XGFAtEaQuHihnjRMKYkZwu0=; b=l4hp5WzsKOciBDpOzZyLefDIIc8lbfujjS7WpCvt0gzvOS6WCOTMFlP/eizPVUA3ZT XxvAL1QlqlNCH9XDapF5WzU9wdLZfQchQu502sZ8DDuf/37nie8ge7XAwPC237JQEUsS y5tMFd7+my0GMEBhNGnCr6DiYNZfcKU3d+dZ5kQKYjeji8zjXpztozO37jKHsWtCfvSa uag3oHZ2OY7V/jCdhI165iqlb4mNmQOlMvaljtE+4HIq/Tcn5XPhuOfE9pUuomfjaXEY juclbKAJygRnRt7UiMA5h20WQviBGzl3gWOpoIhOE2C0fPJ4XzfMNk8G+t028ChwpRTI z7Ug== X-Gm-Message-State: AE9vXwOwUfb5AVG4n1uNOcbKNTx2siRk0a5/nUqRdZkbKsAQJqJAUlSUWRleRM7Th/vA7A== X-Received: by 10.36.115.200 with SMTP id y191mr11010626itb.3.1473293887840; Wed, 07 Sep 2016 17:18:07 -0700 (PDT) Received: from Rodgers-MacBook-Pro.local.net (c-73-209-137-129.hsd1.il.comcast.net. [73.209.137.129]) by smtp.gmail.com with ESMTPSA id f9sm4775837itc.10.2016.09.07.17.18.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Sep 2016 17:18:07 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 7 Sep 2016 19:18:00 -0500 Message-Id: <20160908001800.91910-2-rodger.combs@gmail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160908001800.91910-1-rodger.combs@gmail.com> References: <20160908001800.91910-1-rodger.combs@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] tests: add -nostdin flag when calling ffmpeg 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 fixes a long-standing issue where running FATE in parallel could result in the terminal being left misconfigured, particularly if a test failed or was canceled wtih ^C. --- tests/fate/vpx.mak | 10 +++++----- tests/regression-funcs.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 3750561..46658ec 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -56,19 +56,19 @@ FATE_VP8-$(CONFIG_MATROSKA_DEMUXER) += fate-vp8-alpha fate-vp8-alpha: CMD = framecrc -i $(TARGET_SAMPLES)/vp8_alpha/vp8_video_with_alpha.webm -vcodec copy FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest -fate-webm-dash-manifest: CMD = run $(FFMPEG) -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" - +fate-webm-dash-manifest: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video2.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio2.webm -c copy -map 0 -map 1 -map 2 -map 3 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1 id=1,streams=2,3" - FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-video-streams -fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - +fate-webm-dash-manifest-unaligned-video-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-unaligned-audio-streams -fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - +fate-webm-dash-manifest-unaligned-audio-streams: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_audio3.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-representations -fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - +fate-webm-dash-manifest-representations: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video1.webm -f webm_dash_manifest -i $(TARGET_SAMPLES)/vp8/dash_video4.webm -c copy -map 0 -map 1 -f webm_dash_manifest -adaptation_sets "id=0,streams=0,1" - FATE_VP8-$(CONFIG_WEBM_DASH_MANIFEST_DEMUXER) += fate-webm-dash-manifest-live -fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -debug_mode 1 - +fate-webm-dash-manifest-live: CMD = run $(FFMPEG) -nostdin -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_video_360.hdr -f webm_dash_manifest -live 1 -i $(TARGET_SAMPLES)/vp8/dash_live_audio_171.hdr -c copy -map 0 -map 1 -f webm_dash_manifest -live 1 -adaptation_sets "id=0,streams=0 id=1,streams=1" -chunk_start_index 1 -chunk_duration_ms 5000 -time_shift_buffer_depth 7200 -minimum_update_period 60 -debug_mode 1 - FATE_VP8-$(call DEMDEC, MATROSKA, VP8) += fate-vp8-2451 fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an diff --git a/tests/regression-funcs.sh b/tests/regression-funcs.sh index 19bceca..0c7d34b 100755 --- a/tests/regression-funcs.sh +++ b/tests/regression-funcs.sh @@ -43,7 +43,7 @@ echov(){ . $(dirname $0)/md5.sh -AVCONV_OPTS="-nostats -y -cpuflags $cpuflags" +AVCONV_OPTS="-nostdin -nostats -y -cpuflags $cpuflags" COMMON_OPTS="-flags +bitexact -idct simple -sws_flags +accurate_rnd+bitexact -fflags +bitexact" DEC_OPTS="$COMMON_OPTS -threads $threads" ENC_OPTS="$COMMON_OPTS -threads $threads -dct fastint"