From patchwork Mon Oct 21 10:12:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15879 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 A5D624477A2 for ; Mon, 21 Oct 2019 13:12:26 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8454668AFC1; Mon, 21 Oct 2019 13:12:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61E8168AF20 for ; Mon, 21 Oct 2019 13:12:20 +0300 (EEST) Received: by mail-pf1-f169.google.com with SMTP id b128so8146697pfa.1 for ; Mon, 21 Oct 2019 03:12:20 -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; bh=ia+EiBz5ShMKKpex1tZiOOEL8E/o7MkPaE7tWn8VJP8=; b=R2DMHqd79k2/jCzTrA1uf/vgZWfxpazinMLdqj7Dgq1HKPj6dBQh/x2lTv6iRBkvK/ tjftrJ3n7UZq0AHXRwuKt753C73AG3u5nfc7cS5S3Hb0hHrasaOqAlbdt7pFltlzS7yL iT17dh5WCpfP9N+OuEmFD1Y3Uh482N/xwnQIpqifhkjqO4Ll8eXA94xP/VUc4tBG/9Yz Ztks1n/gQNZPaDEykvO+/crFKyHO02S6O6YiRX5dZWYricSh0hedxC2rte3IM6bhqLmH GVFtEGcm+oPtFtCDoPRQHDUFnTZIJ03IAYI9O5d5EhKl3ze8cRKBxMekjhIVDewKdt3x Ul7g== 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; bh=ia+EiBz5ShMKKpex1tZiOOEL8E/o7MkPaE7tWn8VJP8=; b=CjPP6efI56yyGAxRtZmBrnxWlgKyQDX/MQGRs0r3LgV4L6mNMjyu5MnJYE8SwTjQt1 7siXBSVfWKXrLEQuR3K4IDJ85B++k1sAp/cLe3r2ICdkSB59XJTH2FGA8q+4fzuxB1NO LSo1jrDK92r8rJFZUR2Nkk7Qrywa04Ws2NWip53xga1Du21zBtbbXU4dF1avUrpvDKtv 2EnI7tiImDuY0zvArYy1yczH6PWCiEHkDSGbuYuDEyR+NesnQm+G1VK8dOd0HVeVpVAK +H8S8nJJsOID9Qf4X4EymA1TjZ1krGsXXfxIGv2LsCpeIeZYb88UlXHbBOnND1R9f0PM Ld7A== X-Gm-Message-State: APjAAAXAEPFkJ5nZOC5yjC3MuQsNSY8aMbUEeQ5EKwdQAZw++rlKMXLr Rv2xnXsEB1ZV4h6STWySy46zJfeGlSI= X-Google-Smtp-Source: APXvYqwHwHYEG2oA1R9qkjrsPGyWBpU1mvPRykXHGomo5ExoCPIlwTyizYSlf8jhQEX8qVRpA7i9fg== X-Received: by 2002:aa7:9525:: with SMTP id c5mr21859624pfp.22.1571652738357; Mon, 21 Oct 2019 03:12:18 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id w5sm14282066pfn.96.2019.10.21.03.12.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 03:12:17 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Oct 2019 18:12:11 +0800 Message-Id: <20191021101213.14837-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190812153953.11839-1-lance.lmwang@gmail.com> References: <20190812153953.11839-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 1/3] avfilter/vsrc_mptestsrc: add options to set the maximum number of frames 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 3 +++ libavfilter/vsrc_mptestsrc.c | 29 +++++++++++++++++------------ 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index db4313da37..2815372249 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -20912,6 +20912,9 @@ Set the number or the name of the test to perform. Supported tests are: @item ring2 @item all +@item max_frames, m +Set the maximum number of frames generated for each test, default value is 30. + @end table Default value is "all", which will cycle through the list of all tests. diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c index c5fdea75dc..31c68939e4 100644 --- a/libavfilter/vsrc_mptestsrc.c +++ b/libavfilter/vsrc_mptestsrc.c @@ -54,6 +54,7 @@ typedef struct MPTestContext { const AVClass *class; AVRational frame_rate; int64_t pts, max_pts, duration; + int64_t max_frames; int hsub, vsub; int test; ///< test_type } MPTestContext; @@ -79,6 +80,10 @@ static const AVOption mptestsrc_options[]= { { "ring1", "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_RING1}, INT_MIN, INT_MAX, FLAGS, "test" }, { "ring2", "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_RING2}, INT_MIN, INT_MAX, FLAGS, "test" }, { "all", "", 0, AV_OPT_TYPE_CONST, {.i64=TEST_ALL}, INT_MIN, INT_MAX, FLAGS, "test" }, + { "max_frames", "Set the maximum number of frames generated for each test", OFFSET(max_frames), + AV_OPT_TYPE_INT64, {.i64 = 30}, 1, INT64_MAX, FLAGS }, + { "m", "Set the maximum number of frames generated for each test", OFFSET(max_frames), + AV_OPT_TYPE_INT64, {.i64 = 30}, 1, INT64_MAX, FLAGS }, { NULL } }; @@ -322,20 +327,20 @@ static int request_frame(AVFilterLink *outlink) memset(picref->data[2] + i*picref->linesize[2], 128, cw); } - if (tt == TEST_ALL && frame%30) /* draw a black frame at the beginning of each test */ - tt = (frame/30)%(TEST_NB-1); + if (tt == TEST_ALL && frame%test->max_frames) /* draw a black frame at the beginning of each test */ + tt = (frame/test->max_frames)%(TEST_NB-1); switch (tt) { - case TEST_DC_LUMA: dc_test(picref->data[0], picref->linesize[0], 256, 256, frame%30); break; - case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 256, 256, frame%30); break; - case TEST_FREQ_LUMA: freq_test(picref->data[0], picref->linesize[0], frame%30); break; - case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], frame%30); break; - case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], frame%30); break; - case TEST_AMP_CHROMA: amp_test(picref->data[1], picref->linesize[1], frame%30); break; - case TEST_CBP: cbp_test(picref->data , picref->linesize , frame%30); break; - case TEST_MV: mv_test(picref->data[0], picref->linesize[0], frame%30); break; - case TEST_RING1: ring1_test(picref->data[0], picref->linesize[0], frame%30); break; - case TEST_RING2: ring2_test(picref->data[0], picref->linesize[0], frame%30); break; + case TEST_DC_LUMA: dc_test(picref->data[0], picref->linesize[0], 256, 256, frame%test->max_frames); break; + case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 256, 256, frame%test->max_frames); break; + case TEST_FREQ_LUMA: freq_test(picref->data[0], picref->linesize[0], frame%test->max_frames); break; + case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], frame%test->max_frames); break; + case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], frame%test->max_frames); break; + case TEST_AMP_CHROMA: amp_test(picref->data[1], picref->linesize[1], frame%test->max_frames); break; + case TEST_CBP: cbp_test(picref->data , picref->linesize , frame%test->max_frames); break; + case TEST_MV: mv_test(picref->data[0], picref->linesize[0], frame%test->max_frames); break; + case TEST_RING1: ring1_test(picref->data[0], picref->linesize[0], frame%test->max_frames); break; + case TEST_RING2: ring2_test(picref->data[0], picref->linesize[0], frame%test->max_frames); break; } return ff_filter_frame(outlink, picref);