From patchwork Tue Sep 19 18:15:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43782 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a886:b0:149:dfde:5c0a with SMTP id ca6csp137339pzb; Tue, 19 Sep 2023 11:19:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH/ZANaUkHQsu40/MckvhMAQhcSOsKWD/yxvYj+vmRFOCK+pb//leBMPveV/b2wIPN9Yquy X-Received: by 2002:a17:906:2202:b0:9a2:185b:5376 with SMTP id s2-20020a170906220200b009a2185b5376mr159897ejs.49.1695147593593; Tue, 19 Sep 2023 11:19:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695147593; cv=none; d=google.com; s=arc-20160816; b=U9Jz/zuKi0QoTn2Bw5uuv75/yV2TFYfZzR4COd6NfGaE4ay7j3jLHnGFTyMnQ/hH8q 3OXlINtqGsAW8WOtCnmXMVlh87gUSVeNzSqY73AupQbs11/HXyYPNndQe1NL2y5hphhA rjfzHpeuhkdoZ2jY4SbLZp+4iFSQHVhXyQW1pLHG16IRqYxmuIjIyM19zKJX7SDGueLL M/ImjjC6RTAGSJoAk7pYg5O0dOxEUv3OgqBCcL605+Nbn36oB6Us/D0jq84eJcu1cMVS vch1r9HS9mS4er23lk0WhYuFxk9E9W5MECPJbgVCi73NBu8/AFYm8CSm/suEmvm5La7R MqQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=qNvmW3kSlzIb0wPP2QyBv8dRAx5s0fFoUfUMQGbfIA8=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=uw2WFg6m8af3bSV1WnMhbOEibvVgab+RlmsNAYuOSrv9iuTiy75/MbeEZ3WRUORGMB 8bsuIFxJQortmuxH3RHH8/5QbjZ+fZxhmbqr1Z9INW8G7NFXmB1JCkZ4gfw43u7ALvwS nsF60qax6UcX7De9eauIca46rem4nxjr+oB7sSgqrihxXbyMYx8wlsjKO3xs62eUn3aq zk4e5zWw8Jgx+gfmH2xoQYkF//cmI7fJmcXRlAuH7f1FUgB2XLAiZce8D4xYYqzVJNtV XvL1QuLU9tdCMz2PYCwdfTN2k5bqgcopbjACrXsQLxSAi9hEYgJZah10OuJXDnGdf93t 66bQ== 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 h5-20020a1709062dc500b00994b9b22346si10991346eji.887.2023.09.19.11.19.53; Tue, 19 Sep 2023 11:19:53 -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 1946468C63C; Tue, 19 Sep 2023 21:19:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A8EA968C63C for ; Tue, 19 Sep 2023 21:19:44 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 2618C5109 for ; Tue, 19 Sep 2023 20:15:38 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id sZ5u3IJJAgJX for ; Tue, 19 Sep 2023 20:15:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 800EF5101 for ; Tue, 19 Sep 2023 20:15:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 7F6A23A0212 for ; Tue, 19 Sep 2023 20:15:25 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 20:15:05 +0200 Message-Id: <20230919181507.7445-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] tests/fate/ffmpeg: replace deprecated -vbsf with -bsf:v X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: oybidKDRZHZI --- tests/fate/ffmpeg.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 04500d53a0..b5c26788c0 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -217,11 +217,11 @@ fate-h264_mp4toannexb_ticket5927_2: CMD = transcode "mp4" $(TARGET_SAMPLES)/h264 FATE_SAMPLES_FFMPEG-$(call TRANSCODE, MPEG4 MPEG2VIDEO, AVI, MPEGPS_DEMUXER MPEGVIDEO_DEMUXER MPEGVIDEO_PARSER EXTRACT_EXTRADATA_BSF REMOVE_EXTRADATA_BSF) += fate-ffmpeg-bsf-remove-k fate-ffmpeg-bsf-remove-r fate-ffmpeg-bsf-remove-e fate-ffmpeg-bsf-remove-k: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ - avi "-vbsf remove_extra=k" "-codec copy" + avi "-bsf:v remove_extra=k" "-codec copy" fate-ffmpeg-bsf-remove-r: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ - avi "-vbsf remove_extra=keyframe" "-codec copy" + avi "-bsf:v remove_extra=keyframe" "-codec copy" fate-ffmpeg-bsf-remove-e: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixbench_mpeg2.lq1.mpg\ - avi "-vbsf remove_extra=e" "-codec copy" + avi "-bsf:v remove_extra=e" "-codec copy" FATE_SAMPLES_FFMPEG-$(call DEMMUX, APNG, FRAMECRC, SETTS_BSF PIPE_PROTOCOL) += fate-ffmpeg-setts-bsf fate-ffmpeg-setts-bsf: CMD = framecrc -i $(TARGET_SAMPLES)/apng/clock.png -c:v copy -bsf:v "setts=duration=if(eq(NEXT_PTS\,NOPTS)\,PREV_OUTDURATION\,(NEXT_PTS-PTS)/2):ts=PTS/2" -fflags +bitexact From patchwork Tue Sep 19 18:15:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43783 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a886:b0:149:dfde:5c0a with SMTP id ca6csp137549pzb; Tue, 19 Sep 2023 11:20:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGl0uvzMSl3CDhmBdpIxLivHdd8Jwm5HadQsqUaKnZDHX6XzDHGexHVllyyc8xLHC9JjY3r X-Received: by 2002:a2e:9959:0:b0:2bd:180d:67b7 with SMTP id r25-20020a2e9959000000b002bd180d67b7mr195811ljj.40.1695147620230; Tue, 19 Sep 2023 11:20:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695147620; cv=none; d=google.com; s=arc-20160816; b=nhqMp/SBggMxsQZ6dphGziVM8/kc3QTTRi7n5+wHpIpAhMyxXZLIx1K3JJ020FU7LR ugnUqFPCsJLgz8xp1tZJqiic3CfalOKRWShFYeCnyqZvDq/tcejh0T6EEzMWiSXOXc2c u/Qbv1JMQsj1bQwOYX2Dp0KzhP/cb5RLM9LNpTOkVKXZIulyQuWSNvBNDGp4Ts3wepq2 5F8njv1WCHx82W+GlcdDgSzwKOzVHqQNEXfwQz0bwcbHcImSJTvv4K9//nwh1OF7c+6C ciOgO0uCh5DDK7MGXtTqGDTA2ubH7KGfOU57/Q9x7noca0hHGjAM9DL7QQR0/Y2Tqc3Q owvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=1ZPZkvMrGX/MFiR1aSXa5l3Oa6p7LaeuvJ2gS5nxNVs=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=leSeLdMiElWklqZK7l5KIs3aMti0R5w7UeyNuod+Dja5cL2i1snbweWDQcKRGpNSGL His5jfiYCidSDP4B7/ULQ8jhvxRtdvmSVCyLtqoxG4g7P2WmjZ0Vda60SC6rQLPQK2XL nmpHt9bJcw7wnBKzwswIErno/zTsHJ47N+h2P3R5V26BMDLkNL9ET6fBMWwJy/01nV1X IhhCXQiqvEQ4/VWd9gl/perW2P0+XO2hdtusu2SZuRCMOf5jOJz6T32FT3v1sz/kdg01 5SdyvL7iGVxfVreyjH/iJ1mbBNFjRvSxMcWnPpXs7ujVhEoMBL62c1plzvnyGIzMv4lO za3w== 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 jt27-20020a170906dfdb00b009930c030830si10764336ejc.633.2023.09.19.11.20.18; Tue, 19 Sep 2023 11:20:20 -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 C97BE68C902; Tue, 19 Sep 2023 21:20:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BD57968C7E5 for ; Tue, 19 Sep 2023 21:20:08 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 3E974510E for ; Tue, 19 Sep 2023 20:15:38 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id 0Q_aop_j7HCg for ; Tue, 19 Sep 2023 20:15:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 801095103 for ; Tue, 19 Sep 2023 20:15:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 8B7C33A0D2D for ; Tue, 19 Sep 2023 20:15:25 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 20:15:06 +0200 Message-Id: <20230919181507.7445-2-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230919181507.7445-1-anton@khirnov.net> References: <20230919181507.7445-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] tests/fate: replace deprecated -vsync with -fps_mode X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: qNKR7SJg0WaY --- tests/fate/ffmpeg.mak | 4 ++-- tests/fate/filter-video.mak | 2 +- tests/fate/gif.mak | 2 +- tests/fate/hevc.mak | 2 +- tests/fate/lossless-video.mak | 6 +++--- tests/fate/mov.mak | 4 ++-- tests/fate/mpeg4.mak | 2 +- tests/fate/vcodec.mak | 2 +- tests/fate/vpx.mak | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index b5c26788c0..a17539ba7a 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -67,7 +67,7 @@ fate-sub2video: CMD = framecrc -auto_conversion_filters \ FATE_SAMPLES_FFMPEG-$(call FRAMECRC, VOBSUB, DVDSUB, SCALE_FILTER) += fate-sub2video_basic fate-sub2video_basic: CMD = framecrc -auto_conversion_filters \ -i $(TARGET_SAMPLES)/sub/vobsub.idx \ - -vsync passthrough -copyts \ + -fps_mode passthrough -copyts \ -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:s:0]scale" \ -c:v rawvideo -threads 1 @@ -76,7 +76,7 @@ fate-sub2video_basic: CMD = framecrc -auto_conversion_filters \ FATE_SAMPLES_FFMPEG-$(call FRAMECRC, SUP, PGSSUB, SCALE_FILTER RAWVIDEO_ENCODER) += fate-sub2video_time_limited fate-sub2video_time_limited: CMD = framecrc -auto_conversion_filters \ -i $(TARGET_SAMPLES)/sub/pgs_sub.sup \ - -vsync passthrough -copyts \ + -fps_mode passthrough -copyts \ -t 15 \ -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:s:0]scale" \ -c:v rawvideo -threads 1 diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 789ec6414c..0b919f55a8 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -391,7 +391,7 @@ fate-filter-fps-start-drop: CMD = framecrc -lavfi testsrc2=r=7:d=3.5,fps=3:start fate-filter-fps-start-fill: CMD = framecrc -lavfi testsrc2=r=7:d=1.5,setpts=PTS+14,fps=3:start_time=1.5 FATE_FILTER_SAMPLES-$(call FILTERDEMDEC, FPS SCALE, MOV, QTRLE) += fate-filter-fps-cfr fate-filter-fps -fate-filter-fps-cfr: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -vsync cfr -pix_fmt yuv420p +fate-filter-fps-cfr: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -r 30 -fps_mode cfr -pix_fmt yuv420p fate-filter-fps: CMD = framecrc -auto_conversion_filters -i $(TARGET_SAMPLES)/qtrle/apple-animation-variable-fps-bug.mov -vf fps=30 -pix_fmt yuv420p FATE_FILTER_ALPHAEXTRACT_ALPHAMERGE := $(addprefix fate-filter-alphaextract_alphamerge_, rgb yuv) diff --git a/tests/fate/gif.mak b/tests/fate/gif.mak index 1eef2a1026..fc5a73218d 100644 --- a/tests/fate/gif.mak +++ b/tests/fate/gif.mak @@ -11,7 +11,7 @@ FATE_GIF += fate-gif-gray fate-gif-gray: CMD = framecrc -i $(TARGET_SAMPLES)/gif/Newtons_cradle_animation_book_2.gif -pix_fmt bgra -vf scale FATE_GIF += fate-gif-deal -fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -vsync cfr -pix_fmt bgra -auto_conversion_filters +fate-gif-deal: CMD = framecrc -i $(TARGET_SAMPLES)/gif/deal.gif -fps_mode cfr -pix_fmt bgra -auto_conversion_filters FATE_GIF-$(call FRAMECRC, GIF, GIF, SCALE_FILTER) += $(FATE_GIF) diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak index 20c2e5ba9c..b3c6792140 100644 --- a/tests/fate/hevc.mak +++ b/tests/fate/hevc.mak @@ -210,7 +210,7 @@ FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER) += \ $(HEVC_TESTS_422_10BIN) \ $(HEVC_TESTS_444_12BIT) \ -fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -vsync passthrough -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -sws_flags area+accurate_rnd+bitexact +fate-hevc-paramchange-yuv420p-yuv420p10: CMD = framecrc -i $(TARGET_SAMPLES)/hevc/paramchange_yuv420p_yuv420p10.hevc -fps_mode passthrough -sws_flags area+accurate_rnd+bitexact FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, HEVC_PARSER SCALE_FILTER LARGE_TESTS) += fate-hevc-paramchange-yuv420p-yuv420p10 tests/data/hevc-mp4.mov: TAG = GEN diff --git a/tests/fate/lossless-video.mak b/tests/fate/lossless-video.mak index 05a8ba29e1..74292d13c7 100644 --- a/tests/fate/lossless-video.mak +++ b/tests/fate/lossless-video.mak @@ -15,9 +15,9 @@ fate-lagarith-red: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-red.avi FATE_LAGARITH += fate-lagarith-ticket4119 fate-lagarith-ticket4119-cfr fate-lagarith-ticket4119-vfr fate-lagarith-ticket4119-pass fate-lagarith-ticket4119: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -fate-lagarith-ticket4119-cfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync cfr -fate-lagarith-ticket4119-vfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync vfr -fate-lagarith-ticket4119-pass: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -vsync passthrough +fate-lagarith-ticket4119-cfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -fps_mode cfr +fate-lagarith-ticket4119-vfr : CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -fps_mode vfr +fate-lagarith-ticket4119-pass: CMD = framecrc -i $(TARGET_SAMPLES)/lagarith/lagarith-1.3.27-black-frames-and-off-by-ones.avi -fps_mode passthrough FATE_LAGARITH-$(call FRAMECRC, AVI, LAGARITH) += $(FATE_LAGARITH) diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 6cb493ceab..c8e85fd54b 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -99,8 +99,8 @@ fate-mov-neg-firstpts-discard: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entri # with negative timestamps (skip_samples is not set for Vorbis, so ffmpeg computes start_time as negative if not specified by demuxer). fate-mov-neg-firstpts-discard-vorbis: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=start_time -bitexact $(TARGET_SAMPLES)/mov/mov_neg_first_pts_discard_vorbis.mp4 -# Makes sure that expected frames are generated for mov_neg_first_pts_discard.mov with -vsync cfr -fate-mov-neg-firstpts-discard-frames: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/mov/mov_neg_first_pts_discard.mov -vsync cfr +# Makes sure that expected frames are generated for mov_neg_first_pts_discard.mov with -fps_mode cfr +fate-mov-neg-firstpts-discard-frames: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/mov/mov_neg_first_pts_discard.mov -fps_mode cfr # Makes sure that no frame is dropped/duplicated with fps filter due to start_time / duration miscalculations. fate-mov-stream-shorter-than-movie: CMD = framemd5 -flags +bitexact -i $(TARGET_SAMPLES)/mov/mov_stream_shorter_than_movie.mov -vf fps=fps=24 -an diff --git a/tests/fate/mpeg4.mak b/tests/fate/mpeg4.mak index 4cec21c547..9a3cd4e2fb 100644 --- a/tests/fate/mpeg4.mak +++ b/tests/fate/mpeg4.mak @@ -8,7 +8,7 @@ FATE_MPEG4-$(call FRAMEMD5, M4V, MPEG4, SCALE_FILTER) := $(addprefix fate-mpeg4- fate-mpeg4-bsf-unpack-bframes: CMD = md5 -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -c:v copy -bsf mpeg4_unpack_bframes -f avi FATE_MPEG4-$(call DEMMUX, AVI, AVI, MPEG4_UNPACK_BFRAMES_BSF) += fate-mpeg4-bsf-unpack-bframes -fate-mpeg4-packed: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -vsync cfr +fate-mpeg4-packed: CMD = framecrc -flags +bitexact -idct simple -i $(TARGET_SAMPLES)/mpeg4/packed_bframes.avi -flags +bitexact -fflags +bitexact -fps_mode cfr FATE_MPEG4-$(call FRAMECRC, AVI, MPEG4) += fate-mpeg4-packed FATE_MPEG4-$(call ALLYES, FILE_PROTOCOL M4V_DEMUXER MPEG4_DECODER SCALE_FILTER \ diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak index 45ed88da96..abdc481f8a 100644 --- a/tests/fate/vcodec.mak +++ b/tests/fate/vcodec.mak @@ -6,7 +6,7 @@ fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) fate-vsynth%: FMT = avi fate-vsynth%: DEFAULT_SIZE = -s 352x288 fate-vsynth3-%: DEFAULT_SIZE = -s $(FATEW)x$(FATEH) -fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -vsync passthrough $(DECOPTS)" "" "" ${TWOPASS} +fate-vsynth%: CMD = enc_dec "rawvideo $(DEFAULT_SIZE) -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-pix_fmt yuv420p -fps_mode passthrough $(DECOPTS)" "" "" ${TWOPASS} fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index b0a3cd2fd7..6c479a6fb5 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -56,7 +56,7 @@ FATE_VP6-$(call FRAMECRC, FLV, VP6F) += fate-vp6f fate-vp6f: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/clip1024.flv FATE_VP8-$(call FRAMECRC, MATROSKA, VP8) += fate-vp8-2451 -fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -vsync cfr -an +fate-vp8-2451: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp8/RRSF49-short.webm -fps_mode cfr -an FATE_SAMPLES_AVCONV += $(FATE_VP6-yes) fate-vp6: $(FATE_VP6-yes) From patchwork Tue Sep 19 18:15:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 43784 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a886:b0:149:dfde:5c0a with SMTP id ca6csp137617pzb; Tue, 19 Sep 2023 11:20:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+Gfk6P5bSDbsq/37kBzVTc6ARlfmjH0TrqLoukOE7CG7Se877kWCBpyIuvZJJ8cBC5GVt X-Received: by 2002:a17:906:20d6:b0:9ad:e2c8:172a with SMTP id c22-20020a17090620d600b009ade2c8172amr131250ejc.39.1695147627410; Tue, 19 Sep 2023 11:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695147627; cv=none; d=google.com; s=arc-20160816; b=xeo3LC37kj14ohEZYNBJjiW7uYkiimaxcWBOiKjL+l5zDAmEhvIjNSm59jtaK5V8Oj 3tim4C2MwLi0Y1bJfYRYk3VtZrFsV2/BM0URMd4EiNdMDIz9H7pYlFwW3Elx9/dIQmNp yzhTXFFSEpchjLfWJ/A1sO889AKXRDsMetDUqLQ+7/8mqYWLKvSz1VyHbXerDck1r7oK 7IioreMN/nHx+/uJYAHIqysoEvbLAhvFY0nRVHvVVPXfb309G7FDr58A166Kg34aoqRn oFjKmliaB/3iYcGUIyGUM6YKUZsIQtx+8bWhpgMhKzt7mneMEzRx8QAds09vLtU9PbIP 52sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=KEWt02oDM96FDKGzDl4ndIZFneaGxHfzrwmoA2Wa1yo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=wjAE2WHuya4qxMUrHXGyRqpAr4GyxW+rzZSY0SvqnfuPbg0MoRoZuidBdKWZm1THp3 FBLIA3uS2Iqk4h96V0zY1Kh/S+8B2e6HDnVgCMeZn4xGKJrwsExkkeGnaxU4IMEFUlmu QXG+goy1AXYwIZjFKV9KnfuF767Zzs4jDdqc86A7PObdTfVQMDDrDweGEaphaoYiZ3je ncPzzubsbozccW7UzNqtcipR64WL7k1gPRqub4jD1MYQqE19sUmJ1rBwCAJq738V7RXQ HZMcZyQ4Jpo/7V0jbxc3kyqQV1dHT97WeZB34kNtETaoiqCpUG4zIOr+GTr7szIu4zRO VDmw== 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 u25-20020a1709060b1900b009a1ac68daa3si9995858ejg.160.2023.09.19.11.20.27; Tue, 19 Sep 2023 11:20:27 -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 D589668C90A; Tue, 19 Sep 2023 21:20:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFE9A68C866 for ; Tue, 19 Sep 2023 21:20:08 +0300 (EEST) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 79E115103 for ; Tue, 19 Sep 2023 20:15:43 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id vhwH113GY3IM for ; Tue, 19 Sep 2023 20:15:38 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 7A2D810 for ; Tue, 19 Sep 2023 20:15:32 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 97EAB3A150F for ; Tue, 19 Sep 2023 20:15:25 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Sep 2023 20:15:07 +0200 Message-Id: <20230919181507.7445-3-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230919181507.7445-1-anton@khirnov.net> References: <20230919181507.7445-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] doc/ffmpeg: expand -bsf documentation X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 5GYtIvkZlk0J Explain how to pass options to filters. --- doc/ffmpeg.texi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi index d2864ff37e..cf47eb68d1 100644 --- a/doc/ffmpeg.texi +++ b/doc/ffmpeg.texi @@ -1893,9 +1893,18 @@ ffmpeg -i inurl -streamid 0:33 -streamid 1:36 out.ts @end example @item -bsf[:@var{stream_specifier}] @var{bitstream_filters} (@emph{output,per-stream}) -Set bitstream filters for matching streams. @var{bitstream_filters} is -a comma-separated list of bitstream filters. Use the @code{-bsfs} option -to get the list of bitstream filters. +Apply bitstream filters to matching streams. + +@var{bitstream_filters} is a comma-separated list of bitstream filter +specifications that will be applied to coded packets in the order they are +written in. Each bitstream filter specification is of the form +@example +@var{filter}[=@var{optname0}=@var{optval0}:@var{optname1}=@var{optval1}:...] +@end example +Any of the ',=:' characters that are to be a part of an option value need to be +escaped with a backslash. + +Use the @code{-bsfs} option to get the list of bitstream filters. @example ffmpeg -i h264.mp4 -c:v copy -bsf:v h264_mp4toannexb -an out.h264 @end example