contrib: Replace Yadif patch with final Libav version.

Patch was modified before landing in Libav. Previous commit was 9fd048196eb423965496c14dac683e6e2546e14f. #576

2 files changed, 101 insertions, 69 deletions

diff --git a/contrib/ffmpeg/A22-yadif-bounds.patch b/contrib/ffmpeg/A22-yadif-bounds.patch
new file mode 100644
index 000000000..4368b7491
--- /dev/null
+++ b/contrib/ffmpeg/A22-yadif-bounds.patch
@@ -0,0 +1,101 @@
+From a8d69ef32f27a1084f3a55daa917468ea845d5b6 Mon Sep 17 00:00:00 2001
+From: Michael Niedermayer <[email protected]>
+Date: Mon, 21 Aug 2017 09:55:48 +0200
+Subject: [PATCH] yadif: Account for the buffer alignment while processing the
+ frame edges
+
+Avoid out of bound reads.
+
+Bug-Id: 1031
+CC: [email protected]
+Signed-off-by: Luca Barbato <[email protected]>
+(cherry picked from commit feed239021bad89743d5e7989b426ae594322eb7)
+Signed-off-by: Luca Barbato <[email protected]>
+---
+ libavfilter/vf_yadif.c | 28 +++++++++++++++++++---------
+ 1 file changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
+index 75f2d17..bef357b 100644
+--- a/libavfilter/vf_yadif.c
++++ b/libavfilter/vf_yadif.c
+@@ -40,6 +40,8 @@ typedef struct ThreadData {
+     int tff;
+ } ThreadData;
+ 
++#define MAX_ALIGN 8
++
+ #define CHECK(j)\
+     {   int score = FFABS(cur[mrefs - 1 + (j)] - cur[prefs - 1 - (j)])\
+                   + FFABS(cur[mrefs  +(j)] - cur[prefs  -(j)])\
+@@ -123,17 +125,20 @@ static void filter_edges(void *dst1, void *prev1, void *cur1, void *next1,
+     uint8_t *prev2 = parity ? prev : cur ;
+     uint8_t *next2 = parity ? cur  : next;
+ 
++    const int edge = MAX_ALIGN - 1;
++
+     /* Only edge pixels need to be processed here.  A constant value of false
+      * for is_not_edge should let the compiler ignore the whole branch. */
+     FILTER(0, 3, 0)
+ 
+-    dst  = (uint8_t*)dst1  + w - 3;
+-    prev = (uint8_t*)prev1 + w - 3;
+-    cur  = (uint8_t*)cur1  + w - 3;
+-    next = (uint8_t*)next1 + w - 3;
++    dst  = (uint8_t*)dst1  + w - edge;
++    prev = (uint8_t*)prev1 + w - edge;
++    cur  = (uint8_t*)cur1  + w - edge;
++    next = (uint8_t*)next1 + w - edge;
+     prev2 = (uint8_t*)(parity ? prev : cur);
+     next2 = (uint8_t*)(parity ? cur  : next);
+ 
++    FILTER(w - edge, w - 3, 1)
+     FILTER(w - 3, w, 0)
+ }
+ 
+@@ -166,18 +171,22 @@ static void filter_edges_16bit(void *dst1, void *prev1, void *cur1, void *next1,
+     int x;
+     uint16_t *prev2 = parity ? prev : cur ;
+     uint16_t *next2 = parity ? cur  : next;
++
++    const int edge = MAX_ALIGN / 2 - 1;
++
+     mrefs /= 2;
+     prefs /= 2;
+ 
+     FILTER(0, 3, 0)
+ 
+-    dst   = (uint16_t*)dst1  + w - 3;
+-    prev  = (uint16_t*)prev1 + w - 3;
+-    cur   = (uint16_t*)cur1  + w - 3;
+-    next  = (uint16_t*)next1 + w - 3;
++    dst   = (uint16_t*)dst1  + w - edge;
++    prev  = (uint16_t*)prev1 + w - edge;
++    cur   = (uint16_t*)cur1  + w - edge;
++    next  = (uint16_t*)next1 + w - edge;
+     prev2 = (uint16_t*)(parity ? prev : cur);
+     next2 = (uint16_t*)(parity ? cur  : next);
+ 
++    FILTER(w - edge, w - 3, 1)
+     FILTER(w - 3, w, 0)
+ }
+ 
+@@ -192,6 +201,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
+     int slice_start = jobnr * slice_h;
+     int slice_end   = (jobnr == nb_jobs - 1) ? td->h : (jobnr + 1) * slice_h;
+     int y;
++    int edge = 3 + MAX_ALIGN / df - 1;
+ 
+     /* filtering reads 3 pixels to the left/right; to avoid invalid reads,
+      * we need to call the c variant which avoids this for border pixels
+@@ -204,7 +214,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
+             uint8_t *dst  = &td->frame->data[td->plane][y * td->frame->linesize[td->plane]];
+             int     mode  = y == 1 || y + 2 == td->h ? 2 : s->mode;
+             s->filter_line(dst + pix_3, prev + pix_3, cur + pix_3,
+-                           next + pix_3, td->w - 6,
++                           next + pix_3, td->w - edge,
+                            y + 1 < td->h ? refs : -refs,
+                            y ? -refs : refs,
+                            td->parity ^ td->tff, mode);
+-- 
+2.1.4
diff --git a/contrib/ffmpeg/A22-yadif-race.patch b/contrib/ffmpeg/A22-yadif-race.patch
deleted file mode 100644
index e196c34e3..000000000
--- a/contrib/ffmpeg/A22-yadif-race.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 221f902f1dc167bdc0bfdff6b6af3214ae3cc1f4 Mon Sep 17 00:00:00 2001
-From: Michael Niedermayer <[email protected]>
-Date: Fri, 24 May 2013 17:12:58 +0200
-Subject: [PATCH] avfilter/vf_yadif: fix race condition
-
-Signed-off-by: Michael Niedermayer <[email protected]>
----
- libavfilter/vf_yadif.c | 21 ++++++++++++---------
- 1 file changed, 12 insertions(+), 9 deletions(-)
-
-diff --git a/libavfilter/vf_yadif.c b/libavfilter/vf_yadif.c
-index c26cf85ee10..124ef917d38 100644
---- a/libavfilter/vf_yadif.c
-+++ b/libavfilter/vf_yadif.c
-@@ -111,6 +111,7 @@ static void filter_line_c(void *dst1,
-     FILTER(0, w, 1)
- }
- 
-+#define MAX_ALIGN 8
- static void filter_edges(void *dst1, void *prev1, void *cur1, void *next1,
-                          int w, int prefs, int mrefs, int parity, int mode)
- {
-@@ -126,13 +127,14 @@ static void filter_edges(void *dst1, void *prev1, void *cur1, void *next1,
-      * for is_not_edge should let the compiler ignore the whole branch. */
-     FILTER(0, 3, 0)
- 
--    dst  = (uint8_t*)dst1  + w - 3;
--    prev = (uint8_t*)prev1 + w - 3;
--    cur  = (uint8_t*)cur1  + w - 3;
--    next = (uint8_t*)next1 + w - 3;
-+    dst  = (uint8_t*)dst1  + w - (MAX_ALIGN-1);
-+    prev = (uint8_t*)prev1 + w - (MAX_ALIGN-1);
-+    cur  = (uint8_t*)cur1  + w - (MAX_ALIGN-1);
-+    next = (uint8_t*)next1 + w - (MAX_ALIGN-1);
-     prev2 = (uint8_t*)(parity ? prev : cur);
-     next2 = (uint8_t*)(parity ? cur  : next);
- 
-+    FILTER(w - (MAX_ALIGN-1), w - 3, 1)
-     FILTER(w - 3, w, 0)
- }
- 
-@@ -170,13 +172,14 @@ static void filter_edges_16bit(void *dst1, void *prev1, void *cur1, void *next1,
- 
-     FILTER(0, 3, 0)
- 
--    dst   = (uint16_t*)dst1  + w - 3;
--    prev  = (uint16_t*)prev1 + w - 3;
--    cur   = (uint16_t*)cur1  + w - 3;
--    next  = (uint16_t*)next1 + w - 3;
-+    dst   = (uint16_t*)dst1  + w - (MAX_ALIGN/2-1);
-+    prev  = (uint16_t*)prev1 + w - (MAX_ALIGN/2-1);
-+    cur   = (uint16_t*)cur1  + w - (MAX_ALIGN/2-1);
-+    next  = (uint16_t*)next1 + w - (MAX_ALIGN/2-1);
-     prev2 = (uint16_t*)(parity ? prev : cur);
-     next2 = (uint16_t*)(parity ? cur  : next);
- 
-+    FILTER(w - (MAX_ALIGN/2-1), w - 3, 1)
-     FILTER(w - 3, w, 0)
- }
- 
-@@ -203,7 +206,7 @@ static int filter_slice(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs)
-             uint8_t *dst  = &td->frame->data[td->plane][y * td->frame->linesize[td->plane]];
-             int     mode  = y == 1 || y + 2 == td->h ? 2 : s->mode;
-             s->filter_line(dst + pix_3, prev + pix_3, cur + pix_3,
--                           next + pix_3, td->w - 6,
-+                           next + pix_3, td->w - (3 + MAX_ALIGN/df-1),
-                            y + 1 < td->h ? refs : -refs,
-                            y ? -refs : refs,
-                            td->parity ^ td->tff, mode);