From patchwork Tue Sep 21 04:32:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30395 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp2072074iob; Mon, 20 Sep 2021 21:32:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyNP7JDwRxgKFfEJDhCY7XAX9z9FtkbLK/Y+fsNxspaKXVac7wa8a6gXuxFQO16BQcP9vxL X-Received: by 2002:a17:906:a195:: with SMTP id s21mr31653579ejy.181.1632198751894; Mon, 20 Sep 2021 21:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632198751; cv=none; d=google.com; s=arc-20160816; b=W36yG5RjxlbThaIWRWkcRYIqxayKmQm5aVkp4VB17o0Gc9FkCJUPHn8NCzFhZyEBol taZF3jAFW4ZXJ4nIDvwzCmdI3OmNgShG1DhzvPmyMI4uLlFXz22IkN9odKkIu4HUTSJs dvRR0wT1pWjSBoY3y3Wbfah/xmjQWJgnHxlI/xaJpxKeApDmS0s52VQtcnxKp+y9W2Q3 Ubm/KADZRcUGZqoqNWXLaPW4/4nSMtWyLeYFu2LI8gRLRUOuykBo7Yq3K48+4C5tNdqn 8nB+QnTdnSartV2x3dalSpcUvKku93d0O+dYzwqMPwHJwiENGcwr3gRYDrmuNO3VlaOu uwDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=94QAvC9degcL56we7bSthCUR7utU4bz+EHlvFLzg2xI=; b=ocDC1iv3Y8ZLAs1Pz1Wx3nMjPA1deuUDbAYO4ofXfP7OAM87ovgxFHIsS22m0xBfUS 5DiAF2PojpB+XkA2GMIEI2PefwL83n7XQwqlPV/l041oqrJWxf2hwo4cv/10O5ssF6n6 axQ1S96hc4siSyBhoICpT0QgwxEduFF9hJ8581BanSiaKxhWoA2kcVtn+1MuhrkSI0w9 8glAlVadER2eKn5xrigFDanDTda6addBuw8cuBKcKOYExUHagT0CJlEeEPVZIHLDhkk+ yxuUOkfNs9sm8OaUUjM9oARYKH+4UG4kO5n59AYlRjlJx4tW/DAPHMec9IUnOeMUEcPX YDbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=LuPcO1sz; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b7si1343828edm.76.2021.09.20.21.32.30; Mon, 20 Sep 2021 21:32:31 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=LuPcO1sz; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C030D68ABD7; Tue, 21 Sep 2021 07:32:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C13D68ADAB for ; Tue, 21 Sep 2021 07:32:12 +0300 (EEST) Received: by mail-pj1-f48.google.com with SMTP id k23-20020a17090a591700b001976d2db364so1598400pji.2 for ; Mon, 20 Sep 2021 21:32:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nvSYGQ3BTknwWTfWPNzmR7Ldnwawnrev+dX44AIvlos=; b=LuPcO1sz1qnAnzqg2WDqGHEJ+6sY77WtNLchIL5ckE/BBJOcj1b5KDw673zQf/CJ6v rJYL7vSc125movwikFOxviUVCO4ZqKQ5+Kh7tQEKjDpbLMVqL/Dr6oX+uxCx8iExF9ar PyaeoF6/B6X9gH97Qu8E8UvEmh/KNYLGzcK7ylZ/qqhqfW5hhY4gkHKcCyc2q9k7+ke6 1fzyezDseRMdl4/ujCLtQ4/EraS5KYWn7zOsKQ+yfbEoo+cElSOv2m2XDhmZZ08dWA80 rqu7Z9f25Gb8mJLhulXdBh0v5E0RiuTKSdveOSdcoJkVdmw4Zg61AALpT9MCKPPzqrTC Xyhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nvSYGQ3BTknwWTfWPNzmR7Ldnwawnrev+dX44AIvlos=; b=dJ1ZPohhc9+d3abahkl62eKmXtiXkc0e/upXqyV6J2/8FEMTA1eWdMgcw+0Yfn4Ul9 qGRgaDrEDme2Gt+jPvty0vsD5YTwDI8NmIYifFVEwcuMxKOqbatUFYu06Pl4FnYYtBWZ YetNlOZ/ELQQaFPYYosRf7i849kHhaKWg5p7Tu0iGxZOrr8JfRcy52UucScoPRvakF2F RYJRiBrWnC4vNgDASU/M+hqoY0zsXAl4rdsn311nQ3AHIRABkPTUwnA0k/D2GphCPpHv ui17wWEpANxpGBC71tFk1ZEAxSEpOqXQ/fRkeFTBOiPmplmJb/OI8dvrFjGiSHHqwVx3 vyCw== X-Gm-Message-State: AOAM530EKoPg1Q1DBdtFqtxE6b+5NmviiwYaYzN7haIJRzjf4UxLxMsr CxQWswC9qem3S3+8eLYCt8FQKSFWlJc= X-Received: by 2002:a17:902:7d95:b0:13d:a304:1b55 with SMTP id a21-20020a1709027d9500b0013da3041b55mr12204181plm.51.1632198730885; Mon, 20 Sep 2021 21:32:10 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x24sm6670850pge.85.2021.09.20.21.32.09 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Sep 2021 21:32:10 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Sep 2021 12:32:02 +0800 Message-Id: <1632198725-19424-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> References: <1632198725-19424-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/5] avfilter/vf_codecview: added new options for block 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HJilbm/DxHcW From: Limin Wang Signed-off-by: Limin Wang --- doc/filters.texi | 3 +++ libavfilter/version.h | 2 +- libavfilter/vf_codecview.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/doc/filters.texi b/doc/filters.texi index 9416100..9caaf4d 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8152,6 +8152,9 @@ means. For example, some MPEG based codecs export motion vectors through the The filter accepts the following option: @table @option +@item block +Display block partition structure using the luma plane. + @item mv Set motion vectors to visualize. diff --git a/libavfilter/version.h b/libavfilter/version.h index 24b59ac..2688679 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 8 #define LIBAVFILTER_VERSION_MINOR 9 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c index dc3d3ac..4a2766a 100644 --- a/libavfilter/vf_codecview.c +++ b/libavfilter/vf_codecview.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/motion_vector.h" #include "libavutil/opt.h" +#include "libavutil/video_enc_params.h" #include "avfilter.h" #include "qp_table.h" #include "internal.h" @@ -52,6 +53,7 @@ typedef struct CodecViewContext { unsigned mv_type; int hsub, vsub; int qp; + int block; } CodecViewContext; #define OFFSET(x) offsetof(CodecViewContext, x) @@ -73,6 +75,7 @@ static const AVOption codecview_options[] = { CONST("if", "I-frames", FRAME_TYPE_I, "frame_type"), CONST("pf", "P-frames", FRAME_TYPE_P, "frame_type"), CONST("bf", "B-frames", FRAME_TYPE_B, "frame_type"), + { "block", "set block partitioning structure to visualize", OFFSET(block), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS }, { NULL } }; @@ -210,6 +213,21 @@ static void draw_arrow(uint8_t *buf, int sx, int sy, int ex, draw_line(buf, sx, sy, ex, ey, w, h, stride, color); } +static void draw_block_rectangle(uint8_t *buf, int sx, int sy, int w, int h, int stride, int color) +{ + for (int x = sx; x < sx + w; x++) + buf[x] = color; + + for (int y = sy; y < sy + h; y++) { + buf[sx] = color; + buf[sx + w - 1] = color; + buf += stride; + } + + for (int x = sx; x < sx + w; x++) + buf[x] = color; +} + static int filter_frame(AVFilterLink *inlink, AVFrame *frame) { AVFilterContext *ctx = inlink->dst; @@ -247,6 +265,23 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) av_freep(&qp_table); } + if (s->block) { + AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_VIDEO_ENC_PARAMS); + if (sd) { + AVVideoEncParams *par = (AVVideoEncParams*)sd->data; + const int stride = frame->linesize[0]; + + if (par->nb_blocks) { + for (int block_idx = 0; block_idx < par->nb_blocks; block_idx++) { + AVVideoBlockParams *b = av_video_enc_params_block(par, block_idx); + uint8_t *buf = frame->data[0] + b->src_y * stride; + + draw_block_rectangle(buf, b->src_x, b->src_y, b->w, b->h, stride, 100); + } + } + } + } + if (s->mv || s->mv_type) { AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS); if (sd) {