From patchwork Wed Jan 24 10:46:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45789 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:120f:b0:199:de12:6fa6 with SMTP id v15csp1187400pzf; Wed, 24 Jan 2024 02:46:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFpVclztwt8vPOeh/6WA5MjDVCoM6U3BHiHAk36c+hYLVOyHJPvZ1yrT+dgARkdTFq6cQjX X-Received: by 2002:aa7:cd69:0:b0:55c:8f3e:e93d with SMTP id ca9-20020aa7cd69000000b0055c8f3ee93dmr1190132edb.2.1706093209665; Wed, 24 Jan 2024 02:46:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706093209; cv=none; d=google.com; s=arc-20160816; b=uuHNxCki8LXN9+/9SGd/GXyGC8CAgNOawgv7BVVLeSO5h1fHx9z3xkELqUzr9imzm9 imrXxucjRolqM8YqJXOqkyrc6X2Bo+NSuK2/5jKT4fiM48fKJHsO2ZCSjoysZVcqNPVN rtudhWy6QTvGefNdGXjpwZuRgR9Ra2rriJf14nRT4nx422B8XZnpcwgpT18hfC3CyErm UV3+8Xdz89GqZNpk/t1aqUAzfxwIVsH0aSCCmzIQw16XZ54zoQpFZeVLyn0gW7vrmNOf DMv5gb2SInXvLUXqGB/y7d/VtI1rMCKf3fdWoBUUbTc31He74nyEV+6i8psQTGs4nnz5 Uy0g== 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:dkim-signature:delivered-to; bh=ue4lIIzr33vE3BBUWJliOeXV9Ra8CrV9v6lpPulznSc=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HHd+CMzcjVorEInIu2LVuvv7TtCXutRLFo1S4emMSlc0AarLRgE9LxCKCeQs6D2X0s btgTWGFdohlXwpHEW39g7veMI51IUl3GM0Zlv3S5NeqHCBZQM71ASfWUJR9DZJ0vvBkq x4pCeZwgumdMg4f+wRf9faj+TQcuWL/QpAU+B0CDIwmKh5kUH02t1LrOCP8xutREjz+F Q3y7ZByg6UeJk2C8Tfu3cVhL75uVz9zDJ8ozGovbasy+hSrgNBwj6yAIh2mrMQ5D776k f+MBNO1l1cCv+6HgQ9LrxYI8QmiAH57lgvgsOKkTZKzzJAiBd6tWap3xLi5DLTw9wBFH Yndw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=LuisGDBn; 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 b10-20020a50ccca000000b0055c68b9f4adsi2237311edj.491.2024.01.24.02.46.49; Wed, 24 Jan 2024 02:46:49 -0800 (PST) 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=@khirnov.net header.s=mail header.b=LuisGDBn; 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 2D08168D0D2; Wed, 24 Jan 2024 12:46:36 +0200 (EET) 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 EC82368D032 for ; Wed, 24 Jan 2024 12:46:27 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=LuisGDBn; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 98027EEB for ; Wed, 24 Jan 2024 11:46:27 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id gyvqYUjsvWkq for ; Wed, 24 Jan 2024 11:46:27 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706093186; bh=VIs5dlYYUKO6r+xAYCPB7bk3Llyu2qDtwIgICOZRYUI=; h=From:To:Subject:Date:In-Reply-To:References:From; b=LuisGDBnQ7aFRlZPb9DO+qTxNFChfmeTwo6q2yhgUjscyqeTvSS7uMN75jLHIulEn qQLIavVQybsAGtbieRHTpe2zUzEIIvYnMtZOuRIn5d8jJ7H+V2F4qv9G4AoWO9JtqD ZzhBt2m8xCLrjs4Eqzla1zeVZjxIxJjl5O3ulu5QwK0nNMbDpxXjGpARicKd2Q5A6A +vg+kCjXATO2apvZGdv1XegsDocG1WN0errqeXFv2Bky+mBmhXW/hwiN+do5jWJnxK nsV/uf71L8t20SrSnkJBJsrL3bgjSYRF8g1SbdD/GlXnrXXqwTiA/30I6NLj0Q3Lfy jsNu+fPeiMx0g== 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 1F7FF19BC for ; Wed, 24 Jan 2024 11:46:26 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id E8C6C3A0582 for ; Wed, 24 Jan 2024 11:46:25 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 11:46:22 +0100 Message-ID: <20240124104622.24343-3-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240124104622.24343-1-anton@khirnov.net> References: <20240124104622.24343-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] tests/fate/ffmpeg: add a test for the issue fixed in previous commit 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: b8wxmQWnSn7S --- tests/fate/ffmpeg.mak | 10 ++++++ tests/ref/fate/ffmpeg-filter-in-eof | 55 +++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 tests/ref/fate/ffmpeg-filter-in-eof diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 84489e9fea..8c2f008d04 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -261,3 +261,13 @@ FATE_SAMPLES_FFMPEG-$(call ENCDEC, PCM_S16LE TTA, NULL MATROSKA) += fate-ffmpeg- # use -stream_loop, because it tests flushing bsfs fate-ffmpeg-bsf-input: CMD = framecrc -stream_loop 2 -bsf setts=PTS*2 -i $(TARGET_SAMPLES)/hevc/extradata-reload-multi-stsd.mov -c copy FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MOV, , SETTS_BSF) += fate-ffmpeg-bsf-input + +# Test behaviour when a complex filtergraph returns EOF on one of its inputs, +# but other inputs are still active. +# cf. #10803 +fate-ffmpeg-filter-in-eof: tests/data/vsynth_lena.yuv +fate-ffmpeg-filter-in-eof: CMD = framecrc \ + -f rawvideo -s 352x288 -pix_fmt yuv420p -t 1 -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv \ + -f rawvideo -s 352x288 -pix_fmt yuv420p -t 1 -i $(TARGET_PATH)/tests/data/vsynth_lena.yuv \ + -filter_complex "[0][1]concat" -c:v rawvideo +FATE_FFMPEG-$(call FRAMECRC, RAWVIDEO, RAWVIDEO, CONCAT_FILTER) += fate-ffmpeg-filter-in-eof diff --git a/tests/ref/fate/ffmpeg-filter-in-eof b/tests/ref/fate/ffmpeg-filter-in-eof new file mode 100644 index 0000000000..77be842408 --- /dev/null +++ b/tests/ref/fate/ffmpeg-filter-in-eof @@ -0,0 +1,55 @@ +#tb 0: 1/25 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 352x288 +#sar 0: 0/1 +0, 0, 0, 1, 152064, 0x07945924 +0, 1, 1, 1, 152064, 0x08472470 +0, 2, 2, 1, 152064, 0x63fde13b +0, 3, 3, 1, 152064, 0x67ba9c55 +0, 4, 4, 1, 152064, 0x8aa34b24 +0, 5, 5, 1, 152064, 0x9fba089e +0, 6, 6, 1, 152064, 0xb040d8e3 +0, 7, 7, 1, 152064, 0x3061ae08 +0, 8, 8, 1, 152064, 0xf5907946 +0, 9, 9, 1, 152064, 0x0ea24935 +0, 10, 10, 1, 152064, 0x7d87276b +0, 11, 11, 1, 152064, 0x122c252b +0, 12, 12, 1, 152064, 0xdb0f3889 +0, 13, 13, 1, 152064, 0x88466739 +0, 14, 14, 1, 152064, 0xca87a583 +0, 15, 15, 1, 152064, 0x34f9da44 +0, 16, 16, 1, 152064, 0x1d4e1646 +0, 17, 17, 1, 152064, 0x29975c2b +0, 18, 18, 1, 152064, 0xbf82aae9 +0, 19, 19, 1, 152064, 0x33c2fd7c +0, 20, 20, 1, 152064, 0xa3c95f44 +0, 21, 21, 1, 152064, 0x5f93bc9d +0, 22, 22, 1, 152064, 0xa6f11b51 +0, 23, 23, 1, 152064, 0x39bc6b45 +0, 24, 24, 1, 152064, 0xfd509e1d +0, 25, 25, 1, 152064, 0x07945924 +0, 26, 26, 1, 152064, 0x08472470 +0, 27, 27, 1, 152064, 0x63fde13b +0, 28, 28, 1, 152064, 0x67ba9c55 +0, 29, 29, 1, 152064, 0x8aa34b24 +0, 30, 30, 1, 152064, 0x9fba089e +0, 31, 31, 1, 152064, 0xb040d8e3 +0, 32, 32, 1, 152064, 0x3061ae08 +0, 33, 33, 1, 152064, 0xf5907946 +0, 34, 34, 1, 152064, 0x0ea24935 +0, 35, 35, 1, 152064, 0x7d87276b +0, 36, 36, 1, 152064, 0x122c252b +0, 37, 37, 1, 152064, 0xdb0f3889 +0, 38, 38, 1, 152064, 0x88466739 +0, 39, 39, 1, 152064, 0xca87a583 +0, 40, 40, 1, 152064, 0x34f9da44 +0, 41, 41, 1, 152064, 0x1d4e1646 +0, 42, 42, 1, 152064, 0x29975c2b +0, 43, 43, 1, 152064, 0xbf82aae9 +0, 44, 44, 1, 152064, 0x33c2fd7c +0, 45, 45, 1, 152064, 0xa3c95f44 +0, 46, 46, 1, 152064, 0x5f93bc9d +0, 47, 47, 1, 152064, 0xa6f11b51 +0, 48, 48, 1, 152064, 0x39bc6b45 +0, 49, 49, 1, 152064, 0xfd509e1d