diff mbox series

[FFmpeg-devel,2/5] avfilter/vf_codecview: added new options for block

Message ID 1632198725-19424-2-git-send-email-lance.lmwang@gmail.com
State New
Headers show
Series [FFmpeg-devel,1/5] avcodec: remove the unused low_delay
Related show

Commit Message

Limin Wang Sept. 21, 2021, 4:32 a.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 doc/filters.texi           |  3 +++
 libavfilter/version.h      |  2 +-
 libavfilter/vf_codecview.c | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 1 deletion(-)

Comments

Limin Wang Sept. 28, 2021, 1:25 p.m. UTC | #1
On Tue, Sep 21, 2021 at 12:32:02PM +0800, lance.lmwang@gmail.com wrote:
> From: Limin Wang <lance.lmwang@gmail.com>
> 
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
>  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) {
> -- 
> 1.8.3.1
> 

ping. will apply the rest of patchset(1,3,4,5) tomorrow unless there are objection.
diff mbox series

Patch

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) {