.gitignore

@@ -1 +1,14 @@
-SOURCES/v1.7.0.tar.gz
+libvpx-0.9.1.tar.bz2
+/libvpx-v0.9.5.tar.bz2
+/libvpx-v0.9.6.tar.bz2
+/libvpx-v0.9.7.tar.bz2
+/libvpx-v0.9.7-p1.tar.bz2
+/libvpx-v1.0.0.tar.bz2
+/libvpx-v1.1.0.tar.bz2
+/libvpx-v1.2.0.tar.bz2
+/libvpx-v1.3.0.tar.bz2
+/v1.4.0.tar.gz
+/libvpx-1.5.0.tar.bz2
+/libvpx-1.6.0.tar.bz2
+/v1.6.1.tar.gz
+/v1.7.0.tar.gz

.libvpx.metadata

@@ -1 +0,0 @@
-fb3d4b80596d1e3b1a7f53757d63e7d2b3eeb7c9 SOURCES/v1.7.0.tar.gz

0001-Fix-image-width-alignment.-Enable-ImageSizeSetting-t.patch

@@ -0,0 +1,54 @@
+From 5a40c8fde11bf82cccb5bd2f57c46ab5e6262cbf Mon Sep 17 00:00:00 2001
+From: Jerome Jiang <jianj@google.com>
+Date: Wed, 27 Sep 2017 11:08:37 -0700
+Subject: [PATCH] Fix image width alignment. Enable ImageSizeSetting test.
+
+BUG=b/64710201
+
+Change-Id: I5465f6c6481d3c9a5e00fcab024cf4ae562b6b01
+
+diff --git a/vpx/src/vpx_image.c b/vpx/src/vpx_image.c
+index dba439c10..ebd3d7f74 100644
+--- a/vpx/src/vpx_image.c
++++ b/vpx/src/vpx_image.c
+@@ -88,11 +88,10 @@ static vpx_image_t *img_alloc_helper(vpx_image_t *img, vpx_img_fmt_t fmt,
+     default: ycs = 0; break;
+   }
+ 
+-  /* Calculate storage sizes given the chroma subsampling */
+-  align = (1 << xcs) - 1;
+-  w = (d_w + align) & ~align;
+-  align = (1 << ycs) - 1;
+-  h = (d_h + align) & ~align;
++  /* Calculate storage sizes. If the buffer was allocated externally, the width
++   * and height shouldn't be adjusted. */
++  w = d_w;
++  h = d_h;
+   s = (fmt & VPX_IMG_FMT_PLANAR) ? w : bps * w / 8;
+   s = (s + stride_align - 1) & ~(stride_align - 1);
+   stride_in_bytes = (fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? s * 2 : s;
+@@ -111,9 +110,18 @@ static vpx_image_t *img_alloc_helper(vpx_image_t *img, vpx_img_fmt_t fmt,
+   img->img_data = img_data;
+ 
+   if (!img_data) {
+-    const uint64_t alloc_size = (fmt & VPX_IMG_FMT_PLANAR)
+-                                    ? (uint64_t)h * s * bps / 8
+-                                    : (uint64_t)h * s;
++    uint64_t alloc_size;
++    /* Calculate storage sizes given the chroma subsampling */
++    align = xcs ? (1 << xcs) - 1 : 1;
++    w = (d_w + align - 1) & ~(align - 1);
++    align = ycs ? (1 << ycs) - 1 : 1;
++    h = (d_h + align - 1) & ~(align - 1);
++
++    s = (fmt & VPX_IMG_FMT_PLANAR) ? w : bps * w / 8;
++    s = (s + stride_align - 1) & ~(stride_align - 1);
++    stride_in_bytes = (fmt & VPX_IMG_FMT_HIGHBITDEPTH) ? s * 2 : s;
++    alloc_size = (fmt & VPX_IMG_FMT_PLANAR) ? (uint64_t)h * s * bps / 8
++                                            : (uint64_t)h * s;
+ 
+     if (alloc_size != (size_t)alloc_size) goto fail;
+ 
+-- 
+2.14.3
+

Bug-fix-in-ssse3-quantize-function.patch

@@ -0,0 +1,32 @@
+commit 0d43bd77e5f429467fbd280a7b8f7fbc0bfe1809
+Author: Yunqing Wang <yunqingwang@google.com>
+Date:   Fri Feb 7 14:27:07 2014 -0800
+
+    Bug fix in ssse3 quantize function
+    
+    A bug was reported in Issue 702: "SIGILL (Illegal instruction) when
+    transcoding with vp9 - using FFmpeg". It was reproduced and fixed.
+    
+    Change-Id: Ie32c149a89af02856084aeaf289e848a905c7700
+
+diff --git a/vp9/encoder/x86/vp9_quantize_ssse3.asm b/vp9/encoder/x86/vp9_quantize_ssse3.asm
+index db30660..48ccef8 100644
+--- a/vp9/encoder/x86/vp9_quantize_ssse3.asm
++++ b/vp9/encoder/x86/vp9_quantize_ssse3.asm
+@@ -188,7 +188,8 @@ cglobal quantize_%1, 0, %2, 15, coeff, ncoeff, skip, zbin, round, quant, \
+   pmaxsw                          m8, m7
+   pshuflw                         m7, m8, 0x1
+   pmaxsw                          m8, m7
+-  pextrw                        [r2], m8, 0
++  pextrw                          r6, m8, 0
++  mov                             [r2], r6
+   RET
+ 
+   ; skip-block, i.e. just write all zeroes
+@@ -214,5 +215,5 @@ cglobal quantize_%1, 0, %2, 15, coeff, ncoeff, skip, zbin, round, quant, \
+ %endmacro
+ 
+ INIT_XMM ssse3
+-QUANTIZE_FN b, 6
++QUANTIZE_FN b, 7
+ QUANTIZE_FN b_32x32, 7

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-8
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

libvpx-v1.0.0-pcfix.patch

@@ -0,0 +1,21 @@
+diff -up libvpx-v1.0.0/libs.mk.pcfix libvpx-v1.0.0/libs.mk
+--- libvpx-v1.0.0/libs.mk.pcfix	2012-01-27 13:36:39.000000000 -0500
++++ libvpx-v1.0.0/libs.mk	2012-05-29 10:48:27.348425023 -0400
+@@ -232,7 +232,7 @@ vpx.pc: config.mk libs.mk
+ 	$(qexec)echo '# pkg-config file from libvpx $(VERSION_STRING)' > $@
+ 	$(qexec)echo 'prefix=$(PREFIX)' >> $@
+ 	$(qexec)echo 'exec_prefix=$${prefix}' >> $@
+-	$(qexec)echo 'libdir=$${prefix}/lib' >> $@
++	$(qexec)echo 'libdir=$${prefix}/$(LIBSUBDIR)' >> $@
+ 	$(qexec)echo 'includedir=$${prefix}/include' >> $@
+ 	$(qexec)echo '' >> $@
+ 	$(qexec)echo 'Name: vpx' >> $@
+@@ -240,7 +240,7 @@ vpx.pc: config.mk libs.mk
+ 	$(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
+ 	$(qexec)echo 'Requires:' >> $@
+ 	$(qexec)echo 'Conflicts:' >> $@
+-	$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
++	$(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
+ 	$(qexec)echo 'Cflags: -I$${includedir}' >> $@
+ INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
+ INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc

libvpx-v1.1.0-pcfix.patch

@@ -0,0 +1,12 @@
+diff -up libvpx-v1.1.0/libs.mk.pcfix libvpx-v1.1.0/libs.mk
+--- libvpx-v1.1.0/libs.mk.pcfix	2012-05-29 17:07:15.786028887 -0400
++++ libvpx-v1.1.0/libs.mk	2012-05-29 17:07:19.362006037 -0400
+@@ -241,7 +241,7 @@ vpx.pc: config.mk libs.mk
+ 	$(qexec)echo 'Version: $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_PATCH)' >> $@
+ 	$(qexec)echo 'Requires:' >> $@
+ 	$(qexec)echo 'Conflicts:' >> $@
+-	$(qexec)echo 'Libs: -L$${libdir} -lvpx' >> $@
++	$(qexec)echo 'Libs: -L$${libdir} -lvpx -lm' >> $@
+ 	$(qexec)echo 'Cflags: -I$${includedir}' >> $@
+ INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
+ INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc

libvpx.pc

@@ -0,0 +1,14 @@
+prefix=@PREFIX@
+exec_prefix=@PREFIX@
+libdir=@LIBDIR@
+includedir=@INCLUDEDIR@
+
+Name: libvpx
+Description: VP8 Video Codec SDK library
+Version: 1.0.0
+URL: http://www.webmproject.org/tools/vp8-sdk/
+Requires:
+Conflicts:
+Libs: -L${libdir} -lvpx
+Libs.private:  
+Cflags: -I${includedir}/vpx/

sources

@@ -0,0 +1 @@
+SHA512 (v1.7.0.tar.gz) = 8b3b766b550f8d86907628d7ed88035f9a2612aac21542e0fd5ad35b905eb82cbe1be02a1a24afce7a3bcc4766f62611971f72724761996b392136c40a1e7ff0