diff --git a/DEPS b/DEPS index 4590ae462..4912f7f4d 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@dba05389", + "http://git.chromium.org/webm/libvpx.git@cab6ac16", "trunk/third_party/libyuv": (Var("googlecode_url") % "libyuv") + "/trunk@255", diff --git a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc index de20ed882..99e96176c 100644 --- a/src/modules/video_coding/codecs/vp8/main/source/vp8.cc +++ b/src/modules/video_coding/codecs/vp8/main/source/vp8.cc @@ -695,7 +695,7 @@ int VP8Decoder::Decode(const EncodedImage& input_image, propagation_cnt_++; } - vpx_dec_iter_t iter = NULL; + vpx_codec_iter_t iter = NULL; vpx_image_t* img; int ret; diff --git a/third_party/libvpx/generate_gypi.sh b/third_party/libvpx/generate_gypi.sh index 6968899fa..0ddc8b2a9 100755 --- a/third_party/libvpx/generate_gypi.sh +++ b/third_party/libvpx/generate_gypi.sh @@ -21,7 +21,7 @@ # http://src.chromium.org/svn/trunk/deps/third_party/libvpx/generate_gypi.sh LIBVPX_SRC_DIR="source/libvpx" -COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes CONFIG_ERROR_CONCEALMENT=yes CONFIG_POSTPROC=yes" +COMMON_CONFIG="CONFIG_REALTIME_ONLY=yes CONFIG_GCC=yes CONFIG_ERROR_CONCEALMENT=yes CONFIG_POSTPROC=yes CONFIG_MULTI_RES_ENCODING=yes" X86_CONFIG="ARCH_X86=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_RUNTIME_CPU_DETECT=yes" X86_64_CONFIG="ARCH_X86_64=yes HAVE_MMX=yes HAVE_SSE2=yes HAVE_SSE3=yes HAVE_SSSE3=yes HAVE_SSE4_1=yes CONFIG_PIC=yes CONFIG_RUNTIME_CPU_DETECT=yes" ARM_CONFIG="ARCH_ARM=yes HAVE_EDSP=yes HAVE_MEDIA=yes" diff --git a/third_party/libvpx/libvpx_srcs_arm.gypi b/third_party/libvpx/libvpx_srcs_arm.gypi index 07076c6b8..505536348 100644 --- a/third_party/libvpx/libvpx_srcs_arm.gypi +++ b/third_party/libvpx/libvpx_srcs_arm.gypi @@ -65,7 +65,6 @@ 'source/libvpx/vp8/common/mbpitch.c', 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecontext.c', 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', 'source/libvpx/vp8/common/onyxc_int.h', @@ -94,6 +93,7 @@ 'source/libvpx/vp8/common/treecoder.h', 'source/libvpx/vp8/common/variance_c.c', 'source/libvpx/vp8/common/variance.h', + 'source/libvpx/vp8/common/vp8_entropymodedata.h', 'source/libvpx/vp8/decoder/dboolhuff.c', 'source/libvpx/vp8/decoder/dboolhuff.h', 'source/libvpx/vp8/decoder/decodemv.c', @@ -126,10 +126,13 @@ 'source/libvpx/vp8/encoder/block.h', 'source/libvpx/vp8/encoder/boolhuff.h', 'source/libvpx/vp8/encoder/dct.c', + 'source/libvpx/vp8/encoder/dct_value_cost.h', + 'source/libvpx/vp8/encoder/dct_value_tokens.h', 'source/libvpx/vp8/encoder/defaultcoefcounts.h', 'source/libvpx/vp8/encoder/denoising.c', 'source/libvpx/vp8/encoder/denoising.h', 'source/libvpx/vp8/encoder/encodeframe.c', + 'source/libvpx/vp8/encoder/encodeframe.h', 'source/libvpx/vp8/encoder/encodeintra.c', 'source/libvpx/vp8/encoder/encodeintra.h', 'source/libvpx/vp8/encoder/encodemb.c', @@ -144,6 +147,8 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', + 'source/libvpx/vp8/encoder/mr_dissim.c', + 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', @@ -174,10 +179,7 @@ '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/scalesystemdependent.c', - 'source/libvpx/vpx_scale/arm/yv12extend_arm.h', 'source/libvpx/vpx_scale/generic/gen_scalers.c', - 'source/libvpx/vpx_scale/generic/scalesystemdependent.c', 'source/libvpx/vpx_scale/generic/vpxscale.c', 'source/libvpx/vpx_scale/generic/yv12config.c', 'source/libvpx/vpx_scale/generic/yv12extend.c', @@ -185,20 +187,16 @@ 'source/libvpx/vpx_scale/scale_mode.h', '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', diff --git a/third_party/libvpx/libvpx_srcs_arm_neon.gypi b/third_party/libvpx/libvpx_srcs_arm_neon.gypi index cbf990774..6d0b1b3d0 100644 --- a/third_party/libvpx/libvpx_srcs_arm_neon.gypi +++ b/third_party/libvpx/libvpx_srcs_arm_neon.gypi @@ -96,7 +96,6 @@ 'source/libvpx/vp8/common/mbpitch.c', 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecontext.c', 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', 'source/libvpx/vp8/common/onyxc_int.h', @@ -125,6 +124,7 @@ 'source/libvpx/vp8/common/treecoder.h', 'source/libvpx/vp8/common/variance_c.c', 'source/libvpx/vp8/common/variance.h', + 'source/libvpx/vp8/common/vp8_entropymodedata.h', 'source/libvpx/vp8/decoder/dboolhuff.c', 'source/libvpx/vp8/decoder/dboolhuff.h', 'source/libvpx/vp8/decoder/decodemv.c', @@ -164,10 +164,13 @@ 'source/libvpx/vp8/encoder/block.h', 'source/libvpx/vp8/encoder/boolhuff.h', 'source/libvpx/vp8/encoder/dct.c', + 'source/libvpx/vp8/encoder/dct_value_cost.h', + 'source/libvpx/vp8/encoder/dct_value_tokens.h', 'source/libvpx/vp8/encoder/defaultcoefcounts.h', 'source/libvpx/vp8/encoder/denoising.c', 'source/libvpx/vp8/encoder/denoising.h', 'source/libvpx/vp8/encoder/encodeframe.c', + 'source/libvpx/vp8/encoder/encodeframe.h', 'source/libvpx/vp8/encoder/encodeintra.c', 'source/libvpx/vp8/encoder/encodeintra.h', 'source/libvpx/vp8/encoder/encodemb.c', @@ -182,6 +185,8 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', + 'source/libvpx/vp8/encoder/mr_dissim.c', + 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', @@ -217,10 +222,7 @@ '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', - 'source/libvpx/vpx_scale/arm/yv12extend_arm.h', 'source/libvpx/vpx_scale/generic/gen_scalers.c', - 'source/libvpx/vpx_scale/generic/scalesystemdependent.c', 'source/libvpx/vpx_scale/generic/vpxscale.c', 'source/libvpx/vpx_scale/generic/yv12config.c', 'source/libvpx/vpx_scale/generic/yv12extend.c', @@ -228,20 +230,16 @@ 'source/libvpx/vpx_scale/scale_mode.h', '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', diff --git a/third_party/libvpx/libvpx_srcs_x86.gypi b/third_party/libvpx/libvpx_srcs_x86.gypi index 9d1fa7a46..a4dd2784e 100644 --- a/third_party/libvpx/libvpx_srcs_x86.gypi +++ b/third_party/libvpx/libvpx_srcs_x86.gypi @@ -37,7 +37,6 @@ 'source/libvpx/vp8/common/mbpitch.c', 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecontext.c', 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', 'source/libvpx/vp8/common/onyxc_int.h', @@ -66,6 +65,7 @@ 'source/libvpx/vp8/common/treecoder.h', 'source/libvpx/vp8/common/variance_c.c', 'source/libvpx/vp8/common/variance.h', + 'source/libvpx/vp8/common/vp8_entropymodedata.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', @@ -121,10 +121,13 @@ 'source/libvpx/vp8/encoder/boolhuff.c', 'source/libvpx/vp8/encoder/boolhuff.h', 'source/libvpx/vp8/encoder/dct.c', + 'source/libvpx/vp8/encoder/dct_value_cost.h', + 'source/libvpx/vp8/encoder/dct_value_tokens.h', 'source/libvpx/vp8/encoder/defaultcoefcounts.h', 'source/libvpx/vp8/encoder/denoising.c', 'source/libvpx/vp8/encoder/denoising.h', 'source/libvpx/vp8/encoder/encodeframe.c', + 'source/libvpx/vp8/encoder/encodeframe.h', 'source/libvpx/vp8/encoder/encodeintra.c', 'source/libvpx/vp8/encoder/encodeintra.h', 'source/libvpx/vp8/encoder/encodemb.c', @@ -139,6 +142,8 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', + 'source/libvpx/vp8/encoder/mr_dissim.c', + 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', @@ -160,6 +165,7 @@ 'source/libvpx/vp8/encoder/treewriter.h', 'source/libvpx/vp8/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', + 'source/libvpx/vp8/encoder/x86/denoising_sse2.c', 'source/libvpx/vp8/encoder/x86/encodeopt.asm', 'source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm', 'source/libvpx/vp8/encoder/x86/quantize_mmx.asm', @@ -184,7 +190,6 @@ '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', 'source/libvpx/vpx_scale/generic/yv12config.c', 'source/libvpx/vpx_scale/generic/yv12extend.c', @@ -192,20 +197,16 @@ 'source/libvpx/vpx_scale/scale_mode.h', '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', diff --git a/third_party/libvpx/libvpx_srcs_x86_64.gypi b/third_party/libvpx/libvpx_srcs_x86_64.gypi index 6dc82f3c7..f48e854ce 100644 --- a/third_party/libvpx/libvpx_srcs_x86_64.gypi +++ b/third_party/libvpx/libvpx_srcs_x86_64.gypi @@ -37,7 +37,6 @@ 'source/libvpx/vp8/common/mbpitch.c', 'source/libvpx/vp8/common/mfqe.c', 'source/libvpx/vp8/common/modecont.c', - 'source/libvpx/vp8/common/modecontext.c', 'source/libvpx/vp8/common/modecont.h', 'source/libvpx/vp8/common/mv.h', 'source/libvpx/vp8/common/onyxc_int.h', @@ -66,6 +65,7 @@ 'source/libvpx/vp8/common/treecoder.h', 'source/libvpx/vp8/common/variance_c.c', 'source/libvpx/vp8/common/variance.h', + 'source/libvpx/vp8/common/vp8_entropymodedata.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', @@ -122,10 +122,13 @@ 'source/libvpx/vp8/encoder/boolhuff.c', 'source/libvpx/vp8/encoder/boolhuff.h', 'source/libvpx/vp8/encoder/dct.c', + 'source/libvpx/vp8/encoder/dct_value_cost.h', + 'source/libvpx/vp8/encoder/dct_value_tokens.h', 'source/libvpx/vp8/encoder/defaultcoefcounts.h', 'source/libvpx/vp8/encoder/denoising.c', 'source/libvpx/vp8/encoder/denoising.h', 'source/libvpx/vp8/encoder/encodeframe.c', + 'source/libvpx/vp8/encoder/encodeframe.h', 'source/libvpx/vp8/encoder/encodeintra.c', 'source/libvpx/vp8/encoder/encodeintra.h', 'source/libvpx/vp8/encoder/encodemb.c', @@ -140,6 +143,8 @@ 'source/libvpx/vp8/encoder/mcomp.h', 'source/libvpx/vp8/encoder/modecosts.c', 'source/libvpx/vp8/encoder/modecosts.h', + 'source/libvpx/vp8/encoder/mr_dissim.c', + 'source/libvpx/vp8/encoder/mr_dissim.h', 'source/libvpx/vp8/encoder/onyx_if.c', 'source/libvpx/vp8/encoder/onyx_int.h', 'source/libvpx/vp8/encoder/pickinter.c', @@ -161,6 +166,7 @@ 'source/libvpx/vp8/encoder/treewriter.h', 'source/libvpx/vp8/encoder/x86/dct_mmx.asm', 'source/libvpx/vp8/encoder/x86/dct_sse2.asm', + 'source/libvpx/vp8/encoder/x86/denoising_sse2.c', 'source/libvpx/vp8/encoder/x86/encodeopt.asm', 'source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm', 'source/libvpx/vp8/encoder/x86/quantize_mmx.asm', @@ -186,7 +192,6 @@ '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', 'source/libvpx/vpx_scale/generic/yv12config.c', 'source/libvpx/vpx_scale/generic/yv12extend.c', @@ -194,20 +199,16 @@ 'source/libvpx/vpx_scale/scale_mode.h', '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', diff --git a/third_party/libvpx/source/config/linux/arm-neon/asm_enc_offsets.asm b/third_party/libvpx/source/config/linux/arm-neon/asm_enc_offsets.asm index bf190f94f..7b50b32f3 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/linux/arm-neon/asm_enc_offsets.asm @@ -37,7 +37,7 @@ .equ vp8_extra_bit_struct_prob , 4 .equ vp8_extra_bit_struct_len , 8 .equ vp8_extra_bit_struct_base_val , 12 -.equ vp8_comp_tplist , 167104 +.equ vp8_comp_tplist , 167128 .equ vp8_comp_common , 103296 .equ vp8_comp_bc , 112656 .equ vp8_writer_sz , 36 diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm index 5c724d8af..4edb7b1e1 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm @@ -46,7 +46,7 @@ .equ CONFIG_MD5 , 1 .equ CONFIG_DEQUANT_TOKENS , 0 .equ CONFIG_DC_RECON , 0 -.equ CONFIG_RUNTIME_CPU_DETECT , 0 +.equ CONFIG_RUNTIME_CPU_DETECT , 1 .equ CONFIG_POSTPROC , 1 .equ CONFIG_MULTITHREAD , 1 .equ CONFIG_INTERNAL_STATS , 0 @@ -66,7 +66,7 @@ .equ CONFIG_POSTPROC_VISUALIZER , 0 .equ CONFIG_OS_SUPPORT , 1 .equ CONFIG_UNIT_TESTS , 0 -.equ CONFIG_MULTI_RES_ENCODING , 0 +.equ CONFIG_MULTI_RES_ENCODING , 1 .equ CONFIG_TEMPORAL_DENOISING , 1 .section .note.GNU-stack,"",%progbits @ This file was created from a .asm file diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c index 7e7cdd973..4bd1e9cc9 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--sdk-path=android-ndk-r7c --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc"; +static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv7-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --enable-multi-res-encoding --disable-runtime-cpu-detect"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h index ebf753147..b604d848e 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_config.h @@ -54,7 +54,7 @@ #define CONFIG_MD5 1 #define CONFIG_DEQUANT_TOKENS 0 #define CONFIG_DC_RECON 0 -#define CONFIG_RUNTIME_CPU_DETECT 0 +#define CONFIG_RUNTIME_CPU_DETECT 1 #define CONFIG_POSTPROC 1 #define CONFIG_MULTITHREAD 1 #define CONFIG_INTERNAL_STATS 0 @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h index b83613483..ea0531856 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_rtcd.h @@ -117,6 +117,9 @@ void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * y 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); #define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_intra4x4_predict_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + void vp8_intra4x4_predict_c(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); void vp8_intra4x4_predict_armv6(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); RTCD_EXTERN void (*vp8_intra4x4_predict)(unsigned char *src, int src_stride, int b_mode, unsigned char *dst, int dst_stride); @@ -405,6 +408,87 @@ int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct block void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); void vp8_yv12_copy_partial_frame_neon(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); RTCD_EXTERN void (*vp8_yv12_copy_partial_frame)(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +#define vp8_denoiser_filter vp8_denoiser_filter_c + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +void vp8_yv12_extend_frame_borders_neon(struct yv12_buffer_config *ybf); +RTCD_EXTERN void (*vp8_yv12_extend_frame_borders)(struct yv12_buffer_config *ybf); + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +void vp8_yv12_copy_frame_neon(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +RTCD_EXTERN void (*vp8_yv12_copy_frame)(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +void vp8_yv12_copy_y_neon(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +RTCD_EXTERN void (*vp8_yv12_copy_y)(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #include "vpx_config.h" void vpx_rtcd(void); @@ -492,6 +576,7 @@ void vpx_rtcd(void) + vp8_intra4x4_predict = vp8_intra4x4_predict_c; if (flags & HAS_MEDIA) vp8_intra4x4_predict = vp8_intra4x4_predict_armv6; @@ -665,6 +750,38 @@ void vpx_rtcd(void) vp8_yv12_copy_partial_frame = vp8_yv12_copy_partial_frame_c; if (flags & HAS_NEON) vp8_yv12_copy_partial_frame = vp8_yv12_copy_partial_frame_neon; + + + + + + + + + + + + + + + + + + + + + + + + + vp8_yv12_extend_frame_borders = vp8_yv12_extend_frame_borders_c; + if (flags & HAS_NEON) vp8_yv12_extend_frame_borders = vp8_yv12_extend_frame_borders_neon; + + vp8_yv12_copy_frame = vp8_yv12_copy_frame_c; + if (flags & HAS_NEON) vp8_yv12_copy_frame = vp8_yv12_copy_frame_neon; + + vp8_yv12_copy_y = vp8_yv12_copy_y_c; + if (flags & HAS_NEON) vp8_yv12_copy_y = vp8_yv12_copy_y_neon; } #endif #endif diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h index b9c3447d0..f6b740c1a 100644 --- a/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h +++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 -#define VERSION_MINOR 0 +#define VERSION_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b" diff --git a/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm b/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm index bf190f94f..7b50b32f3 100644 --- a/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm +++ b/third_party/libvpx/source/config/linux/arm/asm_enc_offsets.asm @@ -37,7 +37,7 @@ .equ vp8_extra_bit_struct_prob , 4 .equ vp8_extra_bit_struct_len , 8 .equ vp8_extra_bit_struct_base_val , 12 -.equ vp8_comp_tplist , 167104 +.equ vp8_comp_tplist , 167128 .equ vp8_comp_common , 103296 .equ vp8_comp_bc , 112656 .equ vp8_writer_sz , 36 diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.asm b/third_party/libvpx/source/config/linux/arm/vpx_config.asm index 3b0422544..bc44a8ddd 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/arm/vpx_config.asm @@ -66,7 +66,7 @@ .equ CONFIG_POSTPROC_VISUALIZER , 0 .equ CONFIG_OS_SUPPORT , 1 .equ CONFIG_UNIT_TESTS , 0 -.equ CONFIG_MULTI_RES_ENCODING , 0 +.equ CONFIG_MULTI_RES_ENCODING , 1 .equ CONFIG_TEMPORAL_DENOISING , 1 .section .note.GNU-stack,"",%progbits @ This file was created from a .asm file diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.c b/third_party/libvpx/source/config/linux/arm/vpx_config.c index f92d620a8..0a566a9a9 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_config.c +++ b/third_party/libvpx/source/config/linux/arm/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--sdk-path=android-ndk-r7c --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc"; +static const char* const cfg = "--sdk-path=/usr/local/google/users/holmer/code/android/android-ndk-r7c --target=armv5te-android-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-postproc --enable-multi-res-encoding"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/arm/vpx_config.h b/third_party/libvpx/source/config/linux/arm/vpx_config.h index acbbcd197..8e697fb62 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_config.h +++ b/third_party/libvpx/source/config/linux/arm/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ diff --git a/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h b/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h index 201494d59..4f16111ac 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm/vpx_rtcd.h @@ -81,6 +81,9 @@ void vp8_build_intra_predictors_mby_s_c(struct macroblockd *x, unsigned char * y 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); #define vp8_build_intra_predictors_mbuv_s vp8_build_intra_predictors_mbuv_s_c +void vp8_intra4x4_predict_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + 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 @@ -308,6 +311,84 @@ int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct block void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +#define vp8_denoiser_filter vp8_denoiser_filter_c + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_y vp8_yv12_copy_y_c #include "vpx_config.h" void vpx_rtcd(void); diff --git a/third_party/libvpx/source/config/linux/arm/vpx_version.h b/third_party/libvpx/source/config/linux/arm/vpx_version.h index b9c3447d0..f6b740c1a 100644 --- a/third_party/libvpx/source/config/linux/arm/vpx_version.h +++ b/third_party/libvpx/source/config/linux/arm/vpx_version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 -#define VERSION_MINOR 0 +#define VERSION_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b" 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 a8b7b4290..9c2a142f0 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 @@ -34,7 +34,7 @@ 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 170696 +vp8_comp_tplist EQU 170716 vp8_comp_common EQU 104032 vp8_comp_bc EQU 116240 vp8_writer_sz EQU 36 diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.asm b/third_party/libvpx/source/config/linux/ia32/vpx_config.asm index a59bf69fb..6c39f37bb 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 0 +CONFIG_MULTI_RES_ENCODING equ 1 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.c b/third_party/libvpx/source/config/linux/ia32/vpx_config.c index 280ac073a..f843e57a2 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_config.c +++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; +static const char* const cfg = "--target=x86-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_config.h b/third_party/libvpx/source/config/linux/ia32/vpx_config.h index c4f09fdbb..f079b8d1a 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_config.h +++ b/third_party/libvpx/source/config/linux/ia32/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ 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 32ab9dce3..dab26dcf0 100644 --- a/third_party/libvpx/source/config/linux/ia32/vpx_rtcd.h +++ b/third_party/libvpx/source/config/linux/ia32/vpx_rtcd.h @@ -115,6 +115,9 @@ void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char 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_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + 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 @@ -463,6 +466,85 @@ RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +int vp8_denoiser_filter_sse2(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +RTCD_EXTERN int (*vp8_denoiser_filter)(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_y vp8_yv12_copy_y_c void vpx_rtcd(void); #ifdef RTCD_C @@ -549,6 +631,7 @@ void vpx_rtcd(void) 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; if (flags & HAS_MMX) vp8_mbpost_proc_down = vp8_mbpost_proc_down_mmx; if (flags & HAS_SSE2) vp8_mbpost_proc_down = vp8_mbpost_proc_down_xmm; @@ -807,6 +890,10 @@ void vpx_rtcd(void) vp8_diamond_search_sad = vp8_diamond_search_sad_c; if (flags & HAS_SSE3) vp8_diamond_search_sad = vp8_diamond_search_sadx4; + + + vp8_denoiser_filter = vp8_denoiser_filter_c; + if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2; } #endif #endif 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 b9c3447d0..f6b740c1a 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_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b" 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 ec6901f17..1d85ebef7 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 @@ -34,9 +34,9 @@ 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 173200 -vp8_comp_common EQU 105920 -vp8_comp_bc EQU 118352 +vp8_comp_tplist EQU 173256 +vp8_comp_common EQU 105952 +vp8_comp_bc EQU 118384 vp8_writer_sz EQU 56 tokenlist_start EQU 0 tokenlist_stop EQU 8 diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.asm b/third_party/libvpx/source/config/linux/x64/vpx_config.asm index 0ca410910..cb005db2e 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_config.asm +++ b/third_party/libvpx/source/config/linux/x64/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 0 +CONFIG_MULTI_RES_ENCODING equ 1 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.c b/third_party/libvpx/source/config/linux/x64/vpx_config.c index 2ac65f7b8..776c7e087 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_config.c +++ b/third_party/libvpx/source/config/linux/x64/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; +static const char* const cfg = "--target=x86_64-linux-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/linux/x64/vpx_config.h b/third_party/libvpx/source/config/linux/x64/vpx_config.h index a031d9562..001ab19a0 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_config.h +++ b/third_party/libvpx/source/config/linux/x64/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ 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 6d143c22f..3144b8775 100644 --- a/third_party/libvpx/source/config/linux/x64/vpx_rtcd.h +++ b/third_party/libvpx/source/config/linux/x64/vpx_rtcd.h @@ -115,6 +115,9 @@ void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char 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_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + 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 @@ -463,6 +466,85 @@ RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +int vp8_denoiser_filter_sse2(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +#define vp8_denoiser_filter vp8_denoiser_filter_sse2 + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_y vp8_yv12_copy_y_c void vpx_rtcd(void); #ifdef RTCD_C @@ -509,6 +591,7 @@ void vpx_rtcd(void) + vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; 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 b9c3447d0..f6b740c1a 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_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b" 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 6b332c301..9913fbd77 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 @@ -34,7 +34,7 @@ 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 170580 +vp8_comp_tplist EQU 170600 vp8_comp_common EQU 104032 vp8_comp_bc EQU 116160 vp8_writer_sz EQU 36 diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.asm b/third_party/libvpx/source/config/mac/ia32/vpx_config.asm index a59bf69fb..6c39f37bb 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_config.asm +++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 0 +CONFIG_MULTI_RES_ENCODING equ 1 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.c b/third_party/libvpx/source/config/mac/ia32/vpx_config.c index 32df4080f..775ad6795 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_config.c +++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; +static const char* const cfg = "--target=x86-darwin9-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_config.h b/third_party/libvpx/source/config/mac/ia32/vpx_config.h index c4f09fdbb..f079b8d1a 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_config.h +++ b/third_party/libvpx/source/config/mac/ia32/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ 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 32ab9dce3..dab26dcf0 100644 --- a/third_party/libvpx/source/config/mac/ia32/vpx_rtcd.h +++ b/third_party/libvpx/source/config/mac/ia32/vpx_rtcd.h @@ -115,6 +115,9 @@ void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char 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_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + 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 @@ -463,6 +466,85 @@ RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +int vp8_denoiser_filter_sse2(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +RTCD_EXTERN int (*vp8_denoiser_filter)(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_y vp8_yv12_copy_y_c void vpx_rtcd(void); #ifdef RTCD_C @@ -549,6 +631,7 @@ void vpx_rtcd(void) 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; if (flags & HAS_MMX) vp8_mbpost_proc_down = vp8_mbpost_proc_down_mmx; if (flags & HAS_SSE2) vp8_mbpost_proc_down = vp8_mbpost_proc_down_xmm; @@ -807,6 +890,10 @@ void vpx_rtcd(void) vp8_diamond_search_sad = vp8_diamond_search_sad_c; if (flags & HAS_SSE3) vp8_diamond_search_sad = vp8_diamond_search_sadx4; + + + vp8_denoiser_filter = vp8_denoiser_filter_c; + if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2; } #endif #endif 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 b9c3447d0..f6b740c1a 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_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b" 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 7cc943a09..2706d67d4 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 @@ -34,9 +34,9 @@ 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 173056 -vp8_comp_common EQU 105920 -vp8_comp_bc EQU 118288 +vp8_comp_tplist EQU 173112 +vp8_comp_common EQU 105952 +vp8_comp_bc EQU 118320 vp8_writer_sz EQU 56 tokenlist_start EQU 0 tokenlist_stop EQU 8 diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.asm b/third_party/libvpx/source/config/mac/x64/vpx_config.asm index 0ca410910..cb005db2e 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_config.asm +++ b/third_party/libvpx/source/config/mac/x64/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 0 +CONFIG_MULTI_RES_ENCODING equ 1 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.c b/third_party/libvpx/source/config/mac/x64/vpx_config.c index d6197504b..e764d7c2b 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_config.c +++ b/third_party/libvpx/source/config/mac/x64/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only"; +static const char* const cfg = "--target=x86_64-darwin10-gcc --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/mac/x64/vpx_config.h b/third_party/libvpx/source/config/mac/x64/vpx_config.h index a031d9562..001ab19a0 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_config.h +++ b/third_party/libvpx/source/config/mac/x64/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ 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 6d143c22f..3144b8775 100644 --- a/third_party/libvpx/source/config/mac/x64/vpx_rtcd.h +++ b/third_party/libvpx/source/config/mac/x64/vpx_rtcd.h @@ -115,6 +115,9 @@ void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char 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_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + 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 @@ -463,6 +466,85 @@ RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +int vp8_denoiser_filter_sse2(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +#define vp8_denoiser_filter vp8_denoiser_filter_sse2 + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_y vp8_yv12_copy_y_c void vpx_rtcd(void); #ifdef RTCD_C @@ -509,6 +591,7 @@ void vpx_rtcd(void) + vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; 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 b9c3447d0..f6b740c1a 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_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b" 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 bcf487e9a..9fc22295d 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 @@ -34,7 +34,7 @@ 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 170592 +vp8_comp_tplist EQU 170616 vp8_comp_common EQU 104032 vp8_comp_bc EQU 116144 vp8_writer_sz EQU 36 diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.asm b/third_party/libvpx/source/config/win/ia32/vpx_config.asm index 411adcf5c..456e96fc5 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_config.asm +++ b/third_party/libvpx/source/config/win/ia32/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 0 +CONFIG_MULTI_RES_ENCODING equ 1 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.c b/third_party/libvpx/source/config/win/ia32/vpx_config.c index bcd9622de..60580d73e 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_config.c +++ b/third_party/libvpx/source/config/win/ia32/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm"; +static const char* const cfg = "--target=x86-win32-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding --enable-static-msvcrt --as=yasm"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/win/ia32/vpx_config.h b/third_party/libvpx/source/config/win/ia32/vpx_config.h index 0f66f460f..bdfa8dac4 100644 --- a/third_party/libvpx/source/config/win/ia32/vpx_config.h +++ b/third_party/libvpx/source/config/win/ia32/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ 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 32ab9dce3..dab26dcf0 100755 --- a/third_party/libvpx/source/config/win/ia32/vpx_rtcd.h +++ b/third_party/libvpx/source/config/win/ia32/vpx_rtcd.h @@ -115,6 +115,9 @@ void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char 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_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + 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 @@ -463,6 +466,85 @@ RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +int vp8_denoiser_filter_sse2(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +RTCD_EXTERN int (*vp8_denoiser_filter)(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_y vp8_yv12_copy_y_c void vpx_rtcd(void); #ifdef RTCD_C @@ -549,6 +631,7 @@ void vpx_rtcd(void) 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; if (flags & HAS_MMX) vp8_mbpost_proc_down = vp8_mbpost_proc_down_mmx; if (flags & HAS_SSE2) vp8_mbpost_proc_down = vp8_mbpost_proc_down_xmm; @@ -807,6 +890,10 @@ void vpx_rtcd(void) vp8_diamond_search_sad = vp8_diamond_search_sad_c; if (flags & HAS_SSE3) vp8_diamond_search_sad = vp8_diamond_search_sadx4; + + + vp8_denoiser_filter = vp8_denoiser_filter_c; + if (flags & HAS_SSE2) vp8_denoiser_filter = vp8_denoiser_filter_sse2; } #endif #endif 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 b9c3447d0..f6b740c1a 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_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b" 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 fc618d8ae..17bcdf469 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 @@ -34,9 +34,9 @@ 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 173104 -vp8_comp_common EQU 105920 -vp8_comp_bc EQU 118400 +vp8_comp_tplist EQU 173160 +vp8_comp_common EQU 105952 +vp8_comp_bc EQU 118432 vp8_writer_sz EQU 48 tokenlist_start EQU 0 tokenlist_stop EQU 8 diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.asm b/third_party/libvpx/source/config/win/x64/vpx_config.asm index 5bb3022ff..df6f68b23 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_config.asm +++ b/third_party/libvpx/source/config/win/x64/vpx_config.asm @@ -63,5 +63,5 @@ CONFIG_SMALL equ 0 CONFIG_POSTPROC_VISUALIZER equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_UNIT_TESTS equ 0 -CONFIG_MULTI_RES_ENCODING equ 0 +CONFIG_MULTI_RES_ENCODING equ 1 CONFIG_TEMPORAL_DENOISING equ 1 diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.c b/third_party/libvpx/source/config/win/x64/vpx_config.c index c59d62c84..372eac53c 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_config.c +++ b/third_party/libvpx/source/config/win/x64/vpx_config.c @@ -5,5 +5,5 @@ /* tree. An additional intellectual property rights grant can be found */ /* in the file PATENTS. All contributing project authors may */ /* be found in the AUTHORS file in the root of the source tree. */ -static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-static-msvcrt --as=yasm"; +static const char* const cfg = "--target=x86_64-win64-vs9 --enable-pic --enable-error-concealment --disable-install-docs --disable-install-srcs --disable-examples --disable-internal-stats --disable-install-libs --disable-install-bins --enable-realtime-only --enable-multi-res-encoding --enable-static-msvcrt --as=yasm"; const char *vpx_codec_build_config(void) {return cfg;} diff --git a/third_party/libvpx/source/config/win/x64/vpx_config.h b/third_party/libvpx/source/config/win/x64/vpx_config.h index 1a61d9ade..f8f03d816 100644 --- a/third_party/libvpx/source/config/win/x64/vpx_config.h +++ b/third_party/libvpx/source/config/win/x64/vpx_config.h @@ -74,6 +74,6 @@ #define CONFIG_POSTPROC_VISUALIZER 0 #define CONFIG_OS_SUPPORT 1 #define CONFIG_UNIT_TESTS 0 -#define CONFIG_MULTI_RES_ENCODING 0 +#define CONFIG_MULTI_RES_ENCODING 1 #define CONFIG_TEMPORAL_DENOISING 1 #endif /* VPX_CONFIG_H */ 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 6d143c22f..3144b8775 100755 --- a/third_party/libvpx/source/config/win/x64/vpx_rtcd.h +++ b/third_party/libvpx/source/config/win/x64/vpx_rtcd.h @@ -115,6 +115,9 @@ void vp8_build_intra_predictors_mbuv_s_sse2(struct macroblockd *x, unsigned char 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_d_c(unsigned char *above, unsigned char *left, int left_stride, int b_mode, unsigned char *dst, int dst_stride, unsigned char top_left); +#define vp8_intra4x4_predict_d vp8_intra4x4_predict_d_c + 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 @@ -463,6 +466,85 @@ RTCD_EXTERN int (*vp8_diamond_search_sad)(struct macroblock *x, struct block *b, void vp8_yv12_copy_partial_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); #define vp8_yv12_copy_partial_frame vp8_yv12_copy_partial_frame_c + +int vp8_denoiser_filter_c(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +int vp8_denoiser_filter_sse2(struct yv12_buffer_config* mc_running_avg, struct yv12_buffer_config* running_avg, struct macroblock* signal, unsigned int motion_magnitude2, int y_offset, int uv_offset); +#define vp8_denoiser_filter vp8_denoiser_filter_sse2 + +void vp8_horizontal_line_4_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_4_5_scale vp8_horizontal_line_4_5_scale_c + +void vp8_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_4_5_scale vp8_vertical_band_4_5_scale_c + +void vp8_last_vertical_band_4_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_4_5_scale vp8_last_vertical_band_4_5_scale_c + +void vp8_horizontal_line_2_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_3_scale vp8_horizontal_line_2_3_scale_c + +void vp8_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_3_scale vp8_vertical_band_2_3_scale_c + +void vp8_last_vertical_band_2_3_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_2_3_scale vp8_last_vertical_band_2_3_scale_c + +void vp8_horizontal_line_3_5_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_5_scale vp8_horizontal_line_3_5_scale_c + +void vp8_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_5_scale vp8_vertical_band_3_5_scale_c + +void vp8_last_vertical_band_3_5_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_5_scale vp8_last_vertical_band_3_5_scale_c + +void vp8_horizontal_line_3_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_3_4_scale vp8_horizontal_line_3_4_scale_c + +void vp8_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_3_4_scale vp8_vertical_band_3_4_scale_c + +void vp8_last_vertical_band_3_4_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_3_4_scale vp8_last_vertical_band_3_4_scale_c + +void vp8_horizontal_line_1_2_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_1_2_scale vp8_horizontal_line_1_2_scale_c + +void vp8_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_1_2_scale vp8_vertical_band_1_2_scale_c + +void vp8_last_vertical_band_1_2_scale_c(unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_last_vertical_band_1_2_scale vp8_last_vertical_band_1_2_scale_c + +void vp8_horizontal_line_5_4_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_4_scale vp8_horizontal_line_5_4_scale_c + +void vp8_vertical_band_5_4_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_4_scale vp8_vertical_band_5_4_scale_c + +void vp8_horizontal_line_5_3_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_5_3_scale vp8_horizontal_line_5_3_scale_c + +void vp8_vertical_band_5_3_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_5_3_scale vp8_vertical_band_5_3_scale_c + +void vp8_horizontal_line_2_1_scale_c(const unsigned char *source, unsigned int source_width, unsigned char *dest, unsigned int dest_width); +#define vp8_horizontal_line_2_1_scale vp8_horizontal_line_2_1_scale_c + +void vp8_vertical_band_2_1_scale_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale vp8_vertical_band_2_1_scale_c + +void vp8_vertical_band_2_1_scale_i_c(unsigned char *source, unsigned int src_pitch, unsigned char *dest, unsigned int dest_pitch, unsigned int dest_width); +#define vp8_vertical_band_2_1_scale_i vp8_vertical_band_2_1_scale_i_c + +void vp8_yv12_extend_frame_borders_c(struct yv12_buffer_config *ybf); +#define vp8_yv12_extend_frame_borders vp8_yv12_extend_frame_borders_c + +void vp8_yv12_copy_frame_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_frame vp8_yv12_copy_frame_c + +void vp8_yv12_copy_y_c(struct yv12_buffer_config *src_ybc, struct yv12_buffer_config *dst_ybc); +#define vp8_yv12_copy_y vp8_yv12_copy_y_c void vpx_rtcd(void); #ifdef RTCD_C @@ -509,6 +591,7 @@ void vpx_rtcd(void) + vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_sse2; if (flags & HAS_SSSE3) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_ssse3; 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 b9c3447d0..f6b740c1a 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_MINOR 1 #define VERSION_PATCH 0 -#define VERSION_EXTRA "169-gdba0538" +#define VERSION_EXTRA "6-gdd6134b" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.0.0-169-gdba0538" -#define VERSION_STRING " v1.0.0-169-gdba0538" +#define VERSION_STRING_NOSP "v1.1.0-6-gdd6134b" +#define VERSION_STRING " v1.1.0-6-gdd6134b"