I've bumped the minor (not micro) version. I hope that's what was
wanted. I also added the requested documentation of the metadata
fields. Sorry I guess I was following the bad convention that most of
the filter metadata isn't documented.
On Sun, Oct 19, 2014 at 2:38 PM, Clément Bœsch <u...@pkh.me> wrote:
> On Sun, Oct 19, 2014 at 02:34:40PM -0700, Kevin Mitchell wrote:
>> Doh. Not having a good day. Use consistent metadata tags.
>>
>> On Sun, Oct 19, 2014 at 1:37 PM, Kevin Mitchell <kevmi...@gmail.com> wrote:
>> > Thanks for the quick merge. Unfortunately, i realized i only added the
>> > metadata for single frame detection. This patch adds both single and
>> > multiple frame detection.
>
>> From 36235c82dee67b568aacee919f5b357102c0e2f6 Mon Sep 17 00:00:00 2001
>> From: Kevin Mitchell <kevmi...@gmail.com>
>> Date: Sun, 19 Oct 2014 13:32:56 -0700
>> Subject: [PATCH] avfilter/vf_idet: add both multiple and single frame
>> detection metadata
>>
>> ---
>> libavfilter/vf_idet.c | 13 +++++++++----
>> 1 file changed, 9 insertions(+), 4 deletions(-)
>>
>> diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
>> index ebbc7d2..339f4a6 100644
>> --- a/libavfilter/vf_idet.c
>> +++ b/libavfilter/vf_idet.c
>> @@ -178,10 +178,15 @@ static int filter_frame(AVFilterLink *link, AVFrame
>> *picref)
>>
>> filter(ctx);
>>
>> - av_dict_set_int(metadata, "lavfi.idet.tff", idet->prestat[TFF], 0);
>> - av_dict_set_int(metadata, "lavfi.idet.bff", idet->prestat[BFF], 0);
>> - av_dict_set_int(metadata, "lavfi.idet.progressive",
>> idet->prestat[PROGRESSIVE], 0);
>> - av_dict_set_int(metadata, "lavfi.idet.undetermined",
>> idet->prestat[UNDETERMINED], 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_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);
>>
>
> Can you bump minor avfilter version this time?
>
> And complete documentation, please.
>
> [...]
>
> --
> Clément B.
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
From 4bee6ec641d09fd9454b2ae9f1e40cc8352c4208 Mon Sep 17 00:00:00 2001
From: Kevin Mitchell <kevmi...@gmail.com>
Date: Sun, 19 Oct 2014 13:32:56 -0700
Subject: [PATCH] avfilter/vf_idet: add both multiple and single frame
detection metadata
---
doc/filters.texi | 28 ++++++++++++++++++++++++++++
libavfilter/version.h | 2 +-
libavfilter/vf_idet.c | 13 +++++++++----
3 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/doc/filters.texi b/doc/filters.texi
index c612052..c70ddf3 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5573,6 +5573,34 @@ Detect video interlacing type.
This filter tries to detect if the input is interlaced or progressive,
top or bottom field first.
+The filter will log these metadata values:
+
+@table @option
+@item single.tff
+Cumulative number of frames detected as top field first using single-frame detection.
+
+@item multiple.tff
+Cumulative number of frames detected as top field first using multiple-frame detection.
+
+@item single.bff
+Cumulative number of frames detected as bottom field first using single-frame detection.
+
+@item multiple.bff
+Cumulative number of frames detected as bottom field first using multiple-frame detection.
+
+@item single.progressive
+Cumulative number of frames detected as progressive using single-frame detection.
+
+@item multiple.progressive
+Cumulative number of frames detected as progressive using multiple-frame detection.
+
+@item single.undetermined
+Cumulative number of frames that could not be classified using single-frame detection.
+
+@item multiple.undetermined
+Cumulative number of frames that could not be classified using multiple-frame detection.
+@end table
+
The filter accepts the following options:
@table @option
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 5d97f65..7dcdad6 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,7 +30,7 @@
#include "libavutil/version.h"
#define LIBAVFILTER_VERSION_MAJOR 5
-#define LIBAVFILTER_VERSION_MINOR 1
+#define LIBAVFILTER_VERSION_MINOR 2
#define LIBAVFILTER_VERSION_MICRO 106
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/vf_idet.c b/libavfilter/vf_idet.c
index ebbc7d2..339f4a6 100644
--- a/libavfilter/vf_idet.c
+++ b/libavfilter/vf_idet.c
@@ -178,10 +178,15 @@ static int filter_frame(AVFilterLink *link, AVFrame *picref)
filter(ctx);
- av_dict_set_int(metadata, "lavfi.idet.tff", idet->prestat[TFF], 0);
- av_dict_set_int(metadata, "lavfi.idet.bff", idet->prestat[BFF], 0);
- av_dict_set_int(metadata, "lavfi.idet.progressive", idet->prestat[PROGRESSIVE], 0);
- av_dict_set_int(metadata, "lavfi.idet.undetermined", idet->prestat[UNDETERMINED], 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_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);
return ff_filter_frame(ctx->outputs[0], av_frame_clone(idet->cur));
}
--
2.1.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
