From patchwork Fri Aug 23 12:17:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14678 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 39CEA444203 for ; Fri, 23 Aug 2019 15:45:02 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED7CE68A846; Fri, 23 Aug 2019 15:45:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52DD5689F73 for ; Fri, 23 Aug 2019 15:44:55 +0300 (EEST) Received: by mail-io1-f66.google.com with SMTP id t6so19761252ios.7 for ; Fri, 23 Aug 2019 05:44:55 -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=OR/UiaMq6yiY2HoqV+A0TK3O6Tnm1BqoDetn9ui5xM4=; b=ADTB2dE28ZmxkvUByVgVxi/YEDU1wMo4gnPYY7VpYYUnjg26TWa6o/FIzBYl6bzytR tewFX7mSVQVsTRYGqBlhpU3SGbH84iRxZaTHyuFAJQM26mDM5f0GAoabyOylh4aSDfb0 JC75UqA470miuhA10PElizJwBGxBH3K3WE3ZJKp5F7TTUfRFD7XPcfnTwpTwKPTZcbqt 42velWdTRSA6rJkzROsxN3FHh5wE4MVqYrtWMRluLDzgNnMhKmFdK8jC5qmuBHHI+kba XmK2ypE4JURA5dExZ4jzDvHqKPnNXHkRDMUL3p07WaGWuoVzGml7Aot0Ncj9xpaMnEW9 wuTQ== 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=OR/UiaMq6yiY2HoqV+A0TK3O6Tnm1BqoDetn9ui5xM4=; b=fZ25f29EvdmOGhgJbyqBHO+2vLtopwTcklvhmaGndJKU5b8d4d9ilkd0iSc3zPVvGg PJfQdp1IZ4UY4n7n+dMvTUKrAl9Nx7Xo1+pOdXS1oGIvTv/JnASwHmwUpGeaL5wRZP5s 16YYz/UUVR+YNq56tR9FFT6RlwdpbN+Gl1g1tN8Oc5e8EeBDcng5o835f/agRsQSoBS8 GgYQJ09pJveLJT8vyFO9zotjRjRUO8KxtEBBCD1Bze6k3YVBXESbSDCDSFBPWHwqM82L npV1+byhGqmzaU4CVhVPCPIIxqK9w9NZrNybTxf6prXPO79WoXNgJtKGgHJLis1cKtOK xaCw== X-Gm-Message-State: APjAAAXcKnLBiB9eoGxyeeBvMf9INfLq4PPffrGsj1+TcVRsDIPjg7W1 0YZ1hiGf3WQU2iJtBWUEClgDlFB3 X-Google-Smtp-Source: APXvYqywpdH3K1ItA+ZgRPb2+CK1SFKeoDNFJZws6oduOhANMBB7BJTgu2RaAd/WfHPaqkir08JCGQ== X-Received: by 2002:a63:89c7:: with SMTP id v190mr3564192pgd.299.1566562638807; Fri, 23 Aug 2019 05:17:18 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id t15sm2292955pfc.47.2019.08.23.05.17.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Aug 2019 05:17:18 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Aug 2019 20:17:08 +0800 Message-Id: <20190823121709.4227-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190823121709.4227-1-lance.lmwang@gmail.com> References: <20190812153953.11839-2-lance.lmwang@gmail.com> <20190823121709.4227-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3 2/3] avfilter/vsrc_mptestsrc: simplify the code and change the type of frame 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 --- libavfilter/vsrc_mptestsrc.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/libavfilter/vsrc_mptestsrc.c b/libavfilter/vsrc_mptestsrc.c index 4a2db18..4101690 100644 --- a/libavfilter/vsrc_mptestsrc.c +++ b/libavfilter/vsrc_mptestsrc.c @@ -308,7 +308,8 @@ static int request_frame(AVFilterLink *outlink) AVFrame *picref; int w = WIDTH, h = HEIGHT, cw = AV_CEIL_RSHIFT(w, test->hsub), ch = AV_CEIL_RSHIFT(h, test->vsub); - unsigned int frame = outlink->frame_count_in; + uint64_t frame = outlink->frame_count_in / test->max_frames; + uint64_t mod = outlink->frame_count_in % test->max_frames; enum test_type tt = test->test; int i; @@ -327,20 +328,20 @@ static int request_frame(AVFilterLink *outlink) memset(picref->data[2] + i*picref->linesize[2], 128, cw); } - 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); + if (tt == TEST_ALL && mod) /* draw a black frame at the beginning of each test */ + tt = frame%(TEST_NB-1); switch (tt) { - 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; + case TEST_DC_LUMA: dc_test(picref->data[0], picref->linesize[0], 256, 256, mod); break; + case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 256, 256, mod); break; + case TEST_FREQ_LUMA: freq_test(picref->data[0], picref->linesize[0], mod); break; + case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], mod); break; + case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], mod); break; + case TEST_AMP_CHROMA: amp_test(picref->data[1], picref->linesize[1], mod); break; + case TEST_CBP: cbp_test(picref->data , picref->linesize , mod); break; + case TEST_MV: mv_test(picref->data[0], picref->linesize[0], mod); break; + case TEST_RING1: ring1_test(picref->data[0], picref->linesize[0], mod); break; + case TEST_RING2: ring2_test(picref->data[0], picref->linesize[0], mod); break; } return ff_filter_frame(outlink, picref);