From patchwork Mon Apr 13 22:11:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18930 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C96B244A3FE for ; Tue, 14 Apr 2020 01:12:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AF52A68B8F5; Tue, 14 Apr 2020 01:12:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D93568B7CF for ; Tue, 14 Apr 2020 01:12:25 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id z6so11763216wml.2 for ; Mon, 13 Apr 2020 15:12:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mVlqPOXgbM3DKFoylEUvcpi0X95NeKrHVaQ1nerhL+A=; b=Ls3fzrmFK26Gds7GjKakT0Ck6X6felUc02MvxWaMdgJJym3pi36QmvTUm9Mp5THI7a zWPDTwE0atGhD+IcKDRfBFqFxPevk3eK8kemsyJZjraQR2Rn56oXuovrYWE3M523PKu0 9SQSB5N5h0S46bBBUMol7tdD9Iw9Dj7Upv44pUsPLzZEFqm6oU5h/9UKbEeTBcO5bQxy R9HN5afJTbvOewH2+8P+S7tn1qQmFDHyBT244fpALgFAm3lEtEMnJfU5q/0l/VIXHH85 4Qa5uA/H7r/jyl7sFtG5NHh8PBWxmXv8napvnLgzPUbLDPOahdFCKY/Cv8NltaXo8rGN YV4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mVlqPOXgbM3DKFoylEUvcpi0X95NeKrHVaQ1nerhL+A=; b=oEpXe8DiTvZeEISi2Xi3QpT1k9IidUAxWawSBzkWlCL5jWuTnVq5QBx5OKUzkD5F+U Nj9KW/4tuEyuTe6QrCoTuIMwo+mVqrKmlVt5987Ki5NioyM2YhtVBsXLkm9UQpW1sFku lKR0hN0oFGsdwZ7VGvo8NJGE4yUNlcZ86Um/cEuVleKX7poZJf5htLkTTyK8xdHi6dcL jXQh01/btIglZ6hiycaIPeqTgFuMfIUruYau0jzaqMHSBNT2rnhsmpR4Z99IX5Nacrir 8nPIislMF6bm2rV6yUBuMJSzyhmbuuwr/y48AHegDltwr8NEYc6RcRW1/phuyxq8p5TL 8Xfg== X-Gm-Message-State: AGi0PuYC+ZYzK9+spK5+gHlijWEpElFmHpfBO1p2fJ+4ees5fi9EN2Ki qFgib4k2P7KN9mCskt9366fVbicp X-Google-Smtp-Source: APiQypKHuo3z6Xs22xrmnUJsmGYJNNVyHEtdZnixA+V2srMjSEe56vNCwo5NHpv+WcPbRgH1ek8vTQ== X-Received: by 2002:a1c:3b0a:: with SMTP id i10mr19875388wma.26.1586815943949; Mon, 13 Apr 2020 15:12:23 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id h16sm17930804wrw.36.2020.04.13.15.12.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2020 15:12:23 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Apr 2020 00:11:54 +0200 Message-Id: <20200413221156.20179-2-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200413221156.20179-1-andreas.rheinhardt@gmail.com> References: <20200413221156.20179-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] fate: Allow to test temporary files with ffprobe 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is primarily intended to test that muxers correctly write chapters or metadata; but given that it does this by having our demuxers read the generated files, it also tests demuxers. And of course it may prove useful for encoders, too. Signed-off-by: Andreas Rheinhardt --- transcode() and stream_remux() both used $7 for the -keep parameter (that is not set by any test using these two functions) despite $6 being unused. I could have used $6 for ffprobe_opts, but the relative position of ffprobe_opts and -keep would be switched between enc_dec() and transcode()/stream_remux(). tests/Makefile | 7 +++++-- tests/fate-run.sh | 13 +++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/tests/Makefile b/tests/Makefile index 477f5bef26..bf5b658926 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -200,11 +200,14 @@ include $(SRC_PATH)/tests/fate/xvid.mak FATE_FFMPEG += $(FATE_FFMPEG-yes) $(FATE_AVCONV) $(FATE_AVCONV-yes) FATE-$(CONFIG_FFMPEG) += $(FATE_FFMPEG) FATE-$(CONFIG_FFPROBE) += $(FATE_FFPROBE) +FATE-$(call ALLYES, FFMPEG FFPROBE) += $(FATE_FFMPEG_FFPROBE) FATE_SAMPLES_AVCONV += $(FATE_SAMPLES_AVCONV-yes) FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_FFMPEG-yes) FATE_EXTERN-$(CONFIG_FFMPEG) += $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) FATE_EXTERN-$(CONFIG_FFPROBE) += $(FATE_SAMPLES_FFPROBE) +FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_SAMPLES_FFMPEG_FFPROBE-yes) +FATE_EXTERN-$(call ALLYES, FFMPEG FFPROBE) += $(FATE_SAMPLES_FFMPEG_FFPROBE) FATE_EXTERN += $(FATE_EXTERN-yes) $(FATE_SAMPLES_FASTSTART) FATE += $(FATE-yes) @@ -212,9 +215,9 @@ FATE += $(FATE-yes) RSYNC_OPTIONS-$(HAVE_RSYNC_CONTIMEOUT) += --contimeout=60 RSYNC_OPTIONS = -vrltLW --timeout=60 $(RSYNC_OPTIONS-yes) -$(FATE_FFMPEG) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG): ffmpeg$(PROGSSUF)$(EXESUF) +$(FATE_FFMPEG) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_AVCONV) $(FATE_SAMPLES_FFMPEG) $(FATE_SAMPLES_FFMPEG_FFPROBE): ffmpeg$(PROGSSUF)$(EXESUF) -$(FATE_FFPROBE) $(FATE_SAMPLES_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF) +$(FATE_FFPROBE) $(FATE_FFMPEG_FFPROBE) $(FATE_SAMPLES_FFPROBE) $(FATE_SAMPLES_FFMPEG_FFPROBE): ffprobe$(PROGSSUF)$(EXESUF) $(FATE_SAMPLES_FASTSTART): tools/qt-faststart$(EXESUF) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 552b3dd9df..7c6d753261 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -192,6 +192,7 @@ enc_dec(){ enc_opt=$4 dec_fmt=$5 dec_opt=$6 + ffprobe_opts=$9 encfile="${outdir}/${test}.${enc_fmt}" decfile="${outdir}/${test}.out.${dec_fmt}" cleanfiles="$cleanfiles $decfile" @@ -207,6 +208,8 @@ enc_dec(){ -f $dec_fmt -y $tdecfile || return do_md5sum $decfile tests/tiny_psnr${HOSTEXECSUF} $srcfile $decfile $cmp_unit $cmp_shift + test -z $ffprobe_opts || \ + run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts -v 0 $tencfile || return } transcode(){ @@ -215,8 +218,9 @@ transcode(){ enc_fmt=$3 enc_opt=$4 final_decode=$5 + ffprobe_opts=$7 encfile="${outdir}/${test}.${enc_fmt}" - test "$7" = -keep || cleanfiles="$cleanfiles $encfile" + test "$6" = -keep || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) ffmpeg -f $src_fmt $DEC_OPTS -i $tsrcfile $ENC_OPTS $enc_opt $FLAGS \ @@ -225,6 +229,8 @@ transcode(){ echo $(wc -c $encfile) ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ -f framecrc - || return + test -z $ffprobe_opts || \ + run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts -v 0 $tencfile || return } stream_remux(){ @@ -233,14 +239,17 @@ stream_remux(){ enc_fmt=$3 stream_maps=$4 final_decode=$5 + ffprobe_opts=$7 encfile="${outdir}/${test}.${enc_fmt}" - test "$7" = -keep || cleanfiles="$cleanfiles $encfile" + test "$6" = -keep || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) ffmpeg -f $src_fmt -i $tsrcfile $stream_maps -codec copy $FLAGS \ -f $enc_fmt -y $tencfile || return ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ -f framecrc - || return + test -z $ffprobe_opts || \ + run ffprobe${PROGSUF}${EXECSUF} $ffprobe_opts -v 0 $tencfile || return } # FIXME: There is a certain duplication between the avconv-related helper