[FFmpeg-cvslog] avfilter/vf_idet: add both multiple and single frame detection metadata

[Kevin Mitchell]

ffmpeg | branch: master | Kevin Mitchell <kevmitch at gmail.com> | Sun Oct 19 13:32:56 2014 -0700| [ff68ceb1b55b7801afd25186ca16e606bfd2442a] | committer: Michael Niedermayer

avfilter/vf_idet: add both multiple and single frame detection metadata

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ff68ceb1b55b7801afd25186ca16e606bfd2442a
---

 doc/filters.texi      |   28 ++++++++++++++++++++++++++++
 libavfilter/version.h |    4 ++--
 libavfilter/vf_idet.c |   13 +++++++++----
 3 files changed, 39 insertions(+), 6 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:
+
+ at table @option
+ at item single.tff
+Cumulative number of frames detected as top field first using single-frame detection.
+
+ at item multiple.tff
+Cumulative number of frames detected as top field first using multiple-frame detection.
+
+ at item single.bff
+Cumulative number of frames detected as bottom field first using single-frame detection.
+
+ at item multiple.bff
+Cumulative number of frames detected as bottom field first using multiple-frame detection.
+
+ at item single.progressive
+Cumulative number of frames detected as progressive using single-frame detection.
+
+ at item multiple.progressive
+Cumulative number of frames detected as progressive using multiple-frame detection.
+
+ at item single.undetermined
+Cumulative number of frames that could not be classified using single-frame detection.
+
+ at item multiple.undetermined
+Cumulative number of frames that could not be classified using multiple-frame detection.
+ at end table
+
 The filter accepts the following options:
 
 @table @option
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 5d97f65..2fa15eb 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -30,8 +30,8 @@
 #include "libavutil/version.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  5
-#define LIBAVFILTER_VERSION_MINOR  1
-#define LIBAVFILTER_VERSION_MICRO 106
+#define LIBAVFILTER_VERSION_MINOR  2
+#define LIBAVFILTER_VERSION_MICRO 100
 
 #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 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));
 }