diff --git a/SMP/SMP.patch b/SMP/SMP.patch index 5a61c6555..5466e85be 100644 --- a/SMP/SMP.patch +++ b/SMP/SMP.patch @@ -1,5 +1,5 @@ diff --git a/vp8/common/x86/idctllm_mmx.asm b/vp8/common/x86/idctllm_mmx.asm -index 5773d9d84..83ddb6b1e 100644 +index 6cea86fe0..6f06c7afa 100644 --- a/vp8/common/x86/idctllm_mmx.asm +++ b/vp8/common/x86/idctllm_mmx.asm @@ -11,6 +11,7 @@ @@ -11,7 +11,7 @@ index 5773d9d84..83ddb6b1e 100644 ; * Notes: ; * diff --git a/vp8/common/x86/idctllm_sse2.asm b/vp8/common/x86/idctllm_sse2.asm -index 560faba00..0c7ea2104 100644 +index bb79d2da3..410f3112e 100644 --- a/vp8/common/x86/idctllm_sse2.asm +++ b/vp8/common/x86/idctllm_sse2.asm @@ -11,6 +11,7 @@ @@ -23,7 +23,7 @@ index 560faba00..0c7ea2104 100644 ; ( ; short *qcoeff - 0 diff --git a/vp8/common/x86/loopfilter_block_sse2_x86_64.asm b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm -index 6a3d05290..630cb5d20 100644 +index 8d12f5385..b8e51a07f 100644 --- a/vp8/common/x86/loopfilter_block_sse2_x86_64.asm +++ b/vp8/common/x86/loopfilter_block_sse2_x86_64.asm @@ -11,6 +11,7 @@ @@ -35,7 +35,7 @@ index 6a3d05290..630cb5d20 100644 ; %1 value not preserved ; %2 value preserved diff --git a/vp8/common/x86/loopfilter_sse2.asm b/vp8/common/x86/loopfilter_sse2.asm -index 2ae028fea..387e0e8fc 100644 +index ce5c31313..defb5b7f1 100644 --- a/vp8/common/x86/loopfilter_sse2.asm +++ b/vp8/common/x86/loopfilter_sse2.asm @@ -10,6 +10,8 @@ @@ -48,7 +48,7 @@ index 2ae028fea..387e0e8fc 100644 %define _t1 _t0 + 16 %define _p3 _t1 + 16 diff --git a/vp8/common/x86/subpixel_sse2.asm b/vp8/common/x86/subpixel_sse2.asm -index 51c015e3d..e4bdb2ec3 100644 +index 94e14aed6..89acbbecd 100644 --- a/vp8/common/x86/subpixel_sse2.asm +++ b/vp8/common/x86/subpixel_sse2.asm @@ -11,6 +11,7 @@ @@ -60,7 +60,7 @@ index 51c015e3d..e4bdb2ec3 100644 %define VP8_FILTER_WEIGHT 128 %define VP8_FILTER_SHIFT 7 diff --git a/vp8/common/x86/subpixel_ssse3.asm b/vp8/common/x86/subpixel_ssse3.asm -index 8d55c9320..0bd981072 100644 +index 17247227d..a46b510f6 100644 --- a/vp8/common/x86/subpixel_ssse3.asm +++ b/vp8/common/x86/subpixel_ssse3.asm @@ -11,6 +11,7 @@ @@ -72,7 +72,7 @@ index 8d55c9320..0bd981072 100644 %define VP8_FILTER_WEIGHT 128 %define VP8_FILTER_SHIFT 7 diff --git a/vp8/encoder/x86/copy_sse3.asm b/vp8/encoder/x86/copy_sse3.asm -index 31ea898a3..bed2ed7d8 100644 +index c40b2d8bf..34c927b25 100644 --- a/vp8/encoder/x86/copy_sse3.asm +++ b/vp8/encoder/x86/copy_sse3.asm @@ -10,6 +10,7 @@ @@ -84,7 +84,7 @@ index 31ea898a3..bed2ed7d8 100644 %if ABI_IS_32BIT %define src_ptr rsi diff --git a/vp8/encoder/x86/dct_sse2.asm b/vp8/encoder/x86/dct_sse2.asm -index 4d92f0341..e2aeb2723 100644 +index 3c28cb902..c50db001c 100644 --- a/vp8/encoder/x86/dct_sse2.asm +++ b/vp8/encoder/x86/dct_sse2.asm @@ -11,6 +11,7 @@ @@ -96,7 +96,7 @@ index 4d92f0341..e2aeb2723 100644 %if ABI_IS_32BIT %define input rsi diff --git a/vpx_dsp/x86/deblock_sse2.asm b/vpx_dsp/x86/deblock_sse2.asm -index 9d8e5e3e0..377e3a16c 100644 +index b3af677d2..7b65bb4a7 100644 --- a/vpx_dsp/x86/deblock_sse2.asm +++ b/vpx_dsp/x86/deblock_sse2.asm @@ -11,6 +11,7 @@ @@ -108,7 +108,7 @@ index 9d8e5e3e0..377e3a16c 100644 %macro FIRST_2_ROWS 0 movdqa xmm4, xmm0 diff --git a/vpx_dsp/x86/sad_sse3.asm b/vpx_dsp/x86/sad_sse3.asm -index 175dcc089..d58b05f97 100644 +index acbd2e4fa..4a4e621f5 100644 --- a/vpx_dsp/x86/sad_sse3.asm +++ b/vpx_dsp/x86/sad_sse3.asm @@ -10,6 +10,7 @@ @@ -120,7 +120,7 @@ index 175dcc089..d58b05f97 100644 %if ABI_IS_32BIT %define src_ptr rsi diff --git a/vpx_dsp/x86/sad_sse4.asm b/vpx_dsp/x86/sad_sse4.asm -index 03999dfca..e376b6030 100644 +index 0818ed5f0..03912c4f4 100644 --- a/vpx_dsp/x86/sad_sse4.asm +++ b/vpx_dsp/x86/sad_sse4.asm @@ -11,6 +11,7 @@ @@ -132,7 +132,7 @@ index 03999dfca..e376b6030 100644 %if %1 movdqa xmm0, XMMWORD PTR [rsi] diff --git a/vpx_dsp/x86/sad_ssse3.asm b/vpx_dsp/x86/sad_ssse3.asm -index 7cf93cf51..5d3b3c00d 100644 +index a5bc6d730..54ab46d38 100644 --- a/vpx_dsp/x86/sad_ssse3.asm +++ b/vpx_dsp/x86/sad_ssse3.asm @@ -11,6 +11,7 @@ @@ -144,7 +144,7 @@ index 7cf93cf51..5d3b3c00d 100644 %if %1 movdqa xmm0, XMMWORD PTR [rsi] diff --git a/vpx_dsp/x86/ssim_opt_x86_64.asm b/vpx_dsp/x86/ssim_opt_x86_64.asm -index 300fa8aab..bf7eeb6e9 100644 +index 41ffbb07e..efb7759f5 100644 --- a/vpx_dsp/x86/ssim_opt_x86_64.asm +++ b/vpx_dsp/x86/ssim_opt_x86_64.asm @@ -10,6 +10,7 @@ @@ -156,7 +156,7 @@ index 300fa8aab..bf7eeb6e9 100644 %macro TABULATE_SSIM 0 paddusw xmm15, xmm3 ; sum_s diff --git a/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm b/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm -index c57149657..7ca2bb9aa 100644 +index fc301fb39..318cb2682 100644 --- a/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm +++ b/vpx_dsp/x86/vpx_high_subpixel_8t_sse2.asm @@ -11,6 +11,7 @@ @@ -168,7 +168,7 @@ index c57149657..7ca2bb9aa 100644 ;overflow. diff --git a/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm b/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm -index ec18d370e..f62a28baa 100644 +index bd51c75bc..e5f94fc76 100644 --- a/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm +++ b/vpx_dsp/x86/vpx_high_subpixel_bilinear_sse2.asm @@ -10,6 +10,7 @@ @@ -180,7 +180,7 @@ index ec18d370e..f62a28baa 100644 mov rdx, arg(5) ;filter ptr mov rsi, arg(0) ;src_ptr diff --git a/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm b/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm -index 8497e1721..81f3d0945 100644 +index c8455e13a..ba052c85f 100644 --- a/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm +++ b/vpx_dsp/x86/vpx_subpixel_8t_sse2.asm @@ -11,6 +11,7 @@ @@ -192,7 +192,7 @@ index 8497e1721..81f3d0945 100644 ;overflow. diff --git a/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm b/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm -index 6d79492e4..c0edfc0ba 100644 +index 65790b1c2..aa3f094bc 100644 --- a/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm +++ b/vpx_dsp/x86/vpx_subpixel_bilinear_sse2.asm @@ -10,6 +10,7 @@ @@ -204,7 +204,7 @@ index 6d79492e4..c0edfc0ba 100644 mov rdx, arg(5) ;filter ptr mov rsi, arg(0) ;src_ptr diff --git a/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm b/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm -index 8c9c817be..815442c56 100644 +index 32e3cd3d9..a370eeeae 100644 --- a/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm +++ b/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm @@ -10,6 +10,7 @@ diff --git a/SMP/libvpx.vcxproj b/SMP/libvpx.vcxproj index 97a59d958..a1d8f4245 100644 --- a/SMP/libvpx.vcxproj +++ b/SMP/libvpx.vcxproj @@ -231,11 +231,13 @@ + + diff --git a/SMP/libvpx.vcxproj.filters b/SMP/libvpx.vcxproj.filters index c994a4dfb..6a2d9c6b8 100644 --- a/SMP/libvpx.vcxproj.filters +++ b/SMP/libvpx.vcxproj.filters @@ -702,6 +702,12 @@ Header Files\libvpx\vpx_util + + Header Files\libvpx\vpx_ports + + + Header Files\libvpx\vpx_ports + diff --git a/SMP/vpx_version.h b/SMP/vpx_version.h index d52b80c5f..defbb27d8 100644 --- a/SMP/vpx_version.h +++ b/SMP/vpx_version.h @@ -1,8 +1,8 @@ // This file is generated. Do not edit. #define VERSION_MAJOR 1 -#define VERSION_MINOR 8 -#define VERSION_PATCH 2 +#define VERSION_MINOR 9 +#define VERSION_PATCH 0 #define VERSION_EXTRA "" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.8.2" -#define VERSION_STRING " v1.8.2" +#define VERSION_STRING_NOSP "v1.9.0" +#define VERSION_STRING " v1.9.0"