[FFmpeg-cvslog] Support 16-bit in yadif

[James Darnley]

ffmpeg | branch: master | James Darnley <james.darnley at gmail.com> | Wed Nov 24 21:25:09 2010 +0100| [457be6962bd257f0b76f7e824b2bcbdb0c8cf105] | committer: Michael Niedermayer

Support 16-bit in yadif

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

 libavfilter/vf_yadif.c |   72 +++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 71 insertions(+), 1 deletions(-)

diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
index 52fd7df..c239afe 100644
--- a/libavfilter/vf_yadif.c
+++ b/libavfilter/vf_yadif.c
@@ -118,6 +118,69 @@ static void filter_line_c(uint8_t *dst,
     }
 }
 
+static void filter_line_c_16bit(uint16_t *dst,
+                                uint16_t *prev, uint16_t *cur, uint16_t *next,
+                                int w, int refs, int parity, int mode)
+{
+    int x;
+    uint16_t *prev2 = parity ? prev : cur ;
+    uint16_t *next2 = parity ? cur  : next;
+    refs /= 2;
+    for (x = 0;  x < w; x++) {
+        int c = cur[-refs];
+        int d = (prev2[0] + next2[0])>>1;
+        int e = cur[+refs];
+        int temporal_diff0 = FFABS(prev2[0] - next2[0]);
+        int temporal_diff1 =(FFABS(prev[-refs] - c) + FFABS(prev[+refs] - e) )>>1;
+        int temporal_diff2 =(FFABS(next[-refs] - c) + FFABS(next[+refs] - e) )>>1;
+        int diff = FFMAX3(temporal_diff0>>1, temporal_diff1, temporal_diff2);
+        int spatial_pred = (c+e)>>1;
+        int spatial_score = FFABS(cur[-refs-1] - cur[+refs-1]) + FFABS(c-e)
+                          + FFABS(cur[-refs+1] - cur[+refs+1]) - 1;
+
+#define CHECK(j)\
+    {   int score = FFABS(cur[-refs-1+j] - cur[+refs-1-j])\
+                  + FFABS(cur[-refs  +j] - cur[+refs  -j])\
+                  + FFABS(cur[-refs+1+j] - cur[+refs+1-j]);\
+        if (score < spatial_score) {\
+            spatial_score= score;\
+            spatial_pred= (cur[-refs  +j] + cur[+refs  -j])>>1;\
+
+        CHECK(-1) CHECK(-2) }} }}
+        CHECK( 1) CHECK( 2) }} }}
+
+        if (mode < 2) {
+            int b = (prev2[-2*refs] + next2[-2*refs])>>1;
+            int f = (prev2[+2*refs] + next2[+2*refs])>>1;
+#if 0
+            int a = cur[-3*refs];
+            int g = cur[+3*refs];
+            int max = FFMAX3(d-e, d-c, FFMIN3(FFMAX(b-c,f-e),FFMAX(b-c,b-a),FFMAX(f-g,f-e)) );
+            int min = FFMIN3(d-e, d-c, FFMAX3(FFMIN(b-c,f-e),FFMIN(b-c,b-a),FFMIN(f-g,f-e)) );
+#else
+            int max = FFMAX3(d-e, d-c, FFMIN(b-c, f-e));
+            int min = FFMIN3(d-e, d-c, FFMAX(b-c, f-e));
+#endif
+
+            diff = FFMAX3(diff, min, -max);
+        }
+
+        if (spatial_pred > d + diff)
+           spatial_pred = d + diff;
+        else if (spatial_pred < d - diff)
+           spatial_pred = d - diff;
+
+        dst[0] = spatial_pred;
+
+        dst++;
+        cur++;
+        prev++;
+        next++;
+        prev2++;
+        next2++;
+    }
+}
+
 static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
                    int parity, int tff)
 {
@@ -128,6 +191,7 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
         int w = dstpic->video->w;
         int h = dstpic->video->h;
         int refs = yadif->cur->linesize[i];
+        int df = (yadif->csp->comp[i].depth_minus1+1) / 8;
 
         if (i) {
         /* Why is this not part of the per-plane description thing? */
@@ -145,7 +209,7 @@ static void filter(AVFilterContext *ctx, AVFilterBufferRef *dstpic,
                 yadif->filter_line(dst, prev, cur, next, w, y+1<h ? refs : -refs, y ? -refs : refs, parity ^ tff, mode);
             } else {
                 memcpy(&dstpic->data[i][y*dstpic->linesize[i]],
-                       &yadif->cur->data[i][y*refs], w);
+                       &yadif->cur->data[i][y*refs], w*df);
             }
         }
     }
@@ -191,6 +255,8 @@ static void return_frame(AVFilterContext *ctx, int is_second)
 
     if (!yadif->csp)
         yadif->csp = &av_pix_fmt_descriptors[link->format];
+    if (yadif->csp->comp[0].depth_minus1 == 15)
+        yadif->filter_line = filter_line_c_16bit;
 
     filter(ctx, yadif->out, tff ^ !is_second, tff);
 
@@ -311,8 +377,12 @@ static int query_formats(AVFilterContext *ctx)
         PIX_FMT_YUVJ420P,
         PIX_FMT_YUVJ422P,
         PIX_FMT_YUVJ444P,
+        AV_NE( PIX_FMT_GRAY16BE, PIX_FMT_GRAY16LE ),
         PIX_FMT_YUV440P,
         PIX_FMT_YUVJ440P,
+        AV_NE( PIX_FMT_YUV420P16BE, PIX_FMT_YUV420P16LE ),
+        AV_NE( PIX_FMT_YUV422P16BE, PIX_FMT_YUV422P16LE ),
+        AV_NE( PIX_FMT_YUV444P16BE, PIX_FMT_YUV444P16LE ),
         PIX_FMT_NONE
     };