[vlc-commits] contrib: aom: use a more recent version that doesn't leak on film-grain

[Steve Lhomme]

vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Sep 13 10:44:15 2018 +0200| [ecf0a7c2fd1ba4e4e1a3920259ef1b2957728b35] | committer: Tristan Matthews

contrib: aom: use a more recent version that doesn't leak on film-grain

(cherry picked from commit 9d4167e23e13a17c71a5e16a60040dc94e8032b0)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ecf0a7c2fd1ba4e4e1a3920259ef1b2957728b35
---

 ...-grain-copy-user_priv-from-the-source-img.patch | 28 ++++++++++++++++++++++
 contrib/src/aom/rules.mak                          |  3 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/contrib/src/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch b/contrib/src/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch
new file mode 100644
index 0000000000..dd27f1ab99
--- /dev/null
+++ b/contrib/src/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch
@@ -0,0 +1,28 @@
+From 8884914546ee68a440342587c4a7c9189dbc8443 Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4 at videolan.org>
+Date: Wed, 12 Sep 2018 11:18:15 +0200
+Subject: [PATCH] [film-grain] copy user_priv from the source img
+
+Since we don't return the original img we need to prive the same user_priv
+data as the aom_image_t that would be returned without film-grain.
+
+Change-Id: I6ac6c575b9ca34673018cf7533955afe4996e6fc
+---
+ av1/av1_dx_iface.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
+index 8899556ca..f5e19ea5c 100644
+--- a/av1/av1_dx_iface.c
++++ b/av1/av1_dx_iface.c
+@@ -642,6 +642,7 @@ static aom_image_t *add_grain_if_needed(aom_image_t *img,
+       *grain_img_ptr = NULL;
+     }
+   }
++  grain_img_buf->user_priv = img->user_priv;
+ 
+   return grain_img_buf;
+ }
+-- 
+2.17.0.windows.1
+
diff --git a/contrib/src/aom/rules.mak b/contrib/src/aom/rules.mak
index f6ab887dee..2916d1f62e 100644
--- a/contrib/src/aom/rules.mak
+++ b/contrib/src/aom/rules.mak
@@ -1,5 +1,5 @@
 # aom
-AOM_HASH := 3715bf25db5cdedbd8b49560903bad02d911c62f
+AOM_HASH := ce4cce47bd0eda6871cfba278f50ef82b0b5e1b0
 AOM_VERSION := v1.0.0-$(AOM_HASH)
 AOM_GITURL := https://aomedia.googlesource.com/aom/+archive/$(AOM_HASH).tar.gz
 
@@ -19,6 +19,7 @@ aom: aom-$(AOM_VERSION).tar.gz .sum-aom
 	rm -Rf $@-$(AOM_VERSION) $@
 	mkdir -p $@-$(AOM_VERSION)
 	tar xvzf "$<" -C $@-$(AOM_VERSION)
+	$(APPLY) $(SRC)/aom/0001-film-grain-copy-user_priv-from-the-source-img.patch
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/aom/aom-pthreads-win32.patch
 endif