From patchwork Mon Aug 12 15:39:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14442 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 89CD5449BC0 for ; Mon, 12 Aug 2019 18:46:07 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 738B768AC00; Mon, 12 Aug 2019 18:46:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 881B668AC00 for ; Mon, 12 Aug 2019 18:46:00 +0300 (EEST) Received: by mail-pl1-f196.google.com with SMTP id c2so48013530plz.13 for ; Mon, 12 Aug 2019 08:46:00 -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=GwyXKNQ+Tc0+Mk7MlJYNcPjTqjPgeG60BjTXkbVjMUQ=; b=dHFG8Bj9QJwWIZg1KVAwppqSmAbAnHbFpAU72uQisfsV4bMrSp6uSIrdctzg2oAl2R J9AkonEvEfOLY5x9Z2cipm9lUYxehi/KBE08IeWvA2pofJ5OIRDWf5VWhR/5KrAAHDab THcGvoQIJp1iYY6hBKPtP8lz127p6z+x2i7QNXzsoysz19b6Eq1ZtcWf9BqUuyKLkp6T wjvEsXwrPB43hjLbqBdRUihRHd5zMaOf62jIiOWOMwqrJd+Z3tI5ONYSP5d56KaF5ewS AjfksltaN43HAorfJ8UmGREGm83HShwsSRPVDJOZoso6goEcli25Ex42hIwR2/Zrxe3v 6jXw== 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=GwyXKNQ+Tc0+Mk7MlJYNcPjTqjPgeG60BjTXkbVjMUQ=; b=aupMCPFGgPNbhmPgCX4yccWc2gxoW6UVbSTey/sLOHSnV08dZBnPlbiuQz0vWAKVQJ RUBmPEgNo9Jauz2/X3UPzt4sJ4B7Eiq3imnuh2KFBkU019cw78WanYH+w/AdETUD8A0X yBB4lTzDipvdruEIUmfmLfesiGVV98x6r4Tg2T63gYUqxKMGJDI2NgB3lMYntfjJQkK9 e/6prOYFGEZ5L+si9a4hV8qsOwOdla/xPM8Vuz/jCDIitVWf5QsAPK1CD5HPsZozb1JB gIGXz0HQi38he4pD5TNOlsJorju7CJVg4KJ9pXV6gXAmG10g8eMvDGIgBWnobMxd1Vid TP5A== X-Gm-Message-State: APjAAAXPJY8ccNhKos/h1RO67y7Km7CuYQYM9sK7986SCegw1aVyLGNx wS+2AYjiAUGxuGlI79hB5ns5CFTG X-Google-Smtp-Source: APXvYqy759OOUNSlZph9lU4eXGw8F8TOQTg+cptKMQ1g1v7THz6zTdcGKq5aTahAavBh0c4Q2WEUXQ== X-Received: by 2002:a17:902:e2:: with SMTP id a89mr33922434pla.210.1565624404218; Mon, 12 Aug 2019 08:40:04 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id a4sm2389781pfi.55.2019.08.12.08.40.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Aug 2019 08:40:03 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Aug 2019 23:39:52 +0800 Message-Id: <20190812153953.11839-2-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 v2 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..14e66fd 100644 --- a/libavfilter/vsrc_mptestsrc.c +++ b/libavfilter/vsrc_mptestsrc.c @@ -308,7 +308,7 @@ 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; enum test_type tt = test->test; int i; @@ -327,20 +327,21 @@ 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); + frame = frame/test->max_frames; + if (tt == TEST_ALL && frame) /* 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, frame); break; + case TEST_DC_CHROMA: dc_test(picref->data[1], picref->linesize[1], 256, 256, frame); break; + case TEST_FREQ_LUMA: freq_test(picref->data[0], picref->linesize[0], frame); break; + case TEST_FREQ_CHROMA: freq_test(picref->data[1], picref->linesize[1], frame); break; + case TEST_AMP_LUMA: amp_test(picref->data[0], picref->linesize[0], frame); break; + case TEST_AMP_CHROMA: amp_test(picref->data[1], picref->linesize[1], frame); break; + case TEST_CBP: cbp_test(picref->data , picref->linesize , frame); break; + case TEST_MV: mv_test(picref->data[0], picref->linesize[0], frame); break; + case TEST_RING1: ring1_test(picref->data[0], picref->linesize[0], frame); break; + case TEST_RING2: ring2_test(picref->data[0], picref->linesize[0], frame); break; } return ff_filter_frame(outlink, picref);