From patchwork Mon Oct 21 10:12:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15880 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 9A1294477A2 for ; Mon, 21 Oct 2019 13:12:29 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 814BE68AFF1; Mon, 21 Oct 2019 13:12:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88D9268AF20 for ; Mon, 21 Oct 2019 13:12:23 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id a2so8122631pfo.10 for ; Mon, 21 Oct 2019 03:12:23 -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=Y/b9y5Im6/yokmRcufNnNhMxos+lfdaLSUqSZjTbg28=; b=ncZj3xV3haju/kzSvMwKfxSsolD8kHjPmhIroh2rLgPIbjQjLGo7/2uS2S7p2l3IaW G+M6Qk2UsxHMB6cYzUwYQift8fI7ztm0d9eduew8eb3gwpJDPHQR9NTGvvBY8BGsEQK2 IzX/tz24X4iQYVxelum8HsMwWKGQEVepQ5tzxIKpYhzawIBFcryD7az9E46Zi2E+Pb9G 8An34GBQiiWtsVadbm2aJziwFeBJCfJdiIw8tpPqRmk59hdL8E48GVNPhREUupiaA2cy dJ7lSC5rbhJZWES0vGrFt7uZqbYcWN3fvq14Eqe5Afx6J1H0/cpOTy9zCULRZtg4XmYt VsUw== 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=Y/b9y5Im6/yokmRcufNnNhMxos+lfdaLSUqSZjTbg28=; b=qldqEbmdCYr3LOmlhIdMgI/GAX2XzW5BflvTY2UaibrhtT9Wg568Qf9RhHkDfXDNO1 JzdphAWTl/FTIUGqJWFakokKm7MiF/JydBNbYM3/ZF82aIa4i1Mxlyg2YlhC6EbffGZ7 P3qG+Jg97NSiiikLYbXxA4nmDeo+q+0bo/MK1shLaO1Uiq720zHtNMsaD9HMGKNKgvzX /nrvKyrONagefywqa4m8WgUEE+/nFqyxAc48/YDHn74U7RFwGzw1v5wKzRfAFU9SDlmh uKhjj0i91ZpRGoXNi1yrg0F8wUZbtFrrIgJM7Uq93y1D/PeTQnpKVkmqvKBMMSqKgLyC Pu7g== X-Gm-Message-State: APjAAAWF1P7uDF0kOBhIOrO+Di3M4zzFhqcyXEhk33kiKTTkScsow5bb CeHnVZ/eKMOtcg3JKMqOLagsrG4h+nQ= X-Google-Smtp-Source: APXvYqzS8Qd8NgCC3B7Dh8RpDBX/gCyZ4dX91l94DQ8y5PKODDsgN8hPVz1jNL7FiHx9si2AleoMAg== X-Received: by 2002:a63:8ac8:: with SMTP id y191mr24986157pgd.324.1571652741633; Mon, 21 Oct 2019 03:12:21 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id w5sm14282066pfn.96.2019.10.21.03.12.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2019 03:12:21 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Oct 2019 18:12:12 +0800 Message-Id: <20191021101213.14837-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191021101213.14837-1-lance.lmwang@gmail.com> References: <20190812153953.11839-1-lance.lmwang@gmail.com> <20191021101213.14837-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v4 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 31c68939e4..2ea736b0b2 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);