|
[-]
[+]
|
Deleted |
libvpx.changes
|
| @@ -1,5 +0,0 @@
--------------------------------------------------------------------
-Sun Feb 26 11:35:31 UTC 2012 - cs@linux-administrator.com
-
-- re-import
-
|
|
[-]
[+]
|
Changed |
libvpx.spec
^
|
|
|
|
[-]
[+]
|
Added |
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
|
|
[-]
[+]
|
Added |
sectalign-nasm.patch
^
|
| @@ -0,0 +1,24 @@
+https://bugzilla.redhat.com/show_bug.cgi?id=603113#c11
+
+--- libvpx-v1.3.0/build/make/configure.sh-orig 2014-01-10 21:12:40.000000000 +0100
++++ libvpx-v1.3.0/build/make/configure.sh 2014-07-29 13:30:14.509553770 +0200
+@@ -374,7 +374,7 @@ EOF
+ readelf -WS ${TMP_O} >${TMP_X}
+ log_file ${TMP_X}
+ if ! grep -q '\.rodata .* 16$' ${TMP_X}; then
+- die "${AS} ${ASFLAGS} does not support section alignment (nasm <=2.08?)"
++ echo >&2 "${AS} ${ASFLAGS} does not support section alignment (nasm <=2.08?)"
+ fi
+ }
+
+--- libvpx-v1.3.0/vpx_ports/x86_abi_support.asm-orig 2014-07-29 14:06:26.856461360 +0200
++++ libvpx-v1.3.0/vpx_ports/x86_abi_support.asm 2014-07-29 15:00:51.772040384 +0200
+@@ -377,7 +377,7 @@ section .text
+ %elifidn __OUTPUT_FORMAT__,aout
+ %define SECTION_RODATA section .data
+ %else
+-%define SECTION_RODATA section .rodata
++%define SECTION_RODATA section .rodata align=16
+ %endif
+
+
|
|
[-]
[+]
|
Added |
vp9-nasm.patch
^
|
| @@ -0,0 +1,96 @@
+https://gerrit.chromium.org/gerrit/#/c/71007/
+
+[modified]
+
+commit 2695f18211e9b1017647af608a64d72a688ffbe7
+Author: Jan Kratochvil <jan.kratochvil@redhat.com>
+Date: Mon Jul 28 20:07:38 2014 +0200
+
+ Fix --as=nasm compatibility for new asm code.
+
+ s/movd/movq/
+ s/pmovmskb rX,/pmovmskb rXd,/
+ Add end-of-line ':' label markers.
+
+ Change-Id: Icc2c8b66af3cf72598361021699e099739f813d7
+
+diff --git a/vp9/common/x86/vp9_subpixel_8t_ssse3.asm b/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
+index fd781d4..57eee70 100644
+--- a/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
++++ b/vp9/common/x86/vp9_subpixel_8t_ssse3.asm
+@@ -18,7 +18,7 @@
+ mov rcx, 0x0400040
+
+ movdqa xmm4, [rdx] ;load filters
+- movd xmm5, rcx
++ movq xmm5, rcx
+ packsswb xmm4, xmm4
+ pshuflw xmm0, xmm4, 0b ;k0_k1
+ pshuflw xmm1, xmm4, 01010101b ;k2_k3
+@@ -624,7 +624,7 @@ sym(vp9_filter_block1d16_v8_avg_ssse3):
+ pavgb xmm0, xmm1
+ %endif
+ movd [rdi], xmm0
+-.done
++.done:
+ %endm
+
+ %macro HORIZx8_ROW 4
+@@ -661,7 +661,7 @@ sym(vp9_filter_block1d16_v8_avg_ssse3):
+ mov rcx, 0x0400040
+
+ movdqa xmm4, [rdx] ;load filters
+- movd xmm5, rcx
++ movq xmm5, rcx
+ packsswb xmm4, xmm4
+ pshuflw xmm0, xmm4, 0b ;k0_k1
+ pshuflw xmm1, xmm4, 01010101b ;k2_k3
+@@ -727,7 +727,7 @@ sym(vp9_filter_block1d16_v8_avg_ssse3):
+ pavgb xmm0, xmm1
+ %endif
+ movq [rdi], xmm0
+-.done
++.done:
+ %endm
+
+ %macro HORIZx16 1
+diff --git a/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm b/vp9/encoder/x86/vp9_quantize_ssse3_x86_64.asm
+index 508e1d4..1c97342 100644
+--- a/vp9/encoder/x86/vp9_quantize_ssse3.asm
++++ b/vp9/encoder/x86/vp9_quantize_ssse3.asm
+@@ -122,8 +122,8 @@ cglobal quantize_%1, 0, %2, 15, coeff, ncoeff, skip, zbin, round, quant, \
+ pcmpgtw m7, m6, m0 ; m7 = c[i] >= zbin
+ pcmpgtw m12, m11, m0 ; m12 = c[i] >= zbin
+ %ifidn %1, b_32x32
+- pmovmskb r6, m7
+- pmovmskb r2, m12
++ pmovmskb r6d, m7
++ pmovmskb r2d, m12
+ or r6, r2
+ jz .skip_iter
+ %endif
+diff --git a/vp9/encoder/x86/vp9_subpel_variance.asm b/vp9/encoder/x86/vp9_subpel_variance.asm
+index 1a9e4e8..e06e220 100644
+--- a/vp9/encoder/x86/vp9_subpel_variance.asm
++++ b/vp9/encoder/x86/vp9_subpel_variance.asm
+@@ -101,7 +101,6 @@ SECTION .text
+ pshufd m4, m6, 0x1
+ movd [r1], m7 ; store sse
+ paddd m6, m4
+- movd rax, m6 ; store sum as return value
+ %else ; mmsize == 8
+ pshufw m4, m6, 0xe
+ pshufw m3, m7, 0xe
+@@ -113,7 +112,11 @@ SECTION .text
+ movd [r1], m7 ; store sse
+ pshufw m4, m6, 0xe
+ paddd m6, m4
+- movd rax, m6 ; store sum as return value
++%endif
++%if ARCH_X86_64
++ movq rax, m6 ; store sum as return value
++%else
++ movd eax, m6 ; store sum as return value
+ %endif
+ RET
+ %endmacro
|
|
[-]
[+]
|
Added |
x86inc-nasm.patch
^
|
| @@ -0,0 +1,25 @@
+commit 7ddb5f599286ab4ce7de4061ab94828cdfee36c6
+Author: KO Myung-Hun <komh@chollian.net>
+Date: Tue Jul 22 10:47:20 2014 +0900
+
+ x86inc: fix compilation with NASM
+
+ Change-Id: I5978921ab1ccad6648a5bde6ad023c3e3430f5f4
+
+diff --git a/third_party/x86inc/x86inc.asm b/third_party/x86inc/x86inc.asm
+index 2134676..99453a9 100644
+--- a/third_party/x86inc/x86inc.asm
++++ b/third_party/x86inc/x86inc.asm
+@@ -234,10 +234,10 @@ ALIGNMODE k7
+ %define r%1mp %2
+ %elif ARCH_X86_64 ; memory
+ %define r%1m [rsp + stack_offset + %6]
+- %define r%1mp qword r %+ %1m
++ %define r%1mp qword r %+ %1 %+ m
+ %else
+ %define r%1m [esp + stack_offset + %6]
+- %define r%1mp dword r %+ %1m
++ %define r%1mp dword r %+ %1 %+ m
+ %endif
+ %define r%1 %2
+ %endmacro
|
|
|
Changed |
libvpx-v1.3.0.tar.bz2
^
|
|
[-]
[+]
|
Deleted |
libvpx.pc
^
|
| @@ -1,14 +0,0 @@
-prefix=@PREFIX@
-exec_prefix=@PREFIX@
-libdir=@LIBDIR@
-includedir=@INCLUDEDIR@
-
-Name: libvpx
-Description: VP8 Video Codec SDK library
-Version: 0.9.1
-URL: http://www.webmproject.org/tools/vp8-sdk/
-Requires:
-Conflicts:
-Libs: -L${libdir} -lvpx
-Libs.private:
-Cflags: -I${includedir}/vpx/
|
|
[-]
[+]
|
Changed |
libvpx.ver
^
|
| @@ -23,6 +23,7 @@
vpx_codec_register_put_frame_cb;
vpx_codec_register_put_slice_cb;
vpx_codec_set_cx_data_buf;
+vpx_codec_set_frame_buffer_functions;
vpx_codec_set_mem_map;
vpx_codec_version;
vpx_codec_version_extra_str;
@@ -32,6 +33,10 @@
vpx_codec_vp8_cx_algo;
vpx_codec_vp8_dx;
vpx_codec_vp8_dx_algo;
+vpx_codec_vp9_cx;
+vpx_codec_vp9_cx_algo;
+vpx_codec_vp9_dx;
+vpx_codec_vp9_dx_algo;
vpx_dec_control;
vpx_dec_decode;
vpx_dec_destroy;
@@ -55,4 +60,20 @@
vpx_img_free;
vpx_img_set_rect;
vpx_img_wrap;
+vpx_svc_dump_statistics;
+vpx_svc_encode;
+vpx_svc_get_buffer;
+vpx_svc_get_encode_frame_count;
+vpx_svc_get_frame_size;
+vpx_svc_get_layer_resolution;
+vpx_svc_get_message;
+vpx_svc_get_rc_stats_buffer;
+vpx_svc_get_rc_stats_buffer_size;
+vpx_svc_init;
+vpx_svc_is_keyframe;
+vpx_svc_release;
+vpx_svc_set_keyframe;
+vpx_svc_set_options;
+vpx_svc_set_quantizers;
+vpx_svc_set_scale_factors;
local: *; };
|
