From patchwork Wed Mar 14 06:24:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 7981 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp1635908jad; Tue, 13 Mar 2018 23:25:10 -0700 (PDT) X-Google-Smtp-Source: AG47ELtP/ym3Ks0vEuWly0yTTKJQuAss3EgljdfM9doyUZmatdaUGr0/BLIK7mj3V2QNLDV9tUf7 X-Received: by 10.223.134.210 with SMTP id 18mr587987wry.232.1521008710859; Tue, 13 Mar 2018 23:25:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521008710; cv=none; d=google.com; s=arc-20160816; b=FSJZi5xAmsRL5lOW4KhH6UNfDLe9/jrMF+sxme/yEYWETRZJfIrFVEqY8XFnnXzvYg 6w5ISY852eaM7Oevj80TF/eFpk80BSottf4ZJMLKVHsWSgJfKqVR3Ca90BjdV9FAFhDf uCObQs1o7k/08WdcTTh58UplfHt4XiD/1g5JbdtU3YuppWEiV+f6AXa0uMYvpbVKpGQY 40E1HddVx+61NoSrPu2QTh11JVo6aY8Y9PQuOWF30MIQNGUqqy805EaU9Rs2u1onNWZt AguNiU07iMbySv9vshT3shjHro9eP+bjUpfsNmtrUue7Xjk5fDehablcaryDAZ+EgFib PAoQ== 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=tJiWPRc2nvFRNNafIF8omGkjQTDfLT7OsLylgzNLjBQ=; b=OBaY8pXto3SL2NOmgw68+Qgms5D3+zHFn7NU6rkGJKKUzYgG51yC5bEa4ODVDkb+3M AHvvPYqmaDbz+FxRjwz80QkQqRT4qRo9lHoYeWLAYjfhuOzy/9zh0dq81Up/r7ytgn8N h4nspgb+lSQRZts3O7GRwFerewA0gjIa6YAnoPSbMgd6ZIonzKPs1rns2Fw52vVTTc5h RbJaTaZFryLRTf8qTsn9zGNYrE9MkQgb/g4AozaDfQqrgJmm9HJQnTO5AC8F2dvaMUGC bjjTbr9Lg3cxQMBVK2pAyFnKoMnlAvU6Uqf7BRKTV5MCTgqvuG3z6G/8JSJaqi6tmoZK CNjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hsldr96L; 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=QUARANTINE 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 l17si1351321wrg.110.2018.03.13.23.25.10; Tue, 13 Mar 2018 23:25:10 -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 header.s=20161025 header.b=hsldr96L; 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=QUARANTINE 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 11576689C46; Wed, 14 Mar 2018 08:24:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f171.google.com (mail-io0-f171.google.com [209.85.223.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 925D7689983 for ; Wed, 14 Mar 2018 08:24:40 +0200 (EET) Received: by mail-io0-f171.google.com with SMTP id e7so3032456ioj.1 for ; Tue, 13 Mar 2018 23:24:52 -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=aSIGb5baH+uQQsU8Mb0lfXfc3lKXrWWenlF0II+NDFQ=; b=hsldr96LXjFwOdHTBHkMaTClhoebzwkq9wVz1eJM8vdxHPynRrxYOPhwvTnPlo6QgQ +WUB8A7WmQAsVxyg7jo/4j+oQn44xj7txS7qGcRcWelcEl3qYBggX/pPV2P0U/0G628n v3v/cfQb88QyBs1bEiJBFRDYYnhf4RJWxCvKuJUvJaCPCC9j+ORtk/m9EOAcX7Hm555G 61OzF8STDisbvTBatr4bMP2BY3+0QKrzsFLGgR85Ad11U5iVl+VObfN3Zvoee1GcTGoZ UwW3vz2tl0wvBFHA7LkdTK0M5Uu0kNM/vo49si8/inYRBQR39W6BO5zBxiADhdVK/VSw qXzA== 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=aSIGb5baH+uQQsU8Mb0lfXfc3lKXrWWenlF0II+NDFQ=; b=ts9u+1gxdhQ8rHQClgLDK1mn1uBIHY375OihRFVrvYknPgkpdzTKmof/jHN9Qyonod UXosCg2CGN6OcBAnIjGevyxbZInGLxguPCaWQ+EwYvwJq4+WmobS3Uhuah40x8tdcl0q jiCGohK3+JTs12wEFmXLA2QkDcFPqgx8EUxW3U8/sBdMAAsXAP7QUWJlqP/nKkrYiseP w5kyhOUgXGk1ZTF6nu5FzMU33B7M45voxiqqlUd3On9bY5DzaMTm6nik/K1AN2Ln64nJ jDsC6elFW4U15bJVC66BNk/Agp9ubFIh7+6Y2QmXDzl707B/aSTfrJgvbKYoVgzBQaPF 0enw== X-Gm-Message-State: AElRT7H1cojIYRlrJoZ9YjYJWhJt9twQlEENwFkSs9KQUl4fzNuBc1v+ 5ADa5X5JSUWA49l6AQE734fI2xZ3 X-Received: by 10.107.146.215 with SMTP id u206mr3411830iod.96.1521008690082; Tue, 13 Mar 2018 23:24:50 -0700 (PDT) Received: from Rodgers-MBP.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id v134-v6sm394596ith.27.2018.03.13.23.24.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Mar 2018 23:24:48 -0700 (PDT) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Wed, 14 Mar 2018 01:24:36 -0500 Message-Id: <20180314062445.89909-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH 01/10] FATE: add -nostdin to remaining ffmpeg CLI invocations 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 prevents ffmpeg from modifying terminal parameters, which resulted in broken terminals after tests nondeterministically when multiple processes attempted to save and restore the state at the same time. --- tests/fate/avformat.mak | 6 +++--- tests/fate/filter-audio.mak | 4 ++-- tests/fate/filter-video.mak | 4 ++-- tests/fate/fits.mak | 4 ++-- tests/fate/flvenc.mak | 2 +- tests/fate/hevc.mak | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index a12f9ccc71..346a4b4509 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -90,14 +90,14 @@ tests/data/mp4-to-ts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -i $(TARGET_SAMPLES)/h264/interlaced_crop.mp4 \ -f ssegment -segment_time 1 -map 0 -flags +bitexact -codec copy \ - -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/mp4-to-ts-%03d.ts 2>/dev/null + -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/mp4-to-ts-%03d.ts -nostdin 2>/dev/null tests/data/adts-to-mkv.m3u8: TAG = GEN tests/data/adts-to-mkv.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \ -f segment -segment_time 1 -map 0 -flags +bitexact -codec copy -segment_format_options live=1 \ - -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/adts-to-mkv-%03d.mkv 2>/dev/null + -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/adts-to-mkv-%03d.mkv -nostdin 2>/dev/null tests/data/adts-to-mkv-header.mkv: TAG = GEN tests/data/adts-to-mkv-header.mkv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data @@ -105,7 +105,7 @@ tests/data/adts-to-mkv-header.mkv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \ -f segment -segment_time 1 -map 0 -flags +bitexact -codec copy -segment_format_options live=1 \ -segment_header_filename $(TARGET_PATH)/tests/data/adts-to-mkv-header.mkv \ - -y $(TARGET_PATH)/tests/data/adts-to-mkv-header-%03d.mkv 2>/dev/null + -y $(TARGET_PATH)/tests/data/adts-to-mkv-header-%03d.mkv -nostdin 2>/dev/null tests/data/adts-to-mkv-header-%.mkv: tests/data/adts-to-mkv-header.mkv ; diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 2a3ba1992f..5c5a762f09 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -181,7 +181,7 @@ tests/data/hls-list.m3u8: TAG = GEN tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \ - -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/hls-out-%03d.ts 2>/dev/null + -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/hls-out-%03d.ts -nostdin 2>/dev/null FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls fate-filter-hls: tests/data/hls-list.m3u8 @@ -195,7 +195,7 @@ tests/data/hls-list-append.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(TARGET_EXEC) $(TARGET_PATH)/$< \ -f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=20" -f hls -hls_time 10 -map 0 -flags +bitexact \ -hls_flags append_list -codec:a mp2fixed -hls_segment_filename $(TARGET_PATH)/tests/data/hls-append-out-%03d.ts \ - $(TARGET_PATH)/tests/data/hls-list-append.m3u8 2>/dev/null + $(TARGET_PATH)/tests/data/hls-list-append.m3u8 -nostdin 2>/dev/null FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls-append fate-filter-hls-append: tests/data/hls-list-append.m3u8 diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 07572143a8..5814bc8551 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -611,7 +611,7 @@ fate-filter-tile: CMD = video_filter "tile=3x3:nb_frames=5:padding=7:margin=2" tests/pixfmts.mak: TAG = GEN tests/pixfmts.mak: ffmpeg$(PROGSSUF)$(EXESUF) | tests $(M)printf "PIXFMTS = " > $@ - $(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@ + $(Q)$(TARGET_EXEC) $(TARGET_PATH)/$< -pix_fmts list -nostdin 2> /dev/null | awk 'NR > 8 && /^IO/ { printf $$2 " " }' >> $@ $(Q)printf "\n" >> $@ RUNNING_PIXFMTS_TESTS := $(filter check fate fate-list fate-filter fate-vfilter fate-filter-pixdesc%,$(MAKECMDGOALS)) @@ -758,7 +758,7 @@ fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_ tests/data/file4560-override2rotate0.mov: TAG = GEN tests/data/file4560-override2rotate0.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ - -i $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov -c copy -flags +bitexact -metadata:s:v:0 rotate=0 $(TARGET_PATH)/$@ -y 2>/dev/null + -i $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov -c copy -flags +bitexact -metadata:s:v:0 rotate=0 $(TARGET_PATH)/$@ -y -nostdin 2>/dev/null FATE_FILTER_SAMPLES-$(call ALLYES, MOV_DEMUXER H264_DECODER AAC_FIXED_DECODER PCM_S16LE_ENCODER MOV_MUXER) += fate-filter-meta-4560-rotate0 fate-filter-meta-4560-rotate0: tests/data/file4560-override2rotate0.mov diff --git a/tests/fate/fits.mak b/tests/fate/fits.mak index 113498cf72..e581ada539 100644 --- a/tests/fate/fits.mak +++ b/tests/fate/fits.mak @@ -2,7 +2,7 @@ tests/data/fits-multi.fits: TAG = GEN tests/data/fits-multi.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -i $(TARGET_SAMPLES)/gif/m4nb.gif \ - -y $(TARGET_PATH)/$(@) 2>/dev/null + -y $(TARGET_PATH)/$(@) -nostdin 2>/dev/null #mapping of fits file formats to png filenames map.tests/data/lena-gray.fits := gray8 @@ -15,7 +15,7 @@ tests/data/lena%.fits: NAME = $(map.$(@)) tests/data/lena%.fits: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -i $(TARGET_SAMPLES)/png1/lena-$(map.$(@)).png \ - -y $(TARGET_PATH)/$(@) 2>/dev/null + -y $(TARGET_PATH)/$(@) -nostdin 2>/dev/null FATE_FITS_DEC-$(call DEMDEC, FITS, FITS) += fate-fitsdec-ext_data_min_max fate-fitsdec-ext_data_min_max: CMD = framecrc -i $(TARGET_SAMPLES)/fits/x0cj010ct_d0h.fit -pix_fmt gray16le diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak index 4fdeeff4c1..72eba4b42f 100644 --- a/tests/fate/flvenc.mak +++ b/tests/fate/flvenc.mak @@ -2,7 +2,7 @@ tests/data/add_keyframe_index.flv: TAG = GEN tests/data/add_keyframe_index.flv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ -f lavfi -i "sws_flags=+accurate_rnd+bitexact;testsrc=r=7:n=2:d=20" -sws_flags '+accurate_rnd+bitexact' -metadata "encoder=Lavf" -pix_fmt yuv420p -c:v flv1 -g 7 -f flv -flags +bitexact -fflags +bitexact \ - -flvflags add_keyframe_index -idct simple -dct int -y $(TARGET_PATH)/tests/data/add_keyframe_index.flv 2> /dev/null; + -flvflags add_keyframe_index -idct simple -dct int -y $(TARGET_PATH)/tests/data/add_keyframe_index.flv -nostdin 2> /dev/null; FATE_AFILTER-$(call ALLYES, FLV_MUXER FLV_DEMUXER AVDEVICE TESTSRC_FILTER LAVFI_INDEV FLV_ENCODER) += fate-flv-add_keyframe_index fate-flv-add_keyframe_index: tests/data/add_keyframe_index.flv diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 184349e5dd..b6f0972d40 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -232,7 +232,7 @@ FATE_HEVC_FFPROBE-$(call DEMDEC, HEVC, HEVC) += fate-hevc-paired-fields tests/data/hevc-mp4.mov: TAG = GEN tests/data/hevc-mp4.mov: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ - -i $(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit -c copy -flags +bitexact $(TARGET_PATH)/$@ -y 2>/dev/null + -i $(TARGET_SAMPLES)/hevc-conformance/WPP_A_ericsson_MAIN10_2.bit -c copy -flags +bitexact $(TARGET_PATH)/$@ -y -nostdin 2>/dev/null FATE_HEVC-$(call ALLYES, HEVC_DEMUXER MOV_DEMUXER HEVC_MP4TOANNEXB_BSF MOV_MUXER HEVC_MUXER) += fate-hevc-bsf-mp4toannexb fate-hevc-bsf-mp4toannexb: tests/data/hevc-mp4.mov