Removed the unrelated documentation changes, used uint64_t instead of float.
From 0fc44ce601266e94fb8c6137091f3eb91616a235 Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <[email protected]>
Date: Sun, 2 Nov 2014 04:37:13 -0800
Subject: [PATCH 1/2] avfilter/vf_idet: add a "half_life" option for statistics
This can be useful for videos in which the interlacing pattern changes.
Also log the total number of frames as metadata and with avlog.
---
doc/filters.texi | 8 ++++++
libavfilter/version.h | 2 +-
libavfilter/vf_idet.c | 79 +++++++++++++++++++++++++++++++++++----------------
libavfilter/vf_idet.h | 9 ++++--
4 files changed, 71 insertions(+), 27 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 33f842b..03bd1c6 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5583,6 +5583,9 @@ Multiple frame detection incorporates the classification history of previous fra
The filter will log these metadata values:
@table @option
+@item frames_total
+Total number of frames considered in current statistics.
+
@item single.current_frame
Detected type of current frame using single-frame detection. One of:
``tff'' (top field first), ``bff'' (bottom field first),
@@ -5625,6 +5628,11 @@ The filter accepts the following options:
Set interlacing threshold.
@item prog_thres
Set progressive threshold.
+@item half_life
+Number of frames after which a given frame's contribution to the
+statistics is halved (i.e., it contributes only 0.5 to it's
+classification). The default of 0 means that all frames seen are given
+full weight of 1.0 forever.
@end table
@section il
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 440c587..dab9b45 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -31,7 +31,7 @@
#define LIBAVFILTER_VERSION_MAJOR 5
#define LIBAVFILTER_VERSION_MINOR 2
-#define LIBAVFILTER_VERSION_MICRO 101
+#define LIBAVFILTER_VERSION_MICRO 102
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
index 6f99f39..4adadd4 100644
--- a/libavfilter/vf_idet.c
+++ b/libavfilter/vf_idet.c
@@ -32,6 +32,7 @@
static const AVOption idet_options[] = {
{ "intl_thres", "set interlacing threshold", OFFSET(interlace_threshold), AV_OPT_TYPE_FLOAT, {.dbl = 1.04}, -1, FLT_MAX, FLAGS },
{ "prog_thres", "set progressive threshold", OFFSET(progressive_threshold), AV_OPT_TYPE_FLOAT, {.dbl = 1.5}, -1, FLT_MAX, FLAGS },
+ { "half_life", "half life of cumulative statistics", OFFSET(half_life), AV_OPT_TYPE_FLOAT, {.dbl = 0.0}, -1, INT_MAX, FLAGS },
{ NULL }
};
@@ -48,6 +49,14 @@ static const char *type2str(Type type)
return NULL;
}
+static int av_dict_set_float(AVDictionary **pm, const char *key, float value,
+ int flags)
+{
+ char valuestr[22];
+ snprintf(valuestr, sizeof(valuestr), "%.1f", value);
+ return av_dict_set(pm, key, valuestr, flags);
+}
+
int ff_idet_filter_line_c(const uint8_t *a, const uint8_t *b, const uint8_t *c, int w)
{
int x;
@@ -74,6 +83,26 @@ int ff_idet_filter_line_c_16bit(const uint16_t *a, const uint16_t *b, const uint
return ret;
}
+static void log_cumulative_stats(AVFilterContext *ctx)
+{
+ IDETContext *idet = ctx->priv;
+
+ av_log(ctx, AV_LOG_INFO, "Single frame detection: TFF:%6.1f BFF:%6.1f Progressive:%6.1f Undetermined:%6.1f Total: %6.1f\n",
+ idet->prestat[TFF] / PRECISION,
+ idet->prestat[BFF] / PRECISION,
+ idet->prestat[PROGRESSIVE] / PRECISION,
+ idet->prestat[UNDETERMINED] / PRECISION,
+ idet->total / PRECISION
+ );
+ av_log(ctx, AV_LOG_INFO, "Multi frame detection: TFF:%6.1f BFF:%6.1f Progressive:%6.1f Undetermined:%6.1f Total: %6.1f\n",
+ idet->poststat[TFF] / PRECISION,
+ idet->poststat[BFF] / PRECISION,
+ idet->poststat[PROGRESSIVE] / PRECISION,
+ idet->poststat[UNDETERMINED] / PRECISION,
+ idet->total / PRECISION
+ );
+}
+
static void filter(AVFilterContext *ctx)
{
IDETContext *idet = ctx->priv;
@@ -146,23 +175,31 @@ static void filter(AVFilterContext *ctx)
idet->cur->interlaced_frame = 0;
}
- idet->prestat [ type] ++;
- idet->poststat[idet->last_type] ++;
+ idet->total = (uint64_t) round(idet->total * idet->decay_coefficient);
+ for(i=0; i<4; i++){
+ idet->prestat [i] = (uint64_t) round(idet->prestat [i] * idet->decay_coefficient);
+ idet->poststat[i] = (uint64_t) round(idet->poststat[i] * idet->decay_coefficient);
+ }
+
+ idet->total += (uint64_t) PRECISION;
+ idet->prestat [ type] += (uint64_t) PRECISION;
+ idet->poststat[idet->last_type] += (uint64_t) PRECISION;
av_log(ctx, AV_LOG_DEBUG, "Single frame:%12s, Multi frame:%12s\n", type2str(type), type2str(idet->last_type));
- av_dict_set (metadata, "lavfi.idet.single.current_frame", type2str(type), 0);
- av_dict_set_int(metadata, "lavfi.idet.single.tff", idet->prestat[TFF], 0);
- av_dict_set_int(metadata, "lavfi.idet.single.bff", idet->prestat[BFF], 0);
- av_dict_set_int(metadata, "lavfi.idet.single.progressive", idet->prestat[PROGRESSIVE], 0);
- av_dict_set_int(metadata, "lavfi.idet.single.undetermined", idet->prestat[UNDETERMINED], 0);
+ av_dict_set_float(metadata, "lavfi.idet.frames_total", idet->total / PRECISION, 0);
- av_dict_set (metadata, "lavfi.idet.multiple.current_frame", type2str(idet->last_type), 0);
- av_dict_set_int(metadata, "lavfi.idet.multiple.tff", idet->poststat[TFF], 0);
- av_dict_set_int(metadata, "lavfi.idet.multiple.bff", idet->poststat[BFF], 0);
- av_dict_set_int(metadata, "lavfi.idet.multiple.progressive", idet->poststat[PROGRESSIVE], 0);
- av_dict_set_int(metadata, "lavfi.idet.multiple.undetermined", idet->poststat[UNDETERMINED], 0);
+ av_dict_set (metadata, "lavfi.idet.single.current_frame", type2str(type), 0);
+ av_dict_set_float(metadata, "lavfi.idet.single.tff", idet->prestat[TFF] / PRECISION, 0);
+ av_dict_set_float(metadata, "lavfi.idet.single.bff", idet->prestat[BFF] / PRECISION, 0);
+ av_dict_set_float(metadata, "lavfi.idet.single.progressive", idet->prestat[PROGRESSIVE] / PRECISION, 0);
+ av_dict_set_float(metadata, "lavfi.idet.single.undetermined", idet->prestat[UNDETERMINED] / PRECISION, 0);
+ av_dict_set (metadata, "lavfi.idet.multiple.current_frame", type2str(idet->last_type), 0);
+ av_dict_set_float(metadata, "lavfi.idet.multiple.tff", idet->poststat[TFF] / PRECISION, 0);
+ av_dict_set_float(metadata, "lavfi.idet.multiple.bff", idet->poststat[BFF] / PRECISION, 0);
+ av_dict_set_float(metadata, "lavfi.idet.multiple.progressive", idet->poststat[PROGRESSIVE] / PRECISION, 0);
+ av_dict_set_float(metadata, "lavfi.idet.multiple.undetermined", idet->poststat[UNDETERMINED] / PRECISION, 0);
}
static int filter_frame(AVFilterLink *link, AVFrame *picref)
@@ -228,18 +265,7 @@ static av_cold void uninit(AVFilterContext *ctx)
{
IDETContext *idet = ctx->priv;
- av_log(ctx, AV_LOG_INFO, "Single frame detection: TFF:%d BFF:%d Progressive:%d Undetermined:%d\n",
- idet->prestat[TFF],
- idet->prestat[BFF],
- idet->prestat[PROGRESSIVE],
- idet->prestat[UNDETERMINED]
- );
- av_log(ctx, AV_LOG_INFO, "Multi frame detection: TFF:%d BFF:%d Progressive:%d Undetermined:%d\n",
- idet->poststat[TFF],
- idet->poststat[BFF],
- idet->poststat[PROGRESSIVE],
- idet->poststat[UNDETERMINED]
- );
+ log_cumulative_stats(ctx);
av_frame_free(&idet->prev);
av_frame_free(&idet->cur );
@@ -290,6 +316,11 @@ static av_cold int init(AVFilterContext *ctx)
idet->last_type = UNDETERMINED;
memset(idet->history, UNDETERMINED, HIST_SIZE);
+ if( idet->half_life > 0 )
+ idet->decay_coefficient = pow(2.0,-1.0/idet->half_life);
+ else
+ idet->decay_coefficient = 1.0;
+
idet->filter_line = ff_idet_filter_line_c;
if (ARCH_X86)
diff --git a/libavfilter/vf_idet.h b/libavfilter/vf_idet.h
index 57332df..ffebe66 100644
--- a/libavfilter/vf_idet.h
+++ b/libavfilter/vf_idet.h
@@ -23,6 +23,7 @@
#include "avfilter.h"
#define HIST_SIZE 4
+#define PRECISION 1.0e6
typedef int (*ff_idet_filter_func)(const uint8_t *a, const uint8_t *b, const uint8_t *c, int w);
@@ -37,16 +38,20 @@ typedef struct {
const AVClass *class;
float interlace_threshold;
float progressive_threshold;
+ float half_life;
+ float decay_coefficient;
Type last_type;
- int prestat[4];
- int poststat[4];
+ uint64_t total;
+ uint64_t prestat[4];
+ uint64_t poststat[4];
uint8_t history[HIST_SIZE];
AVFrame *cur;
AVFrame *next;
AVFrame *prev;
+
ff_idet_filter_func filter_line;
const AVPixFmtDescriptor *csp;
--
2.1.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
