I made the decay multiplication fixed point. I moved all the fixed
point logic to macros which hopefully makes it easier to read.
I also removed the total_frames count since it is now likely to become
inconsistent with the actual classification totals anyway.
I've gone back to just outputting rounded integers to av_log so as not
to break scripts of people who are insane enough to try and parse it
(bash can't handle float).
I used your suggestion for formatting fixed point decimal values for
the metadata tags.
From 7171918c2f34118679412da72add7b9056e04209 Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <kevmi...@gmail.com>
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.
---
doc/filters.texi | 5 ++++
libavfilter/version.h | 2 +-
libavfilter/vf_idet.c | 79 +++++++++++++++++++++++++++++++++++----------------
libavfilter/vf_idet.h | 15 ++++++++--
4 files changed, 74 insertions(+), 27 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index 33f842b..ae08f32 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5625,6 +5625,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..d0b3aa2 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_fxp(AVDictionary **pm, const char *key, uint64_t value, int decimal_digits,
+ int flags)
+{
+ char valuestr[44];
+ snprintf(valuestr, sizeof(valuestr), "%"PRId64".%0*"PRId64, FXP_TO_DECIMAL(value, decimal_digits));
+ 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,23 @@ 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"PRId64" BFF:%6"PRId64" Progressive:%6"PRId64" Undetermined:%6"PRId64"\n",
+ FXP_TO_INT(idet->prestat[TFF]),
+ FXP_TO_INT(idet->prestat[BFF]),
+ FXP_TO_INT(idet->prestat[PROGRESSIVE]),
+ FXP_TO_INT(idet->prestat[UNDETERMINED])
+ );
+ av_log(ctx, AV_LOG_INFO, "Multi frame detection: TFF:%6"PRId64" BFF:%6"PRId64" Progressive:%6"PRId64" Undetermined:%6"PRId64"\n",
+ FXP_TO_INT(idet->poststat[TFF]),
+ FXP_TO_INT(idet->poststat[BFF]),
+ FXP_TO_INT(idet->poststat[PROGRESSIVE]),
+ FXP_TO_INT(idet->poststat[UNDETERMINED])
+ );
+}
+
static void filter(AVFilterContext *ctx)
{
IDETContext *idet = ctx->priv;
@@ -146,23 +172,34 @@ static void filter(AVFilterContext *ctx)
idet->cur->interlaced_frame = 0;
}
- idet->prestat [ type] ++;
- idet->poststat[idet->last_type] ++;
+ for(i=0; i<4; i++){
+ idet->prestat [i] = FXP_MULT(idet->decay_coefficient, idet->prestat [i]);
+ idet->poststat[i] = FXP_MULT(idet->decay_coefficient, idet->poststat[i]);
+ }
+
+ FXP_INCREMENT(idet->prestat [ type]);
+ FXP_INCREMENT(idet->poststat[idet->last_type]);
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);
+ idet->frames_since_stats ++;
+ if( idet->half_life > 0.0 &&
+ idet->frames_since_stats > idet->half_life ){
+ log_cumulative_stats(ctx);
+ idet->frames_since_stats = 0;
+ }
+
+ av_dict_set (metadata, "lavfi.idet.single.current_frame", type2str(type), 0);
+ av_dict_set_fxp(metadata, "lavfi.idet.single.tff", idet->prestat[TFF], 2 , 0);
+ av_dict_set_fxp(metadata, "lavfi.idet.single.bff", idet->prestat[BFF], 2, 0);
+ av_dict_set_fxp(metadata, "lavfi.idet.single.progressive", idet->prestat[PROGRESSIVE], 2, 0);
+ av_dict_set_fxp(metadata, "lavfi.idet.single.undetermined", idet->prestat[UNDETERMINED], 2, 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_fxp(metadata, "lavfi.idet.multiple.tff", idet->poststat[TFF], 2, 0);
+ av_dict_set_fxp(metadata, "lavfi.idet.multiple.bff", idet->poststat[BFF], 2, 0);
+ av_dict_set_fxp(metadata, "lavfi.idet.multiple.progressive", idet->poststat[PROGRESSIVE], 2, 0);
+ av_dict_set_fxp(metadata, "lavfi.idet.multiple.undetermined", idet->poststat[UNDETERMINED], 2, 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 = FLOAT_TO_FXP(pow(2.0, -1.0 / idet->half_life));
+ else
+ idet->decay_coefficient = FLOAT_TO_FXP(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..f4defff 100644
--- a/libavfilter/vf_idet.h
+++ b/libavfilter/vf_idet.h
@@ -24,6 +24,13 @@
#define HIST_SIZE 4
+#define PRECISION 1000000000
+#define FLOAT_TO_FXP(value) (uint64_t) round(PRECISION * (value) )
+#define FXP_TO_INT(value) (uint64_t) round( (value) / (double)PRECISION)
+#define FXP_TO_DECIMAL(value,digits) (value) / PRECISION, (digits), (uint64_t) round(( (value) % PRECISION) / (double) (PRECISION / pow(10.0, (digits) )))
+#define FXP_MULT(a,b) ((a) * (b)) / PRECISION
+#define FXP_INCREMENT(value) (value) += PRECISION
+
typedef int (*ff_idet_filter_func)(const uint8_t *a, const uint8_t *b, const uint8_t *c, int w);
typedef enum {
@@ -37,16 +44,20 @@ typedef struct {
const AVClass *class;
float interlace_threshold;
float progressive_threshold;
+ float half_life;
+ uint64_t decay_coefficient;
Type last_type;
- int prestat[4];
- int poststat[4];
+ uint64_t prestat[4];
+ uint64_t poststat[4];
+ uint64_t frames_since_stats;
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
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
