Adrian Schröter 2018-03-06 16:39:30 +00:00 committed by Git OBS Bridge
parent 1be4a7de45
commit b227bcfa2c
9 changed files with 68 additions and 55 deletions

View File

@ -1,42 +0,0 @@
Index: libvpx-1.6.1/vpx/src/vpx_image.c
===================================================================
--- libvpx-1.6.1.orig/vpx/src/vpx_image.c
+++ libvpx-1.6.1/vpx/src/vpx_image.c
@@ -88,11 +88,10 @@ static vpx_image_t *img_alloc_helper(vpx
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
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 = (1 << xcs) - 1;
+ w = (d_w + align) & ~align;
+ align = (1 << ycs) - 1;
+ h = (d_h + align) & ~align;
+
+ 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;

15
_service Normal file
View File

@ -0,0 +1,15 @@
<services>
<service name="obs_scm" mode="disabled">
<param name="url">https://github.com/webmproject/libvpx.git</param>
<param name="scm">git</param>
<param name="version">1.7.0</param>
<param name="revision">v1.7.0</param>
</service>
<service mode="disabled" name="set_version" />
<service mode="buildtime" name="tar" />
<service mode="buildtime" name="recompress">
<param name="file">*.tar</param>
<param name="compression">xz</param>
</service>
</services>

View File

@ -1 +1 @@
libvpx4
libvpx5

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1c2c0c2a97fba9474943be34ee39337dee756780fc12870ba1dc68372586a819
size 1959534

3
libvpx-1.7.0.obscpio Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ceb50bbaefd2423fcd3d05bb4dda153ca67e14008bc3d753ae1ea68b9038a85
size 16864782

View File

@ -1,6 +1,8 @@
diff --git a/build/make/configure.sh b/build/make/configure.sh
index d7e40b83f..55e3281a1 100644
--- a/build/make/configure.sh
+++ b/build/make/configure.sh
@@ -697,6 +697,12 @@ process_common_toolchain() {
@@ -710,6 +710,12 @@ process_common_toolchain() {
*i[3456]86*)
tgt_isa=x86
;;
@ -13,14 +15,16 @@
*sparc*)
tgt_isa=sparc
;;
diff --git a/configure b/configure
index e5a74c6f2..55c7ba979 100755
--- a/configure
+++ b/configure
@@ -114,6 +114,8 @@ all_platforms="${all_platforms} armv7s-d
@@ -114,6 +114,8 @@ all_platforms="${all_platforms} armv7s-darwin-gcc"
all_platforms="${all_platforms} armv8-linux-gcc"
all_platforms="${all_platforms} mips32-linux-gcc"
all_platforms="${all_platforms} mips64-linux-gcc"
+all_platforms="${all_platforms} s390-linux-gcc"
+all_platforms="${all_platforms} s390x-linux-gcc"
all_platforms="${all_platforms} ppc64-linux-gcc"
all_platforms="${all_platforms} ppc64le-linux-gcc"
all_platforms="${all_platforms} sparc-solaris-gcc"
all_platforms="${all_platforms} x86-android-gcc"
all_platforms="${all_platforms} x86-darwin8-gcc"

View File

@ -1,3 +1,36 @@
-------------------------------------------------------------------
Tue Mar 6 16:30:12 UTC 2018 - adrian@suse.de
- update to version 1.7.0
This release focused on high bit depth performance (10/12 bit) and vp9
encoding improvements.
- Upgrading:
This release is ABI incompatible due to new vp9 encoder features.
Frame parallel decoding for vp9 has been removed.
- Enhancements:
vp9 encoding supports additional threads with --row-mt. This can be greater
than the number of tiles.
Two new vp9 encoder options have been added:
--corpus-complexity
--tune-content=film
Additional tooling for respecting the vp9 "level" profiles has been added.
- Bug fixes:
A variety of fuzzing issues.
vp8 threading fix for ARM.
Codec control VP9_SET_SKIP_LOOP_FILTER fixed.
Reject invalid multi resolution configurations.
- drop obsolete CVE-2017-13194.patch
- switch to git service since no tar ball at the old place anymore
- so name increase to 5
-------------------------------------------------------------------
Fri Mar 2 13:11:47 UTC 2018 - idonmez@suse.com

5
libvpx.obsinfo Normal file
View File

@ -0,0 +1,5 @@
name: libvpx
version: 1.7.0
mtime: 1516832744
commit: f80be22a1099b2a431c2796f529bb261064ec6b4

View File

@ -16,17 +16,16 @@
#
%define sover 4
%define sover 5
Name: libvpx
Version: 1.6.1
Version: 1.7.0
Release: 0
Summary: VP8/VP9 codec library
License: BSD-3-Clause AND GPL-2.0-or-later
Group: Productivity/Multimedia/Other
Url: http://www.webmproject.org/
Source0: https://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-%{version}.tar.bz2
Source0: libvpx-%{version}.tar.xz
Source1000: baselibs.conf
Patch0: CVE-2017-13194.patch
Patch1: libvpx-define-config_pic.patch
Patch2: libvpx-configure-add-s390.patch
Patch4: libvpx-armv7-use-hard-float.patch
@ -93,7 +92,6 @@ The WebM file structure is based on the Matroska container.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch4 -p1