[FFmpeg-cvslog] vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag

[Joakim Plate]

ffmpeg | branch: master | Joakim Plate <elupus at ecce.se> | Sun Jul  3 13:19:44 2011 +0200| [ab09df9deae8be0e3346e9255a80d616517c32d5] | committer: Anton Khirnov

vf_yadif: add an option to enable/disable deinterlacing based on src frame "interlaced" flag

Signed-off-by: Joakim Plate <elupus at ecce.se>
Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

 doc/filters.texi       |   14 +++++++++++++-
 libavfilter/vf_yadif.c |   28 ++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index a86b20e..f0a4381 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -1504,7 +1504,7 @@ Flip the input video vertically.
 Deinterlace the input video ("yadif" means "yet another deinterlacing
 filter").
 
-It accepts the optional parameters: @var{mode}:@var{parity}.
+It accepts the optional parameters: @var{mode}:@var{parity}:@var{auto}.
 
 @var{mode} specifies the interlacing mode to adopt, accepts one of the
 following values:
@@ -1538,6 +1538,18 @@ Default value is -1.
 If interlacing is unknown or decoder does not export this information,
 top field first will be assumed.
 
+ at var{auto] specifies if deinterlacer should trust the interlaced flag
+and only deinterlace frames marked as interlaced
+
+ at table @option
+ at item 0
+deinterlace all frames
+ at item 1
+only deinterlace frames marked as interlaced
+ at end table
+
+Default value is 0.
+
 @c man end VIDEO FILTERS
 
 @chapter Video Sources
diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 42a7219..aa5c434 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -46,6 +46,12 @@ typedef struct {
 
     int frame_pending;
 
+    /**
+     *  0: deinterlace all frames
+     *  1: only deinterlace frames marked as interlaced
+     */
+    int auto_enable;
+
     AVFilterBufferRef *cur;
     AVFilterBufferRef *next;
     AVFilterBufferRef *prev;
@@ -242,6 +248,14 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
     if (!yadif->cur)
         return;
 
+    if (yadif->auto_enable && !yadif->cur->video->interlaced) {
+        yadif->out  = avfilter_ref_buffer(yadif->cur, AV_PERM_READ);
+        avfilter_unref_buffer(yadif->prev);
+        yadif->prev = NULL;
+        avfilter_start_frame(ctx->outputs[0], yadif->out);
+        return;
+    }
+
     if (!yadif->prev)
         yadif->prev = avfilter_ref_buffer(yadif->cur, AV_PERM_READ);
 
@@ -261,6 +275,12 @@ static void end_frame(AVFilterLink *link)
     if (!yadif->out)
         return;
 
+    if (yadif->auto_enable && !yadif->cur->video->interlaced) {
+        avfilter_draw_slice(ctx->outputs[0], 0, link->h, 1);
+        avfilter_end_frame(ctx->outputs[0]);
+        return;
+    }
+
     return_frame(ctx, 0);
 }
 
@@ -301,6 +321,9 @@ static int poll_frame(AVFilterLink *link)
     }
     assert(yadif->next || !val);
 
+    if (yadif->auto_enable && yadif->next && !yadif->next->video->interlaced)
+        return val;
+
     return val * ((yadif->mode&1)+1);
 }
 
@@ -346,9 +369,10 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
 
     yadif->mode = 0;
     yadif->parity = -1;
+    yadif->auto_enable = 0;
     yadif->csp = NULL;
 
-    if (args) sscanf(args, "%d:%d", &yadif->mode, &yadif->parity);
+    if (args) sscanf(args, "%d:%d:%d", &yadif->mode, &yadif->parity, &yadif->auto_enable);
 
     yadif->filter_line = filter_line_c;
     if (HAVE_SSSE3 && cpu_flags & AV_CPU_FLAG_SSSE3)
@@ -358,7 +382,7 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
     else if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX)
         yadif->filter_line = ff_yadif_filter_line_mmx;
 
-    av_log(ctx, AV_LOG_INFO, "mode:%d parity:%d\n", yadif->mode, yadif->parity);
+    av_log(ctx, AV_LOG_INFO, "mode:%d parity:%d auto_enable:%d\n", yadif->mode, yadif->parity, yadif->auto_enable);
 
     return 0;
 }