On Mon, Aug 31, 2015 at 04:43:15PM +0200, Michael Niedermayer wrote: > On Mon, Aug 31, 2015 at 03:29:03PM +0200, Clément Bœsch wrote: > > From: Clément Bœsch <clem...@stupeflix.com> > > > > --- > > I'm not sure I'm doing the correct thing here, but maybe that's just > > because my > > samples aren't relevant. > > i tried > ./ffplay tests/data/fate/vsynth1-mpeg4-qprd.avi -debug 8192 > ./ffplay tests/data/fate/vsynth1-mpeg4-qprd.avi -flags2 +export_mvs -vf > codecview=qp=1 > > the output looks quite different
Ah, indeed. The normalized QP is scaled in [0;63] so I fixed the filter to rescale the value the same way as in mpeg video debug code. New patch attached. -- Clément B.
From 6fc6784793adb65b7e149d7d037460de411f9b39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= <clem...@stupeflix.com>
Date: Mon, 31 Aug 2015 15:18:34 +0200
Subject: [PATCH] avfilter/codecview: add QP support
---
doc/filters.texi | 3 +++
libavfilter/vf_codecview.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 45 insertions(+), 1 deletion(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index bf299ca..8e0ed5d 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -4061,6 +4061,9 @@ forward predicted MVs of B-frames
@item bb
backward predicted MVs of B-frames
@end table
+
+@item qp
+Display quantization parameters using the chroma planes
@end table
@subsection Examples
diff --git a/libavfilter/vf_codecview.c b/libavfilter/vf_codecview.c
index 7a59b10..ecf000c 100644
--- a/libavfilter/vf_codecview.c
+++ b/libavfilter/vf_codecview.c
@@ -27,7 +27,6 @@
* libavcodec/mpegvideo.c.
*
* TODO: segmentation
- * TODO: quantization
*/
#include "libavutil/imgutils.h"
@@ -43,6 +42,8 @@
typedef struct {
const AVClass *class;
unsigned mv;
+ int hsub, vsub;
+ int qp;
} CodecViewContext;
#define OFFSET(x) offsetof(CodecViewContext, x)
@@ -52,6 +53,7 @@ static const AVOption codecview_options[] = {
{"pf", "forward predicted MVs of P-frames", 0, AV_OPT_TYPE_CONST, {.i64 = MV_P_FOR }, INT_MIN, INT_MAX, FLAGS, "mv"},
{"bf", "forward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = MV_B_FOR }, INT_MIN, INT_MAX, FLAGS, "mv"},
{"bb", "backward predicted MVs of B-frames", 0, AV_OPT_TYPE_CONST, {.i64 = MV_B_BACK }, INT_MIN, INT_MAX, FLAGS, "mv"},
+ { "qp", NULL, OFFSET(qp), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, .flags = FLAGS },
{ NULL }
};
@@ -198,6 +200,31 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
CodecViewContext *s = ctx->priv;
AVFilterLink *outlink = ctx->outputs[0];
+ if (s->qp) {
+ int qstride, qp_type;
+ int8_t *qp_table = av_frame_get_qp_table(frame, &qstride, &qp_type);
+
+ if (qp_table) {
+ int x, y;
+ const int w = FF_CEIL_RSHIFT(frame->width, s->hsub);
+ const int h = FF_CEIL_RSHIFT(frame->height, s->vsub);
+ uint8_t *pu = frame->data[1];
+ uint8_t *pv = frame->data[2];
+ const int lzu = frame->linesize[1];
+ const int lzv = frame->linesize[2];
+
+ for (y = 0; y < h; y++) {
+ for (x = 0; x < w; x++) {
+ const int qp = ff_norm_qscale(qp_table[(y >> 3) * qstride + (x >> 3)], qp_type) * 128/31;
+ pu[x] = pv[x] = qp;
+ }
+ pu += lzu;
+ pv += lzv;
+ }
+ }
+ }
+
+ if (s->mv) {
AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_MOTION_VECTORS);
if (sd) {
int i;
@@ -213,14 +240,28 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame)
100, 0, mv->source > 0);
}
}
+ }
+
return ff_filter_frame(outlink, frame);
}
+static int config_input(AVFilterLink *inlink)
+{
+ AVFilterContext *ctx = inlink->dst;
+ CodecViewContext *s = ctx->priv;
+ const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format);
+
+ s->hsub = desc->log2_chroma_w;
+ s->vsub = desc->log2_chroma_h;
+ return 0;
+}
+
static const AVFilterPad codecview_inputs[] = {
{
.name = "default",
.type = AVMEDIA_TYPE_VIDEO,
.filter_frame = filter_frame,
+ .config_props = config_input,
.needs_writable = 1,
},
{ NULL }
--
2.6.3
signature.asc
Description: PGP signature
_______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
