From da12dde4d22f418840bb23dee46bf102960449fb Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Wed, 25 Apr 2012 19:16:00 +0000 Subject: [PATCH] Upgrade libvpx to dba0538. BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/521002 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2119 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 2 +- third_party/libvpx/libvpx_srcs_arm.gypi | 47 +++---- third_party/libvpx/libvpx_srcs_arm_neon.gypi | 49 +++---- third_party/libvpx/libvpx_srcs_x86.gypi | 48 +++---- third_party/libvpx/libvpx_srcs_x86_64.gypi | 48 +++---- .../config/linux/ia32/asm_enc_offsets.asm | 15 +-- .../source/config/linux/ia32/vpx_rtcd.h | 122 ++++++++++-------- .../source/config/linux/ia32/vpx_version.h | 6 +- .../config/linux/x64/asm_enc_offsets.asm | 15 +-- .../libvpx/source/config/linux/x64/vpx_rtcd.h | 88 +++++++------ .../source/config/linux/x64/vpx_version.h | 6 +- .../config/mac/ia32/asm_enc_offsets.asm | 15 +-- .../libvpx/source/config/mac/ia32/vpx_rtcd.h | 122 ++++++++++-------- .../source/config/mac/ia32/vpx_version.h | 6 +- .../source/config/mac/x64/asm_enc_offsets.asm | 15 +-- .../libvpx/source/config/mac/x64/vpx_rtcd.h | 88 +++++++------ .../source/config/mac/x64/vpx_version.h | 6 +- .../config/win/ia32/asm_com_offsets.asm | 1 + .../config/win/ia32/asm_enc_offsets.asm | 15 +-- .../libvpx/source/config/win/ia32/vpx_rtcd.h | 122 ++++++++++-------- .../source/config/win/ia32/vpx_version.h | 6 +- .../source/config/win/x64/asm_com_offsets.asm | 1 + .../source/config/win/x64/asm_enc_offsets.asm | 15 +-- .../libvpx/source/config/win/x64/vpx_rtcd.h | 88 +++++++------ .../source/config/win/x64/vpx_version.h | 6 +- 25 files changed, 501 insertions(+), 451 deletions(-) diff --git a/DEPS b/DEPS index ac1107ad9e..2d0cb94c67 100644 --- a/DEPS +++ b/DEPS @@ -41,7 +41,7 @@ deps = { From("trunk/chromium_deps", "src/third_party/libjpeg_turbo"), "trunk/third_party/libvpx/source/libvpx": - "http://git.chromium.org/webm/libvpx.git@6b66c01c", + "http://git.chromium.org/webm/libvpx.git@dba05389", "trunk/third_party/libyuv": (Var("googlecode_url") % "libyuv") + "/trunk@216", diff --git a/third_party/libvpx/libvpx_srcs_arm.gypi b/third_party/libvpx/libvpx_srcs_arm.gypi index 907ffa4b44..07076c6b85 100644 --- a/third_party/libvpx/libvpx_srcs_arm.gypi +++ b/third_party/libvpx/libvpx_srcs_arm.gypi @@ -60,16 +60,17 @@ 'source/libvpx/vp8/common/idctllm.c', 'source/libvpx/vp8/common/invtrans.h', 'source/libvpx/vp8/common/loopfilter.c', - 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/loopfilter_filters.c', + 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/mbpitch.c', + 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/modecontext.c', + 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', - 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/onyxc_int.h', 'source/libvpx/vp8/common/onyxd.h', + 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/postproc.c', 'source/libvpx/vp8/common/postproc.h', 'source/libvpx/vp8/common/ppflags.h', @@ -78,9 +79,9 @@ 'source/libvpx/vp8/common/quant_common.h', 'source/libvpx/vp8/common/reconinter.c', 'source/libvpx/vp8/common/reconinter.h', - 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/reconintra4x4.c', 'source/libvpx/vp8/common/reconintra4x4.h', + 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/rtcd.c', 'source/libvpx/vp8/common/sad_c.c', 'source/libvpx/vp8/common/setupintrarecon.c', @@ -91,8 +92,8 @@ 'source/libvpx/vp8/common/threading.h', 'source/libvpx/vp8/common/treecoder.c', 'source/libvpx/vp8/common/treecoder.h', - 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/common/variance_c.c', + 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/decoder/dboolhuff.c', 'source/libvpx/vp8/decoder/dboolhuff.h', 'source/libvpx/vp8/decoder/decodemv.c', @@ -165,28 +166,11 @@ 'source/libvpx/vp8/vp8_cx_iface.c', 'source/libvpx/vp8/vp8_dx_iface.c', 'source/libvpx/vpx/internal/vpx_codec_internal.h', - 'source/libvpx/vpx/src/vpx_codec.c', - 'source/libvpx/vpx/src/vpx_decoder.c', - 'source/libvpx/vpx/src/vpx_decoder_compat.c', - 'source/libvpx/vpx/src/vpx_encoder.c', - 'source/libvpx/vpx/src/vpx_image.c', - 'source/libvpx/vpx/vp8.h', - 'source/libvpx/vpx/vp8cx.h', - 'source/libvpx/vpx/vp8dx.h', - 'source/libvpx/vpx/vp8e.h', - 'source/libvpx/vpx/vpx_codec.h', - 'source/libvpx/vpx/vpx_codec_impl_bottom.h', - 'source/libvpx/vpx/vpx_codec_impl_top.h', - 'source/libvpx/vpx/vpx_decoder.h', - 'source/libvpx/vpx/vpx_decoder_compat.h', - 'source/libvpx/vpx/vpx_encoder.h', - 'source/libvpx/vpx/vpx_image.h', - 'source/libvpx/vpx/vpx_integer.h', 'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h', 'source/libvpx/vpx_mem/vpx_mem.c', 'source/libvpx/vpx_mem/vpx_mem.h', - 'source/libvpx/vpx_ports/arm.h', 'source/libvpx/vpx_ports/arm_cpudetect.c', + 'source/libvpx/vpx_ports/arm.h', 'source/libvpx/vpx_ports/asm_offsets.h', 'source/libvpx/vpx_ports/mem.h', 'source/libvpx/vpx_ports/vpx_timer.h', @@ -202,5 +186,22 @@ 'source/libvpx/vpx_scale/vpxscale.h', 'source/libvpx/vpx_scale/yv12config.h', 'source/libvpx/vpx_scale/yv12extend.h', + 'source/libvpx/vpx/src/vpx_codec.c', + 'source/libvpx/vpx/src/vpx_decoder.c', + 'source/libvpx/vpx/src/vpx_decoder_compat.c', + 'source/libvpx/vpx/src/vpx_encoder.c', + 'source/libvpx/vpx/src/vpx_image.c', + 'source/libvpx/vpx/vp8cx.h', + 'source/libvpx/vpx/vp8dx.h', + 'source/libvpx/vpx/vp8e.h', + 'source/libvpx/vpx/vp8.h', + 'source/libvpx/vpx/vpx_codec.h', + 'source/libvpx/vpx/vpx_codec_impl_bottom.h', + 'source/libvpx/vpx/vpx_codec_impl_top.h', + 'source/libvpx/vpx/vpx_decoder_compat.h', + 'source/libvpx/vpx/vpx_decoder.h', + 'source/libvpx/vpx/vpx_encoder.h', + 'source/libvpx/vpx/vpx_image.h', + 'source/libvpx/vpx/vpx_integer.h', ], } diff --git a/third_party/libvpx/libvpx_srcs_arm_neon.gypi b/third_party/libvpx/libvpx_srcs_arm_neon.gypi index d286bf51c6..cbf9907745 100644 --- a/third_party/libvpx/libvpx_srcs_arm_neon.gypi +++ b/third_party/libvpx/libvpx_srcs_arm_neon.gypi @@ -91,16 +91,17 @@ 'source/libvpx/vp8/common/idctllm.c', 'source/libvpx/vp8/common/invtrans.h', 'source/libvpx/vp8/common/loopfilter.c', - 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/loopfilter_filters.c', + 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/mbpitch.c', + 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/modecontext.c', + 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', - 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/onyxc_int.h', 'source/libvpx/vp8/common/onyxd.h', + 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/postproc.c', 'source/libvpx/vp8/common/postproc.h', 'source/libvpx/vp8/common/ppflags.h', @@ -109,9 +110,9 @@ 'source/libvpx/vp8/common/quant_common.h', 'source/libvpx/vp8/common/reconinter.c', 'source/libvpx/vp8/common/reconinter.h', - 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/reconintra4x4.c', 'source/libvpx/vp8/common/reconintra4x4.h', + 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/rtcd.c', 'source/libvpx/vp8/common/sad_c.c', 'source/libvpx/vp8/common/setupintrarecon.c', @@ -122,8 +123,8 @@ 'source/libvpx/vp8/common/threading.h', 'source/libvpx/vp8/common/treecoder.c', 'source/libvpx/vp8/common/treecoder.h', - 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/common/variance_c.c', + 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/decoder/dboolhuff.c', 'source/libvpx/vp8/decoder/dboolhuff.h', 'source/libvpx/vp8/decoder/decodemv.c', @@ -203,34 +204,17 @@ 'source/libvpx/vp8/vp8_cx_iface.c', 'source/libvpx/vp8/vp8_dx_iface.c', 'source/libvpx/vpx/internal/vpx_codec_internal.h', - 'source/libvpx/vpx/src/vpx_codec.c', - 'source/libvpx/vpx/src/vpx_decoder.c', - 'source/libvpx/vpx/src/vpx_decoder_compat.c', - 'source/libvpx/vpx/src/vpx_encoder.c', - 'source/libvpx/vpx/src/vpx_image.c', - 'source/libvpx/vpx/vp8.h', - 'source/libvpx/vpx/vp8cx.h', - 'source/libvpx/vpx/vp8dx.h', - 'source/libvpx/vpx/vp8e.h', - 'source/libvpx/vpx/vpx_codec.h', - 'source/libvpx/vpx/vpx_codec_impl_bottom.h', - 'source/libvpx/vpx/vpx_codec_impl_top.h', - 'source/libvpx/vpx/vpx_decoder.h', - 'source/libvpx/vpx/vpx_decoder_compat.h', - 'source/libvpx/vpx/vpx_encoder.h', - 'source/libvpx/vpx/vpx_image.h', - 'source/libvpx/vpx/vpx_integer.h', 'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h', 'source/libvpx/vpx_mem/vpx_mem.c', 'source/libvpx/vpx_mem/vpx_mem.h', - 'source/libvpx/vpx_ports/arm.h', 'source/libvpx/vpx_ports/arm_cpudetect.c', + 'source/libvpx/vpx_ports/arm.h', 'source/libvpx/vpx_ports/asm_offsets.h', 'source/libvpx/vpx_ports/mem.h', 'source/libvpx/vpx_ports/vpx_timer.h', - 'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm', 'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copyframe_func_neon.asm', 'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copysrcframe_func_neon.asm', + 'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_copy_y_neon.asm', 'source/libvpx/vpx_scale/arm/neon/vp8_vpxyv12_extendframeborders_neon.asm', 'source/libvpx/vpx_scale/arm/neon/yv12extend_arm.c', 'source/libvpx/vpx_scale/arm/scalesystemdependent.c', @@ -245,5 +229,22 @@ 'source/libvpx/vpx_scale/vpxscale.h', 'source/libvpx/vpx_scale/yv12config.h', 'source/libvpx/vpx_scale/yv12extend.h', + 'source/libvpx/vpx/src/vpx_codec.c', + 'source/libvpx/vpx/src/vpx_decoder.c', + 'source/libvpx/vpx/src/vpx_decoder_compat.c', + 'source/libvpx/vpx/src/vpx_encoder.c', + 'source/libvpx/vpx/src/vpx_image.c', + 'source/libvpx/vpx/vp8cx.h', + 'source/libvpx/vpx/vp8dx.h', + 'source/libvpx/vpx/vp8e.h', + 'source/libvpx/vpx/vp8.h', + 'source/libvpx/vpx/vpx_codec.h', + 'source/libvpx/vpx/vpx_codec_impl_bottom.h', + 'source/libvpx/vpx/vpx_codec_impl_top.h', + 'source/libvpx/vpx/vpx_decoder_compat.h', + 'source/libvpx/vpx/vpx_decoder.h', + 'source/libvpx/vpx/vpx_encoder.h', + 'source/libvpx/vpx/vpx_image.h', + 'source/libvpx/vpx/vpx_integer.h', ], } diff --git a/third_party/libvpx/libvpx_srcs_x86.gypi b/third_party/libvpx/libvpx_srcs_x86.gypi index 9470c898bc..9d1fa7a467 100644 --- a/third_party/libvpx/libvpx_srcs_x86.gypi +++ b/third_party/libvpx/libvpx_srcs_x86.gypi @@ -32,16 +32,17 @@ 'source/libvpx/vp8/common/idctllm.c', 'source/libvpx/vp8/common/invtrans.h', 'source/libvpx/vp8/common/loopfilter.c', - 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/loopfilter_filters.c', + 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/mbpitch.c', + 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/modecontext.c', + 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', - 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/onyxc_int.h', 'source/libvpx/vp8/common/onyxd.h', + 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/postproc.c', 'source/libvpx/vp8/common/postproc.h', 'source/libvpx/vp8/common/ppflags.h', @@ -50,9 +51,9 @@ 'source/libvpx/vp8/common/quant_common.h', 'source/libvpx/vp8/common/reconinter.c', 'source/libvpx/vp8/common/reconinter.h', - 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/reconintra4x4.c', 'source/libvpx/vp8/common/reconintra4x4.h', + 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/rtcd.c', 'source/libvpx/vp8/common/sad_c.c', 'source/libvpx/vp8/common/setupintrarecon.c', @@ -63,8 +64,8 @@ 'source/libvpx/vp8/common/threading.h', 'source/libvpx/vp8/common/treecoder.c', 'source/libvpx/vp8/common/treecoder.h', - 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/common/variance_c.c', + 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', 'source/libvpx/vp8/common/x86/filter_x86.c', 'source/libvpx/vp8/common/x86/filter_x86.h', @@ -77,6 +78,7 @@ 'source/libvpx/vp8/common/x86/loopfilter_mmx.asm', 'source/libvpx/vp8/common/x86/loopfilter_sse2.asm', 'source/libvpx/vp8/common/x86/loopfilter_x86.c', + 'source/libvpx/vp8/common/x86/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_x86.c', @@ -171,23 +173,6 @@ 'source/libvpx/vp8/vp8_cx_iface.c', 'source/libvpx/vp8/vp8_dx_iface.c', 'source/libvpx/vpx/internal/vpx_codec_internal.h', - 'source/libvpx/vpx/src/vpx_codec.c', - 'source/libvpx/vpx/src/vpx_decoder.c', - 'source/libvpx/vpx/src/vpx_decoder_compat.c', - 'source/libvpx/vpx/src/vpx_encoder.c', - 'source/libvpx/vpx/src/vpx_image.c', - 'source/libvpx/vpx/vp8.h', - 'source/libvpx/vpx/vp8cx.h', - 'source/libvpx/vpx/vp8dx.h', - 'source/libvpx/vpx/vp8e.h', - 'source/libvpx/vpx/vpx_codec.h', - 'source/libvpx/vpx/vpx_codec_impl_bottom.h', - 'source/libvpx/vpx/vpx_codec_impl_top.h', - 'source/libvpx/vpx/vpx_decoder.h', - 'source/libvpx/vpx/vpx_decoder_compat.h', - 'source/libvpx/vpx/vpx_encoder.h', - 'source/libvpx/vpx/vpx_image.h', - 'source/libvpx/vpx/vpx_integer.h', 'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h', 'source/libvpx/vpx_mem/vpx_mem.c', 'source/libvpx/vpx_mem/vpx_mem.h', @@ -195,9 +180,9 @@ 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/mem.h', 'source/libvpx/vpx_ports/vpx_timer.h', - 'source/libvpx/vpx_ports/x86.h', 'source/libvpx/vpx_ports/x86_abi_support.asm', 'source/libvpx/vpx_ports/x86_cpuid.c', + 'source/libvpx/vpx_ports/x86.h', 'source/libvpx/vpx_scale/generic/gen_scalers.c', 'source/libvpx/vpx_scale/generic/scalesystemdependent.c', 'source/libvpx/vpx_scale/generic/vpxscale.c', @@ -208,5 +193,22 @@ 'source/libvpx/vpx_scale/vpxscale.h', 'source/libvpx/vpx_scale/yv12config.h', 'source/libvpx/vpx_scale/yv12extend.h', + 'source/libvpx/vpx/src/vpx_codec.c', + 'source/libvpx/vpx/src/vpx_decoder.c', + 'source/libvpx/vpx/src/vpx_decoder_compat.c', + 'source/libvpx/vpx/src/vpx_encoder.c', + 'source/libvpx/vpx/src/vpx_image.c', + 'source/libvpx/vpx/vp8cx.h', + 'source/libvpx/vpx/vp8dx.h', + 'source/libvpx/vpx/vp8e.h', + 'source/libvpx/vpx/vp8.h', + 'source/libvpx/vpx/vpx_codec.h', + 'source/libvpx/vpx/vpx_codec_impl_bottom.h', + 'source/libvpx/vpx/vpx_codec_impl_top.h', + 'source/libvpx/vpx/vpx_decoder_compat.h', + 'source/libvpx/vpx/vpx_decoder.h', + 'source/libvpx/vpx/vpx_encoder.h', + 'source/libvpx/vpx/vpx_image.h', + 'source/libvpx/vpx/vpx_integer.h', ], } diff --git a/third_party/libvpx/libvpx_srcs_x86_64.gypi b/third_party/libvpx/libvpx_srcs_x86_64.gypi index cec135ec39..6dc82f3c79 100644 --- a/third_party/libvpx/libvpx_srcs_x86_64.gypi +++ b/third_party/libvpx/libvpx_srcs_x86_64.gypi @@ -32,16 +32,17 @@ 'source/libvpx/vp8/common/idctllm.c', 'source/libvpx/vp8/common/invtrans.h', 'source/libvpx/vp8/common/loopfilter.c', - 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/loopfilter_filters.c', + 'source/libvpx/vp8/common/loopfilter.h', 'source/libvpx/vp8/common/mbpitch.c', + 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/modecontext.c', + 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', - 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/onyxc_int.h', 'source/libvpx/vp8/common/onyxd.h', + 'source/libvpx/vp8/common/onyx.h', 'source/libvpx/vp8/common/postproc.c', 'source/libvpx/vp8/common/postproc.h', 'source/libvpx/vp8/common/ppflags.h', @@ -50,9 +51,9 @@ 'source/libvpx/vp8/common/quant_common.h', 'source/libvpx/vp8/common/reconinter.c', 'source/libvpx/vp8/common/reconinter.h', - 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/reconintra4x4.c', 'source/libvpx/vp8/common/reconintra4x4.h', + 'source/libvpx/vp8/common/reconintra.c', 'source/libvpx/vp8/common/rtcd.c', 'source/libvpx/vp8/common/sad_c.c', 'source/libvpx/vp8/common/setupintrarecon.c', @@ -63,8 +64,8 @@ 'source/libvpx/vp8/common/threading.h', 'source/libvpx/vp8/common/treecoder.c', 'source/libvpx/vp8/common/treecoder.h', - 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/common/variance_c.c', + 'source/libvpx/vp8/common/variance.h', 'source/libvpx/vp8/common/x86/dequantize_mmx.asm', 'source/libvpx/vp8/common/x86/filter_x86.c', 'source/libvpx/vp8/common/x86/filter_x86.h', @@ -78,6 +79,7 @@ 'source/libvpx/vp8/common/x86/loopfilter_mmx.asm', 'source/libvpx/vp8/common/x86/loopfilter_sse2.asm', 'source/libvpx/vp8/common/x86/loopfilter_x86.c', + 'source/libvpx/vp8/common/x86/mfqe_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_mmx.asm', 'source/libvpx/vp8/common/x86/postproc_sse2.asm', 'source/libvpx/vp8/common/x86/postproc_x86.c', @@ -173,23 +175,6 @@ 'source/libvpx/vp8/vp8_cx_iface.c', 'source/libvpx/vp8/vp8_dx_iface.c', 'source/libvpx/vpx/internal/vpx_codec_internal.h', - 'source/libvpx/vpx/src/vpx_codec.c', - 'source/libvpx/vpx/src/vpx_decoder.c', - 'source/libvpx/vpx/src/vpx_decoder_compat.c', - 'source/libvpx/vpx/src/vpx_encoder.c', - 'source/libvpx/vpx/src/vpx_image.c', - 'source/libvpx/vpx/vp8.h', - 'source/libvpx/vpx/vp8cx.h', - 'source/libvpx/vpx/vp8dx.h', - 'source/libvpx/vpx/vp8e.h', - 'source/libvpx/vpx/vpx_codec.h', - 'source/libvpx/vpx/vpx_codec_impl_bottom.h', - 'source/libvpx/vpx/vpx_codec_impl_top.h', - 'source/libvpx/vpx/vpx_decoder.h', - 'source/libvpx/vpx/vpx_decoder_compat.h', - 'source/libvpx/vpx/vpx_encoder.h', - 'source/libvpx/vpx/vpx_image.h', - 'source/libvpx/vpx/vpx_integer.h', 'source/libvpx/vpx_mem/include/vpx_mem_intrnl.h', 'source/libvpx/vpx_mem/vpx_mem.c', 'source/libvpx/vpx_mem/vpx_mem.h', @@ -197,9 +182,9 @@ 'source/libvpx/vpx_ports/emms.asm', 'source/libvpx/vpx_ports/mem.h', 'source/libvpx/vpx_ports/vpx_timer.h', - 'source/libvpx/vpx_ports/x86.h', 'source/libvpx/vpx_ports/x86_abi_support.asm', 'source/libvpx/vpx_ports/x86_cpuid.c', + 'source/libvpx/vpx_ports/x86.h', 'source/libvpx/vpx_scale/generic/gen_scalers.c', 'source/libvpx/vpx_scale/generic/scalesystemdependent.c', 'source/libvpx/vpx_scale/generic/vpxscale.c', @@ -210,5 +195,22 @@ 'source/libvpx/vpx_scale/vpxscale.h', 'source/libvpx/vpx_scale/yv12config.h', 'source/libvpx/vpx_scale/yv12extend.h', + 'source/libvpx/vpx/src/vpx_codec.c', + 'source/libvpx/vpx/src/vpx_decoder.c', + 'source/libvpx/vpx/src/vpx_decoder_compat.c', + 'source/libvpx/vpx/src/vpx_encoder.c', + 'source/libvpx/vpx/src/vpx_image.c', + 'source/libvpx/vpx/vp8cx.h', + 'source/libvpx/vpx/vp8dx.h', + 'source/libvpx/vpx/vp8e.h', + 'source/libvpx/vpx/vp8.h', + 'source/libvpx/vpx/vpx_codec.h', + 'source/libvpx/vpx/vpx_codec_impl_bottom.h', + 'source/libvpx/vpx/vpx_codec_impl_top.h', + 'source/libvpx/vpx/vpx_decoder_compat.h', + 'source/libvpx/vpx/vpx_decoder.h', + 'source/libvpx/vpx/vpx_encoder.h', + 'source/libvpx/vpx/vpx_image.h', + 'source/libvpx/vpx/vpx_integer.h', ], } diff --git a/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm b/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm index 1b105dbc99..a8b7b42906 100644 --- a/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/linux/ia32/asm_enc_offsets.asm @@ -17,12 +17,11 @@ vp8_block_src_stride EQU 44 vp8_blockd_predictor EQU 8 vp8_writer_lowvalue EQU 0 vp8_writer_range EQU 4 -vp8_writer_value EQU 8 -vp8_writer_count EQU 12 -vp8_writer_pos EQU 16 -vp8_writer_buffer EQU 20 -vp8_writer_buffer_end EQU 24 -vp8_writer_error EQU 28 +vp8_writer_count EQU 8 +vp8_writer_pos EQU 12 +vp8_writer_buffer EQU 16 +vp8_writer_buffer_end EQU 20 +vp8_writer_error EQU 24 tokenextra_token EQU 6 tokenextra_extra EQU 4 tokenextra_context_tree EQU 0 @@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0 vp8_extra_bit_struct_prob EQU 4 vp8_extra_bit_struct_len EQU 8 vp8_extra_bit_struct_base_val EQU 12 -vp8_comp_tplist EQU 170732 +vp8_comp_tplist EQU 170696 vp8_comp_common EQU 104032 vp8_comp_bc EQU 116240 -vp8_writer_sz EQU 40 +vp8_writer_sz EQU 36 tokenlist_start EQU 0 tokenlist_stop EQU 4 TOKENLIST_SZ EQU 8 diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_rtcd.h b/third_party/libvpx/source/config/linux/ia32/vpx_rtcd.h index d435fb4617..32ab9dce32 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_rtcd.h +++ b/third_party/libvpx/source/config/linux/ia32/vpx_rtcd.h @@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_build_intra_predictors_mby_c(struct macroblockd *x); -void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x); +void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr); -#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c - -void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x); - -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr); -#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); #define vp8_intra4x4_predict vp8_intra4x4_predict_c @@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); + +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); + +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c + void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); @@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_hv)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_get_mb_ss_c(const short *); -unsigned int vp8_get_mb_ss_mmx(const short *); -unsigned int vp8_get_mb_ss_sse2(const short *); -RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *); - -unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); - -unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); - -unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); - unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); @@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); +unsigned int vp8_get_mb_ss_c(const short *); +unsigned int vp8_get_mb_ss_mmx(const short *); +unsigned int vp8_get_mb_ss_sse2(const short *); +RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *); + +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); + +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); + +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); + void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); @@ -535,15 +540,13 @@ void vpx_rtcd(void) vp8_copy_mem8x4 = vp8_copy_mem8x4_c; if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; - vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_c; - if (flags & HAS_SSE2) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3; - - - vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_c; - if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3; + vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_c; + if (flags & HAS_SSE2) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3; + vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_c; + if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3; vp8_mbpost_proc_down = vp8_mbpost_proc_down_c; @@ -564,6 +567,13 @@ void vpx_rtcd(void) + vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c; + if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2; + + vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c; + if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; + + vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c; if (flags & HAS_MMX) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_mmx; if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; @@ -653,21 +663,6 @@ void vpx_rtcd(void) if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_mmx; if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_wmt; - vp8_get_mb_ss = vp8_get_mb_ss_c; - if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx; - if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2; - - vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c; - if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx; - if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt; - - vp8_mse16x16 = vp8_mse16x16_c; - if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx; - if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt; - - vp8_get4x4sse_cs = vp8_get4x4sse_cs_c; - if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx; - vp8_sad4x4 = vp8_sad4x4_c; if (flags & HAS_MMX) vp8_sad4x4 = vp8_sad4x4_mmx; if (flags & HAS_SSE2) vp8_sad4x4 = vp8_sad4x4_wmt; @@ -736,6 +731,21 @@ void vpx_rtcd(void) vp8_sad16x16x4d = vp8_sad16x16x4d_c; if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3; + vp8_get_mb_ss = vp8_get_mb_ss_c; + if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx; + if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2; + + vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c; + if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx; + if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt; + + vp8_mse16x16 = vp8_mse16x16_c; + if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx; + if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt; + + vp8_get4x4sse_cs = vp8_get4x4sse_cs_c; + if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx; + vp8_copy32xn = vp8_copy32xn_c; if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2; if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_version.h b/third_party/libvpx/source/config/linux/ia32/vpx_version.h index 5e8336e3e1..b9c3447d02 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_version.h +++ b/third_party/libvpx/source/config/linux/ia32/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_EXTRA "108-g6b66c01" +#define VERSION_EXTRA "169-gdba0538" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01" -#define VERSION_STRING " v1.0.0-108-g6b66c01" +#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" +#define VERSION_STRING " v1.0.0-169-gdba0538" diff --git a/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm b/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm index 2a1c9586f3..ec6901f177 100644 --- a/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/linux/x64/asm_enc_offsets.asm @@ -17,12 +17,11 @@ vp8_block_src_stride EQU 84 vp8_blockd_predictor EQU 16 vp8_writer_lowvalue EQU 0 vp8_writer_range EQU 4 -vp8_writer_value EQU 8 -vp8_writer_count EQU 12 -vp8_writer_pos EQU 16 -vp8_writer_buffer EQU 24 -vp8_writer_buffer_end EQU 32 -vp8_writer_error EQU 40 +vp8_writer_count EQU 8 +vp8_writer_pos EQU 12 +vp8_writer_buffer EQU 16 +vp8_writer_buffer_end EQU 24 +vp8_writer_error EQU 32 tokenextra_token EQU 10 tokenextra_extra EQU 8 tokenextra_context_tree EQU 0 @@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0 vp8_extra_bit_struct_prob EQU 8 vp8_extra_bit_struct_len EQU 16 vp8_extra_bit_struct_base_val EQU 20 -vp8_comp_tplist EQU 173264 +vp8_comp_tplist EQU 173200 vp8_comp_common EQU 105920 vp8_comp_bc EQU 118352 -vp8_writer_sz EQU 64 +vp8_writer_sz EQU 56 tokenlist_start EQU 0 tokenlist_stop EQU 8 TOKENLIST_SZ EQU 16 diff --git a/third_party/libvpx/source/config/linux/x64/vpx_rtcd.h b/third_party/libvpx/source/config/linux/x64/vpx_rtcd.h index 4315fb1321..6d143c22f1 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_rtcd.h +++ b/third_party/libvpx/source/config/linux/x64/vpx_rtcd.h @@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx -void vp8_build_intra_predictors_mby_c(struct macroblockd *x); -void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x); +void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr); -#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c - -void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x); - -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr); -#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); #define vp8_intra4x4_predict vp8_intra4x4_predict_c @@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2 + +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2 + +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c + void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); @@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); #define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_wmt -unsigned int vp8_get_mb_ss_c(const short *); -unsigned int vp8_get_mb_ss_mmx(const short *); -unsigned int vp8_get_mb_ss_sse2(const short *); -#define vp8_get_mb_ss vp8_get_mb_ss_sse2 - -unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt - -unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_mse16x16 vp8_mse16x16_wmt - -unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx - unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); @@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); +unsigned int vp8_get_mb_ss_c(const short *); +unsigned int vp8_get_mb_ss_mmx(const short *); +unsigned int vp8_get_mb_ss_sse2(const short *); +#define vp8_get_mb_ss vp8_get_mb_ss_sse2 + +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt + +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_mse16x16 vp8_mse16x16_wmt + +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx + void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); @@ -487,12 +492,13 @@ void vpx_rtcd(void) - vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3; + vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3; + + vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3; - vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3; @@ -544,10 +550,6 @@ void vpx_rtcd(void) - - - - vp8_sad16x16 = vp8_sad16x16_wmt; if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3; @@ -598,6 +600,10 @@ void vpx_rtcd(void) vp8_sad16x16x4d = vp8_sad16x16x4d_c; if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3; + + + + vp8_copy32xn = vp8_copy32xn_sse2; if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; diff --git a/third_party/libvpx/source/config/linux/x64/vpx_version.h b/third_party/libvpx/source/config/linux/x64/vpx_version.h index 5e8336e3e1..b9c3447d02 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_version.h +++ b/third_party/libvpx/source/config/linux/x64/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_EXTRA "108-g6b66c01" +#define VERSION_EXTRA "169-gdba0538" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01" -#define VERSION_STRING " v1.0.0-108-g6b66c01" +#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" +#define VERSION_STRING " v1.0.0-169-gdba0538" diff --git a/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm b/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm index 887e6bcc0e..6b332c3019 100644 --- a/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/mac/ia32/asm_enc_offsets.asm @@ -17,12 +17,11 @@ vp8_block_src_stride EQU 44 vp8_blockd_predictor EQU 8 vp8_writer_lowvalue EQU 0 vp8_writer_range EQU 4 -vp8_writer_value EQU 8 -vp8_writer_count EQU 12 -vp8_writer_pos EQU 16 -vp8_writer_buffer EQU 20 -vp8_writer_buffer_end EQU 24 -vp8_writer_error EQU 28 +vp8_writer_count EQU 8 +vp8_writer_pos EQU 12 +vp8_writer_buffer EQU 16 +vp8_writer_buffer_end EQU 20 +vp8_writer_error EQU 24 tokenextra_token EQU 6 tokenextra_extra EQU 4 tokenextra_context_tree EQU 0 @@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0 vp8_extra_bit_struct_prob EQU 4 vp8_extra_bit_struct_len EQU 8 vp8_extra_bit_struct_base_val EQU 12 -vp8_comp_tplist EQU 170616 +vp8_comp_tplist EQU 170580 vp8_comp_common EQU 104032 vp8_comp_bc EQU 116160 -vp8_writer_sz EQU 40 +vp8_writer_sz EQU 36 tokenlist_start EQU 0 tokenlist_stop EQU 4 TOKENLIST_SZ EQU 8 diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_rtcd.h b/third_party/libvpx/source/config/mac/ia32/vpx_rtcd.h index d435fb4617..32ab9dce32 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_rtcd.h +++ b/third_party/libvpx/source/config/mac/ia32/vpx_rtcd.h @@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_build_intra_predictors_mby_c(struct macroblockd *x); -void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x); +void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr); -#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c - -void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x); - -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr); -#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); #define vp8_intra4x4_predict vp8_intra4x4_predict_c @@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); + +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); + +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c + void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); @@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_hv)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_get_mb_ss_c(const short *); -unsigned int vp8_get_mb_ss_mmx(const short *); -unsigned int vp8_get_mb_ss_sse2(const short *); -RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *); - -unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); - -unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); - -unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); - unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); @@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); +unsigned int vp8_get_mb_ss_c(const short *); +unsigned int vp8_get_mb_ss_mmx(const short *); +unsigned int vp8_get_mb_ss_sse2(const short *); +RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *); + +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); + +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); + +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); + void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); @@ -535,15 +540,13 @@ void vpx_rtcd(void) vp8_copy_mem8x4 = vp8_copy_mem8x4_c; if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; - vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_c; - if (flags & HAS_SSE2) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3; - - - vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_c; - if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3; + vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_c; + if (flags & HAS_SSE2) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3; + vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_c; + if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3; vp8_mbpost_proc_down = vp8_mbpost_proc_down_c; @@ -564,6 +567,13 @@ void vpx_rtcd(void) + vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c; + if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2; + + vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c; + if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; + + vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c; if (flags & HAS_MMX) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_mmx; if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; @@ -653,21 +663,6 @@ void vpx_rtcd(void) if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_mmx; if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_wmt; - vp8_get_mb_ss = vp8_get_mb_ss_c; - if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx; - if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2; - - vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c; - if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx; - if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt; - - vp8_mse16x16 = vp8_mse16x16_c; - if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx; - if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt; - - vp8_get4x4sse_cs = vp8_get4x4sse_cs_c; - if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx; - vp8_sad4x4 = vp8_sad4x4_c; if (flags & HAS_MMX) vp8_sad4x4 = vp8_sad4x4_mmx; if (flags & HAS_SSE2) vp8_sad4x4 = vp8_sad4x4_wmt; @@ -736,6 +731,21 @@ void vpx_rtcd(void) vp8_sad16x16x4d = vp8_sad16x16x4d_c; if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3; + vp8_get_mb_ss = vp8_get_mb_ss_c; + if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx; + if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2; + + vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c; + if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx; + if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt; + + vp8_mse16x16 = vp8_mse16x16_c; + if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx; + if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt; + + vp8_get4x4sse_cs = vp8_get4x4sse_cs_c; + if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx; + vp8_copy32xn = vp8_copy32xn_c; if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2; if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_version.h b/third_party/libvpx/source/config/mac/ia32/vpx_version.h index 5e8336e3e1..b9c3447d02 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_version.h +++ b/third_party/libvpx/source/config/mac/ia32/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_EXTRA "108-g6b66c01" +#define VERSION_EXTRA "169-gdba0538" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01" -#define VERSION_STRING " v1.0.0-108-g6b66c01" +#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" +#define VERSION_STRING " v1.0.0-169-gdba0538" diff --git a/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm b/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm index 5fcb1b0712..7cc943a09c 100644 --- a/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/mac/x64/asm_enc_offsets.asm @@ -17,12 +17,11 @@ vp8_block_src_stride EQU 84 vp8_blockd_predictor EQU 16 vp8_writer_lowvalue EQU 0 vp8_writer_range EQU 4 -vp8_writer_value EQU 8 -vp8_writer_count EQU 12 -vp8_writer_pos EQU 16 -vp8_writer_buffer EQU 24 -vp8_writer_buffer_end EQU 32 -vp8_writer_error EQU 40 +vp8_writer_count EQU 8 +vp8_writer_pos EQU 12 +vp8_writer_buffer EQU 16 +vp8_writer_buffer_end EQU 24 +vp8_writer_error EQU 32 tokenextra_token EQU 10 tokenextra_extra EQU 8 tokenextra_context_tree EQU 0 @@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0 vp8_extra_bit_struct_prob EQU 8 vp8_extra_bit_struct_len EQU 16 vp8_extra_bit_struct_base_val EQU 20 -vp8_comp_tplist EQU 173120 +vp8_comp_tplist EQU 173056 vp8_comp_common EQU 105920 vp8_comp_bc EQU 118288 -vp8_writer_sz EQU 64 +vp8_writer_sz EQU 56 tokenlist_start EQU 0 tokenlist_stop EQU 8 TOKENLIST_SZ EQU 16 diff --git a/third_party/libvpx/source/config/mac/x64/vpx_rtcd.h b/third_party/libvpx/source/config/mac/x64/vpx_rtcd.h index 4315fb1321..6d143c22f1 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_rtcd.h +++ b/third_party/libvpx/source/config/mac/x64/vpx_rtcd.h @@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx -void vp8_build_intra_predictors_mby_c(struct macroblockd *x); -void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x); +void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr); -#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c - -void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x); - -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr); -#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); #define vp8_intra4x4_predict vp8_intra4x4_predict_c @@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2 + +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2 + +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c + void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); @@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); #define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_wmt -unsigned int vp8_get_mb_ss_c(const short *); -unsigned int vp8_get_mb_ss_mmx(const short *); -unsigned int vp8_get_mb_ss_sse2(const short *); -#define vp8_get_mb_ss vp8_get_mb_ss_sse2 - -unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt - -unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_mse16x16 vp8_mse16x16_wmt - -unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx - unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); @@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); +unsigned int vp8_get_mb_ss_c(const short *); +unsigned int vp8_get_mb_ss_mmx(const short *); +unsigned int vp8_get_mb_ss_sse2(const short *); +#define vp8_get_mb_ss vp8_get_mb_ss_sse2 + +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt + +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_mse16x16 vp8_mse16x16_wmt + +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx + void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); @@ -487,12 +492,13 @@ void vpx_rtcd(void) - vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3; + vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3; + + vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3; - vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3; @@ -544,10 +550,6 @@ void vpx_rtcd(void) - - - - vp8_sad16x16 = vp8_sad16x16_wmt; if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3; @@ -598,6 +600,10 @@ void vpx_rtcd(void) vp8_sad16x16x4d = vp8_sad16x16x4d_c; if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3; + + + + vp8_copy32xn = vp8_copy32xn_sse2; if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; diff --git a/third_party/libvpx/source/config/mac/x64/vpx_version.h b/third_party/libvpx/source/config/mac/x64/vpx_version.h index 5e8336e3e1..b9c3447d02 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_version.h +++ b/third_party/libvpx/source/config/mac/x64/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_EXTRA "108-g6b66c01" +#define VERSION_EXTRA "169-gdba0538" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01" -#define VERSION_STRING " v1.0.0-108-g6b66c01" +#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" +#define VERSION_STRING " v1.0.0-169-gdba0538" diff --git a/third_party/libvpx/source/config/win/ia32/asm_com_offsets.asm b/third_party/libvpx/source/config/win/ia32/asm_com_offsets.asm index 8aba39d4c0..1c429d3b03 100644 --- a/third_party/libvpx/source/config/win/ia32/asm_com_offsets.asm +++ b/third_party/libvpx/source/config/win/ia32/asm_com_offsets.asm @@ -9,4 +9,5 @@ yv12_buffer_config_u_buffer EQU 28 yv12_buffer_config_v_buffer EQU 32 yv12_buffer_config_border EQU 40 VP8BORDERINPIXELS_VAL EQU 32 +MFQE_PRECISION_VAL EQU 4 END diff --git a/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm b/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm index 5043a22d15..bcf487e9a4 100644 --- a/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/win/ia32/asm_enc_offsets.asm @@ -17,12 +17,11 @@ vp8_block_src_stride EQU 44 vp8_blockd_predictor EQU 8 vp8_writer_lowvalue EQU 0 vp8_writer_range EQU 4 -vp8_writer_value EQU 8 -vp8_writer_count EQU 12 -vp8_writer_pos EQU 16 -vp8_writer_buffer EQU 20 -vp8_writer_buffer_end EQU 24 -vp8_writer_error EQU 28 +vp8_writer_count EQU 8 +vp8_writer_pos EQU 12 +vp8_writer_buffer EQU 16 +vp8_writer_buffer_end EQU 20 +vp8_writer_error EQU 24 tokenextra_token EQU 6 tokenextra_extra EQU 4 tokenextra_context_tree EQU 0 @@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0 vp8_extra_bit_struct_prob EQU 4 vp8_extra_bit_struct_len EQU 8 vp8_extra_bit_struct_base_val EQU 12 -vp8_comp_tplist EQU 170624 +vp8_comp_tplist EQU 170592 vp8_comp_common EQU 104032 vp8_comp_bc EQU 116144 -vp8_writer_sz EQU 40 +vp8_writer_sz EQU 36 tokenlist_start EQU 0 tokenlist_stop EQU 4 TOKENLIST_SZ EQU 8 diff --git a/third_party/libvpx/source/config/win/ia32/vpx_rtcd.h b/third_party/libvpx/source/config/win/ia32/vpx_rtcd.h index d435fb4617..32ab9dce32 100755 --- a/third_party/libvpx/source/config/win/ia32/vpx_rtcd.h +++ b/third_party/libvpx/source/config/win/ia32/vpx_rtcd.h @@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); -void vp8_build_intra_predictors_mby_c(struct macroblockd *x); -void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x); +void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr); -#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c - -void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x); - -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr); -#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); #define vp8_intra4x4_predict vp8_intra4x4_predict_c @@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp8_filter_by_weight16x16)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); + +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +RTCD_EXTERN void (*vp8_filter_by_weight8x8)(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); + +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c + void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); @@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); RTCD_EXTERN unsigned int (*vp8_variance_halfpixvar16x16_hv)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_get_mb_ss_c(const short *); -unsigned int vp8_get_mb_ss_mmx(const short *); -unsigned int vp8_get_mb_ss_sse2(const short *); -RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *); - -unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); - -unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); - -unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); - unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); @@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); +unsigned int vp8_get_mb_ss_c(const short *); +unsigned int vp8_get_mb_ss_mmx(const short *); +unsigned int vp8_get_mb_ss_sse2(const short *); +RTCD_EXTERN unsigned int (*vp8_get_mb_ss)(const short *); + +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vp8_sub_pixel_mse16x16)(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); + +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +RTCD_EXTERN unsigned int (*vp8_mse16x16)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); + +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +RTCD_EXTERN unsigned int (*vp8_get4x4sse_cs)(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); + void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); @@ -535,15 +540,13 @@ void vpx_rtcd(void) vp8_copy_mem8x4 = vp8_copy_mem8x4_c; if (flags & HAS_MMX) vp8_copy_mem8x4 = vp8_copy_mem8x4_mmx; - vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_c; - if (flags & HAS_SSE2) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3; - - - vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_c; - if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3; + vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_c; + if (flags & HAS_SSE2) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3; + vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_c; + if (flags & HAS_SSE2) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3; vp8_mbpost_proc_down = vp8_mbpost_proc_down_c; @@ -564,6 +567,13 @@ void vpx_rtcd(void) + vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_c; + if (flags & HAS_SSE2) vp8_filter_by_weight16x16 = vp8_filter_by_weight16x16_sse2; + + vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_c; + if (flags & HAS_SSE2) vp8_filter_by_weight8x8 = vp8_filter_by_weight8x8_sse2; + + vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c; if (flags & HAS_MMX) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_mmx; if (flags & HAS_SSE2) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; @@ -653,21 +663,6 @@ void vpx_rtcd(void) if (flags & HAS_MMX) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_mmx; if (flags & HAS_SSE2) vp8_variance_halfpixvar16x16_hv = vp8_variance_halfpixvar16x16_hv_wmt; - vp8_get_mb_ss = vp8_get_mb_ss_c; - if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx; - if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2; - - vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c; - if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx; - if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt; - - vp8_mse16x16 = vp8_mse16x16_c; - if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx; - if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt; - - vp8_get4x4sse_cs = vp8_get4x4sse_cs_c; - if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx; - vp8_sad4x4 = vp8_sad4x4_c; if (flags & HAS_MMX) vp8_sad4x4 = vp8_sad4x4_mmx; if (flags & HAS_SSE2) vp8_sad4x4 = vp8_sad4x4_wmt; @@ -736,6 +731,21 @@ void vpx_rtcd(void) vp8_sad16x16x4d = vp8_sad16x16x4d_c; if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3; + vp8_get_mb_ss = vp8_get_mb_ss_c; + if (flags & HAS_MMX) vp8_get_mb_ss = vp8_get_mb_ss_mmx; + if (flags & HAS_SSE2) vp8_get_mb_ss = vp8_get_mb_ss_sse2; + + vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_c; + if (flags & HAS_MMX) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_mmx; + if (flags & HAS_SSE2) vp8_sub_pixel_mse16x16 = vp8_sub_pixel_mse16x16_wmt; + + vp8_mse16x16 = vp8_mse16x16_c; + if (flags & HAS_MMX) vp8_mse16x16 = vp8_mse16x16_mmx; + if (flags & HAS_SSE2) vp8_mse16x16 = vp8_mse16x16_wmt; + + vp8_get4x4sse_cs = vp8_get4x4sse_cs_c; + if (flags & HAS_MMX) vp8_get4x4sse_cs = vp8_get4x4sse_cs_mmx; + vp8_copy32xn = vp8_copy32xn_c; if (flags & HAS_SSE2) vp8_copy32xn = vp8_copy32xn_sse2; if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; diff --git a/third_party/libvpx/source/config/win/ia32/vpx_version.h b/third_party/libvpx/source/config/win/ia32/vpx_version.h index 5e8336e3e1..b9c3447d02 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_version.h +++ b/third_party/libvpx/source/config/win/ia32/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_EXTRA "108-g6b66c01" +#define VERSION_EXTRA "169-gdba0538" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01" -#define VERSION_STRING " v1.0.0-108-g6b66c01" +#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" +#define VERSION_STRING " v1.0.0-169-gdba0538" diff --git a/third_party/libvpx/source/config/win/x64/asm_com_offsets.asm b/third_party/libvpx/source/config/win/x64/asm_com_offsets.asm index c28816e152..7e79d4078a 100644 --- a/third_party/libvpx/source/config/win/x64/asm_com_offsets.asm +++ b/third_party/libvpx/source/config/win/x64/asm_com_offsets.asm @@ -9,4 +9,5 @@ yv12_buffer_config_u_buffer EQU 32 yv12_buffer_config_v_buffer EQU 40 yv12_buffer_config_border EQU 56 VP8BORDERINPIXELS_VAL EQU 32 +MFQE_PRECISION_VAL EQU 4 END diff --git a/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm b/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm index 14491db92c..fc618d8ae0 100644 --- a/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/win/x64/asm_enc_offsets.asm @@ -17,12 +17,11 @@ vp8_block_src_stride EQU 84 vp8_blockd_predictor EQU 16 vp8_writer_lowvalue EQU 0 vp8_writer_range EQU 4 -vp8_writer_value EQU 8 -vp8_writer_count EQU 12 -vp8_writer_pos EQU 16 -vp8_writer_buffer EQU 24 -vp8_writer_buffer_end EQU 32 -vp8_writer_error EQU 40 +vp8_writer_count EQU 8 +vp8_writer_pos EQU 12 +vp8_writer_buffer EQU 16 +vp8_writer_buffer_end EQU 24 +vp8_writer_error EQU 32 tokenextra_token EQU 10 tokenextra_extra EQU 8 tokenextra_context_tree EQU 0 @@ -35,10 +34,10 @@ vp8_extra_bit_struct_tree EQU 0 vp8_extra_bit_struct_prob EQU 8 vp8_extra_bit_struct_len EQU 16 vp8_extra_bit_struct_base_val EQU 20 -vp8_comp_tplist EQU 173168 +vp8_comp_tplist EQU 173104 vp8_comp_common EQU 105920 vp8_comp_bc EQU 118400 -vp8_writer_sz EQU 56 +vp8_writer_sz EQU 48 tokenlist_start EQU 0 tokenlist_stop EQU 8 TOKENLIST_SZ EQU 16 diff --git a/third_party/libvpx/source/config/win/x64/vpx_rtcd.h b/third_party/libvpx/source/config/win/x64/vpx_rtcd.h index 4315fb1321..6d143c22f1 100755 --- a/third_party/libvpx/source/config/win/x64/vpx_rtcd.h +++ b/third_party/libvpx/source/config/win/x64/vpx_rtcd.h @@ -105,21 +105,15 @@ void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, in void vp8_copy_mem8x4_mmx(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch); #define vp8_copy_mem8x4 vp8_copy_mem8x4_mmx -void vp8_build_intra_predictors_mby_c(struct macroblockd *x); -void vp8_build_intra_predictors_mby_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mby_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mby)(struct macroblockd *x); +void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_sse2(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +void vp8_build_intra_predictors_mby_s_ssse3(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mby_s)(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr, int y_stride); -void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * yabove_row, unsigned char * yleft, int left_stride, unsigned char * ypred_ptr); -#define vp8_build_intra_predictors_mby_s vp8_build_intra_predictors_mby_s_c - -void vp8_build_intra_predictors_mbuv_c(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_sse2(struct macroblockd *x); -void vp8_build_intra_predictors_mbuv_ssse3(struct macroblockd *x); -RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv)(struct macroblockd *x); - -void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr); -#define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_build_intra_predictors_mbuv_s_c(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +void vp8_build_intra_predictors_mbuv_s_ssse3(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); +RTCD_EXTERN void (*vp8_build_intra_predictors_mbuv_s)(struct macroblockd *x, unsigned char * uabove_row, unsigned char * vabove_row, unsigned char *uleft, unsigned char *vleft, int left_stride, unsigned char * upred_ptr, unsigned char * vpred_ptr, int pred_stride); void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); #define vp8_intra4x4_predict vp8_intra4x4_predict_c @@ -152,6 +146,17 @@ void vp8_blend_mb_outer_c(unsigned char *y, unsigned char *u, unsigned char *v, void vp8_blend_b_c(unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride); #define vp8_blend_b vp8_blend_b_c +void vp8_filter_by_weight16x16_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight16x16_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight16x16 vp8_filter_by_weight16x16_sse2 + +void vp8_filter_by_weight8x8_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +void vp8_filter_by_weight8x8_sse2(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight8x8 vp8_filter_by_weight8x8_sse2 + +void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, unsigned char *dst, int dst_stride, int src_weight); +#define vp8_filter_by_weight4x4 vp8_filter_by_weight4x4_c + void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_mmx(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); void vp8_sixtap_predict16x16_sse2(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch); @@ -262,25 +267,6 @@ unsigned int vp8_variance_halfpixvar16x16_hv_mmx(const unsigned char *src_ptr, i unsigned int vp8_variance_halfpixvar16x16_hv_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); #define vp8_variance_halfpixvar16x16_hv vp8_variance_halfpixvar16x16_hv_wmt -unsigned int vp8_get_mb_ss_c(const short *); -unsigned int vp8_get_mb_ss_mmx(const short *); -unsigned int vp8_get_mb_ss_sse2(const short *); -#define vp8_get_mb_ss vp8_get_mb_ss_sse2 - -unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); -#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt - -unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); -#define vp8_mse16x16 vp8_mse16x16_wmt - -unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); -#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx - unsigned int vp8_sad4x4_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); unsigned int vp8_sad4x4_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int max_sad); @@ -369,6 +355,25 @@ void vp8_sad16x16x4d_c(const unsigned char *src_ptr, int source_stride, unsigned void vp8_sad16x16x4d_sse3(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); RTCD_EXTERN void (*vp8_sad16x16x4d)(const unsigned char *src_ptr, int source_stride, unsigned char *ref_ptr[4], int ref_stride, unsigned int *sad_array); +unsigned int vp8_get_mb_ss_c(const short *); +unsigned int vp8_get_mb_ss_mmx(const short *); +unsigned int vp8_get_mb_ss_sse2(const short *); +#define vp8_get_mb_ss vp8_get_mb_ss_sse2 + +unsigned int vp8_sub_pixel_mse16x16_c(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +unsigned int vp8_sub_pixel_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, int xoffset, int yoffset, const unsigned char *ref_ptr, int Refstride, unsigned int *sse); +#define vp8_sub_pixel_mse16x16 vp8_sub_pixel_mse16x16_wmt + +unsigned int vp8_mse16x16_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +unsigned int vp8_mse16x16_wmt(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, unsigned int *sse); +#define vp8_mse16x16 vp8_mse16x16_wmt + +unsigned int vp8_get4x4sse_cs_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +unsigned int vp8_get4x4sse_cs_mmx(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride); +#define vp8_get4x4sse_cs vp8_get4x4sse_cs_mmx + void vp8_copy32xn_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse2(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); void vp8_copy32xn_sse3(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int ref_stride, int n); @@ -487,12 +492,13 @@ void vpx_rtcd(void) - vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby = vp8_build_intra_predictors_mby_ssse3; + vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mby_s = vp8_build_intra_predictors_mby_s_ssse3; + + vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_sse2; + if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv_s = vp8_build_intra_predictors_mbuv_s_ssse3; - vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_sse2; - if (flags & HAS_SSSE3) vp8_build_intra_predictors_mbuv = vp8_build_intra_predictors_mbuv_ssse3; @@ -544,10 +550,6 @@ void vpx_rtcd(void) - - - - vp8_sad16x16 = vp8_sad16x16_wmt; if (flags & HAS_SSE3) vp8_sad16x16 = vp8_sad16x16_sse3; @@ -598,6 +600,10 @@ void vpx_rtcd(void) vp8_sad16x16x4d = vp8_sad16x16x4d_c; if (flags & HAS_SSE3) vp8_sad16x16x4d = vp8_sad16x16x4d_sse3; + + + + vp8_copy32xn = vp8_copy32xn_sse2; if (flags & HAS_SSE3) vp8_copy32xn = vp8_copy32xn_sse3; diff --git a/third_party/libvpx/source/config/win/x64/vpx_version.h b/third_party/libvpx/source/config/win/x64/vpx_version.h index 5e8336e3e1..b9c3447d02 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_version.h +++ b/third_party/libvpx/source/config/win/x64/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MINOR 0 #define VERSION_PATCH 0 -#define VERSION_EXTRA "108-g6b66c01" +#define VERSION_EXTRA "169-gdba0538" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-108-g6b66c01" -#define VERSION_STRING " v1.0.0-108-g6b66c01" +#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" +#define VERSION_STRING " v1.0.0-169-gdba0538"