Skip to content

GitLab

T
tangled
Commit 147e6b6a authored by Johann's avatar Johann Committed by Commit Bot
Browse files
Options

Roll src/third_party/libvpx/source/libvpx/ 5de95cb09..0bfab0608 (2 commits) 

https://chromium.googlesource.com/webm/libvpx.git/+log/5de95cb09ff6..0bfab06084e4

$ git log 5de95cb09..0bfab0608 --date=short --no-merges --format='%ad %ae %s'
2018-08-28 johann.koenig rtcd: fix --required flag
2018-08-27 huisu Skip unnecessary motion search

Created with:
  roll-dep src/third_party/libvpx/source/libvpx

chromium has required sse2 since M35/2014:
https://support.google.com/chrome/a/answer/7100626

This reduces win32 size by over half a megabyte.

BUG=chromium:876548
R=jzern@chromium.org

Change-Id: I673b2f52280dc7df0cf86f7ace52a9a7a643ceef
Reviewed-on: https://chromium-review.googlesource.com/1195800Reviewed-by: default avatarJames Zern <jzern@google.com>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#587340}
parent ebf6eeb9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1539 additions and 10005 deletions
DEPS
View file @ 147e6b6a
...@@ -842,7 +842,7 @@ deps = { ...@@ -842,7 +842,7 @@ deps = {
}, },
'src/third_party/libvpx/source/libvpx': 'src/third_party/libvpx/source/libvpx':
Var('chromium_git') + '/webm/libvpx.git' + '@' + '5de95cb09ff683dd14bc1f170ac0e9b89ab830dd', Var('chromium_git') + '/webm/libvpx.git' + '@' + '0bfab06084e44a62067aeabf43ba8087cee4a3ae',
'src/third_party/libwebm/source': 'src/third_party/libwebm/source':
Var('chromium_git') + '/webm/libwebm.git' + '@' + '01c1d1d76f139345c442bfc8e61b4e1cba809059', Var('chromium_git') + '/webm/libwebm.git' + '@' + '01c1d1d76f139345c442bfc8e61b4e1cba809059',
......
third_party/libvpx/README.chromium
View file @ 147e6b6a
...@@ -5,9 +5,9 @@ License: BSD ...@@ -5,9 +5,9 @@ License: BSD
License File: source/libvpx/LICENSE License File: source/libvpx/LICENSE
Security Critical: yes Security Critical: yes
Date: Tuesday August 28 2018 Date: Wednesday August 29 2018
Branch: master Branch: master
Commit: 5de95cb09ff683dd14bc1f170ac0e9b89ab830dd Commit: 0bfab06084e44a62067aeabf43ba8087cee4a3ae
Description: Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and Contains the sources used to compile libvpx binaries used by Google Chrome and
......
third_party/libvpx/generate_gni.sh
View file @ 147e6b6a
...@@ -387,7 +387,10 @@ rm -rf $TEMP_DIR ...@@ -387,7 +387,10 @@ rm -rf $TEMP_DIR
cp -R $LIBVPX_SRC_DIR $TEMP_DIR cp -R $LIBVPX_SRC_DIR $TEMP_DIR
cd $TEMP_DIR cd $TEMP_DIR
gen_rtcd_header linux/ia32 x86 # chromium has required sse2 for x86 since 2014
require_sse2="--require-mmx --require-sse --require-sse2"
gen_rtcd_header linux/ia32 x86 "${require_sse2}"
gen_rtcd_header linux/x64 x86_64 gen_rtcd_header linux/x64 x86_64
gen_rtcd_header linux/arm armv7 "--disable-neon --disable-neon_asm" gen_rtcd_header linux/arm armv7 "--disable-neon --disable-neon_asm"
gen_rtcd_header linux/arm-neon armv7 gen_rtcd_header linux/arm-neon armv7
...@@ -396,9 +399,9 @@ gen_rtcd_header linux/arm64 armv8 ...@@ -396,9 +399,9 @@ gen_rtcd_header linux/arm64 armv8
gen_rtcd_header linux/mipsel mipsel gen_rtcd_header linux/mipsel mipsel
gen_rtcd_header linux/mips64el mips64el gen_rtcd_header linux/mips64el mips64el
gen_rtcd_header linux/generic generic gen_rtcd_header linux/generic generic
gen_rtcd_header win/ia32 x86 gen_rtcd_header win/ia32 x86 "${require_sse2}"
gen_rtcd_header win/x64 x86_64 gen_rtcd_header win/x64 x86_64
gen_rtcd_header mac/ia32 x86 gen_rtcd_header mac/ia32 x86 "${require_sse2}"
gen_rtcd_header mac/x64 x86_64 gen_rtcd_header mac/x64 x86_64
gen_rtcd_header ios/arm-neon armv7 gen_rtcd_header ios/arm-neon armv7
gen_rtcd_header ios/arm64 armv8 gen_rtcd_header ios/arm64 armv8
......
third_party/libvpx/source/config/linux/ia32/vp9_rtcd.h
View file @ 147e6b6a
...@@ -79,15 +79,7 @@ int vp9_denoiser_filter_sse2(const uint8_t* sig, ...@@ -79,15 +79,7 @@ int vp9_denoiser_filter_sse2(const uint8_t* sig,
int increase_denoising, int increase_denoising,
BLOCK_SIZE bs, BLOCK_SIZE bs,
int motion_magnitude); int motion_magnitude);
RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t* sig, #define vp9_denoiser_filter vp9_denoiser_filter_sse2
int sig_stride,
const uint8_t* mc_avg,
int mc_avg_stride,
uint8_t* avg,
int avg_stride,
int increase_denoising,
BLOCK_SIZE bs,
int motion_magnitude);
int vp9_diamond_search_sad_c(const struct macroblock* x, int vp9_diamond_search_sad_c(const struct macroblock* x,
const struct search_site_config* cfg, const struct search_site_config* cfg,
...@@ -166,10 +158,7 @@ void vp9_fht16x16_sse2(const int16_t* input, ...@@ -166,10 +158,7 @@ void vp9_fht16x16_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht16x16)(const int16_t* input, #define vp9_fht16x16 vp9_fht16x16_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_fht4x4_c(const int16_t* input, void vp9_fht4x4_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -179,10 +168,7 @@ void vp9_fht4x4_sse2(const int16_t* input, ...@@ -179,10 +168,7 @@ void vp9_fht4x4_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht4x4)(const int16_t* input, #define vp9_fht4x4 vp9_fht4x4_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_fht8x8_c(const int16_t* input, void vp9_fht8x8_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -192,10 +178,7 @@ void vp9_fht8x8_sse2(const int16_t* input, ...@@ -192,10 +178,7 @@ void vp9_fht8x8_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht8x8)(const int16_t* input, #define vp9_fht8x8 vp9_fht8x8_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_filter_by_weight16x16_c(const uint8_t* src, void vp9_filter_by_weight16x16_c(const uint8_t* src,
int src_stride, int src_stride,
...@@ -207,11 +190,7 @@ void vp9_filter_by_weight16x16_sse2(const uint8_t* src, ...@@ -207,11 +190,7 @@ void vp9_filter_by_weight16x16_sse2(const uint8_t* src,
uint8_t* dst, uint8_t* dst,
int dst_stride, int dst_stride,
int src_weight); int src_weight);
RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t* src, #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_sse2
int src_stride,
uint8_t* dst,
int dst_stride,
int src_weight);
void vp9_filter_by_weight8x8_c(const uint8_t* src, void vp9_filter_by_weight8x8_c(const uint8_t* src,
int src_stride, int src_stride,
...@@ -223,17 +202,11 @@ void vp9_filter_by_weight8x8_sse2(const uint8_t* src, ...@@ -223,17 +202,11 @@ void vp9_filter_by_weight8x8_sse2(const uint8_t* src,
uint8_t* dst, uint8_t* dst,
int dst_stride, int dst_stride,
int src_weight); int src_weight);
RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t* src, #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_sse2
int src_stride,
uint8_t* dst,
int dst_stride,
int src_weight);
void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride);
RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t* input, #define vp9_fwht4x4 vp9_fwht4x4_sse2
tran_low_t* output,
int stride);
int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, int64_t vp9_highbd_block_error_c(const tran_low_t* coeff,
const tran_low_t* dqcoeff, const tran_low_t* dqcoeff,
...@@ -245,11 +218,7 @@ int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, ...@@ -245,11 +218,7 @@ int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff,
intptr_t block_size, intptr_t block_size,
int64_t* ssz, int64_t* ssz,
int bd); int bd);
RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t* coeff, #define vp9_highbd_block_error vp9_highbd_block_error_sse2
const tran_low_t* dqcoeff,
intptr_t block_size,
int64_t* ssz,
int bd);
void vp9_highbd_fht16x16_c(const int16_t* input, void vp9_highbd_fht16x16_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -389,10 +358,7 @@ void vp9_iht16x16_256_add_sse2(const tran_low_t* input, ...@@ -389,10 +358,7 @@ void vp9_iht16x16_256_add_sse2(const tran_low_t* input,
uint8_t* output, uint8_t* output,
int pitch, int pitch,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, #define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2
uint8_t* output,
int pitch,
int tx_type);
void vp9_iht4x4_16_add_c(const tran_low_t* input, void vp9_iht4x4_16_add_c(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
...@@ -402,10 +368,7 @@ void vp9_iht4x4_16_add_sse2(const tran_low_t* input, ...@@ -402,10 +368,7 @@ void vp9_iht4x4_16_add_sse2(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t* input, #define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2
uint8_t* dest,
int stride,
int tx_type);
void vp9_iht8x8_64_add_c(const tran_low_t* input, void vp9_iht8x8_64_add_c(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
...@@ -415,10 +378,7 @@ void vp9_iht8x8_64_add_sse2(const tran_low_t* input, ...@@ -415,10 +378,7 @@ void vp9_iht8x8_64_add_sse2(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input, #define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2
uint8_t* dest,
int stride,
int tx_type);
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs, intptr_t n_coeffs,
...@@ -501,46 +461,18 @@ static void setup_rtcd_internal(void) { ...@@ -501,46 +461,18 @@ static void setup_rtcd_internal(void) {
(void)flags; (void)flags;
vp9_block_error = vp9_block_error_c; vp9_block_error = vp9_block_error_sse2;
if (flags & HAS_SSE2)
vp9_block_error = vp9_block_error_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_block_error = vp9_block_error_avx2; vp9_block_error = vp9_block_error_avx2;
vp9_block_error_fp = vp9_block_error_fp_c; vp9_block_error_fp = vp9_block_error_fp_sse2;
if (flags & HAS_SSE2)
vp9_block_error_fp = vp9_block_error_fp_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_block_error_fp = vp9_block_error_fp_avx2;
vp9_denoiser_filter = vp9_denoiser_filter_c;
if (flags & HAS_SSE2)
vp9_denoiser_filter = vp9_denoiser_filter_sse2;
vp9_diamond_search_sad = vp9_diamond_search_sad_c; vp9_diamond_search_sad = vp9_diamond_search_sad_c;
if (flags & HAS_AVX) if (flags & HAS_AVX)
vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_diamond_search_sad = vp9_diamond_search_sad_avx;
vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c;
if (flags & HAS_SSSE3) if (flags & HAS_SSSE3)
vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3;
vp9_fht16x16 = vp9_fht16x16_c;
if (flags & HAS_SSE2)
vp9_fht16x16 = vp9_fht16x16_sse2;
vp9_fht4x4 = vp9_fht4x4_c;
if (flags & HAS_SSE2)
vp9_fht4x4 = vp9_fht4x4_sse2;
vp9_fht8x8 = vp9_fht8x8_c;
if (flags & HAS_SSE2)
vp9_fht8x8 = vp9_fht8x8_sse2;
vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_c;
if (flags & HAS_SSE2)
vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_sse2;
vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_c;
if (flags & HAS_SSE2)
vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2;
vp9_fwht4x4 = vp9_fwht4x4_c;
if (flags & HAS_SSE2)
vp9_fwht4x4 = vp9_fwht4x4_sse2;
vp9_highbd_block_error = vp9_highbd_block_error_c;
if (flags & HAS_SSE2)
vp9_highbd_block_error = vp9_highbd_block_error_sse2;
vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c;
if (flags & HAS_SSE4_1) if (flags & HAS_SSE4_1)
vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1;
...@@ -550,18 +482,7 @@ static void setup_rtcd_internal(void) { ...@@ -550,18 +482,7 @@ static void setup_rtcd_internal(void) {
vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c; vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c;
if (flags & HAS_SSE4_1) if (flags & HAS_SSE4_1)
vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1;
vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; vp9_quantize_fp = vp9_quantize_fp_sse2;
if (flags & HAS_SSE2)
vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2;
vp9_iht4x4_16_add = vp9_iht4x4_16_add_c;
if (flags & HAS_SSE2)
vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2;
vp9_iht8x8_64_add = vp9_iht8x8_64_add_c;
if (flags & HAS_SSE2)
vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2;
vp9_quantize_fp = vp9_quantize_fp_c;
if (flags & HAS_SSE2)
vp9_quantize_fp = vp9_quantize_fp_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_quantize_fp = vp9_quantize_fp_avx2;
vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c;
......
third_party/libvpx/source/config/mac/ia32/vp9_rtcd.h
View file @ 147e6b6a
...@@ -79,15 +79,7 @@ int vp9_denoiser_filter_sse2(const uint8_t* sig, ...@@ -79,15 +79,7 @@ int vp9_denoiser_filter_sse2(const uint8_t* sig,
int increase_denoising, int increase_denoising,
BLOCK_SIZE bs, BLOCK_SIZE bs,
int motion_magnitude); int motion_magnitude);
RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t* sig, #define vp9_denoiser_filter vp9_denoiser_filter_sse2
int sig_stride,
const uint8_t* mc_avg,
int mc_avg_stride,
uint8_t* avg,
int avg_stride,
int increase_denoising,
BLOCK_SIZE bs,
int motion_magnitude);
int vp9_diamond_search_sad_c(const struct macroblock* x, int vp9_diamond_search_sad_c(const struct macroblock* x,
const struct search_site_config* cfg, const struct search_site_config* cfg,
...@@ -166,10 +158,7 @@ void vp9_fht16x16_sse2(const int16_t* input, ...@@ -166,10 +158,7 @@ void vp9_fht16x16_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht16x16)(const int16_t* input, #define vp9_fht16x16 vp9_fht16x16_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_fht4x4_c(const int16_t* input, void vp9_fht4x4_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -179,10 +168,7 @@ void vp9_fht4x4_sse2(const int16_t* input, ...@@ -179,10 +168,7 @@ void vp9_fht4x4_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht4x4)(const int16_t* input, #define vp9_fht4x4 vp9_fht4x4_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_fht8x8_c(const int16_t* input, void vp9_fht8x8_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -192,10 +178,7 @@ void vp9_fht8x8_sse2(const int16_t* input, ...@@ -192,10 +178,7 @@ void vp9_fht8x8_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht8x8)(const int16_t* input, #define vp9_fht8x8 vp9_fht8x8_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_filter_by_weight16x16_c(const uint8_t* src, void vp9_filter_by_weight16x16_c(const uint8_t* src,
int src_stride, int src_stride,
...@@ -207,11 +190,7 @@ void vp9_filter_by_weight16x16_sse2(const uint8_t* src, ...@@ -207,11 +190,7 @@ void vp9_filter_by_weight16x16_sse2(const uint8_t* src,
uint8_t* dst, uint8_t* dst,
int dst_stride, int dst_stride,
int src_weight); int src_weight);
RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t* src, #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_sse2
int src_stride,
uint8_t* dst,
int dst_stride,
int src_weight);
void vp9_filter_by_weight8x8_c(const uint8_t* src, void vp9_filter_by_weight8x8_c(const uint8_t* src,
int src_stride, int src_stride,
...@@ -223,17 +202,11 @@ void vp9_filter_by_weight8x8_sse2(const uint8_t* src, ...@@ -223,17 +202,11 @@ void vp9_filter_by_weight8x8_sse2(const uint8_t* src,
uint8_t* dst, uint8_t* dst,
int dst_stride, int dst_stride,
int src_weight); int src_weight);
RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t* src, #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_sse2
int src_stride,
uint8_t* dst,
int dst_stride,
int src_weight);
void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride);
RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t* input, #define vp9_fwht4x4 vp9_fwht4x4_sse2
tran_low_t* output,
int stride);
int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, int64_t vp9_highbd_block_error_c(const tran_low_t* coeff,
const tran_low_t* dqcoeff, const tran_low_t* dqcoeff,
...@@ -245,11 +218,7 @@ int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, ...@@ -245,11 +218,7 @@ int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff,
intptr_t block_size, intptr_t block_size,
int64_t* ssz, int64_t* ssz,
int bd); int bd);
RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t* coeff, #define vp9_highbd_block_error vp9_highbd_block_error_sse2
const tran_low_t* dqcoeff,
intptr_t block_size,
int64_t* ssz,
int bd);
void vp9_highbd_fht16x16_c(const int16_t* input, void vp9_highbd_fht16x16_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -389,10 +358,7 @@ void vp9_iht16x16_256_add_sse2(const tran_low_t* input, ...@@ -389,10 +358,7 @@ void vp9_iht16x16_256_add_sse2(const tran_low_t* input,
uint8_t* output, uint8_t* output,
int pitch, int pitch,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, #define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2
uint8_t* output,
int pitch,
int tx_type);
void vp9_iht4x4_16_add_c(const tran_low_t* input, void vp9_iht4x4_16_add_c(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
...@@ -402,10 +368,7 @@ void vp9_iht4x4_16_add_sse2(const tran_low_t* input, ...@@ -402,10 +368,7 @@ void vp9_iht4x4_16_add_sse2(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t* input, #define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2
uint8_t* dest,
int stride,
int tx_type);
void vp9_iht8x8_64_add_c(const tran_low_t* input, void vp9_iht8x8_64_add_c(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
...@@ -415,10 +378,7 @@ void vp9_iht8x8_64_add_sse2(const tran_low_t* input, ...@@ -415,10 +378,7 @@ void vp9_iht8x8_64_add_sse2(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input, #define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2
uint8_t* dest,
int stride,
int tx_type);
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs, intptr_t n_coeffs,
...@@ -501,46 +461,18 @@ static void setup_rtcd_internal(void) { ...@@ -501,46 +461,18 @@ static void setup_rtcd_internal(void) {
(void)flags; (void)flags;
vp9_block_error = vp9_block_error_c; vp9_block_error = vp9_block_error_sse2;
if (flags & HAS_SSE2)
vp9_block_error = vp9_block_error_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_block_error = vp9_block_error_avx2; vp9_block_error = vp9_block_error_avx2;
vp9_block_error_fp = vp9_block_error_fp_c; vp9_block_error_fp = vp9_block_error_fp_sse2;
if (flags & HAS_SSE2)
vp9_block_error_fp = vp9_block_error_fp_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_block_error_fp = vp9_block_error_fp_avx2;
vp9_denoiser_filter = vp9_denoiser_filter_c;
if (flags & HAS_SSE2)
vp9_denoiser_filter = vp9_denoiser_filter_sse2;
vp9_diamond_search_sad = vp9_diamond_search_sad_c; vp9_diamond_search_sad = vp9_diamond_search_sad_c;
if (flags & HAS_AVX) if (flags & HAS_AVX)
vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_diamond_search_sad = vp9_diamond_search_sad_avx;
vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c;
if (flags & HAS_SSSE3) if (flags & HAS_SSSE3)
vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3;
vp9_fht16x16 = vp9_fht16x16_c;
if (flags & HAS_SSE2)
vp9_fht16x16 = vp9_fht16x16_sse2;
vp9_fht4x4 = vp9_fht4x4_c;
if (flags & HAS_SSE2)
vp9_fht4x4 = vp9_fht4x4_sse2;
vp9_fht8x8 = vp9_fht8x8_c;
if (flags & HAS_SSE2)
vp9_fht8x8 = vp9_fht8x8_sse2;
vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_c;
if (flags & HAS_SSE2)
vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_sse2;
vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_c;
if (flags & HAS_SSE2)
vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2;
vp9_fwht4x4 = vp9_fwht4x4_c;
if (flags & HAS_SSE2)
vp9_fwht4x4 = vp9_fwht4x4_sse2;
vp9_highbd_block_error = vp9_highbd_block_error_c;
if (flags & HAS_SSE2)
vp9_highbd_block_error = vp9_highbd_block_error_sse2;
vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c;
if (flags & HAS_SSE4_1) if (flags & HAS_SSE4_1)
vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1;
...@@ -550,18 +482,7 @@ static void setup_rtcd_internal(void) { ...@@ -550,18 +482,7 @@ static void setup_rtcd_internal(void) {
vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c; vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c;
if (flags & HAS_SSE4_1) if (flags & HAS_SSE4_1)
vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1;
vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; vp9_quantize_fp = vp9_quantize_fp_sse2;
if (flags & HAS_SSE2)
vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2;
vp9_iht4x4_16_add = vp9_iht4x4_16_add_c;
if (flags & HAS_SSE2)
vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2;
vp9_iht8x8_64_add = vp9_iht8x8_64_add_c;
if (flags & HAS_SSE2)
vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2;
vp9_quantize_fp = vp9_quantize_fp_c;
if (flags & HAS_SSE2)
vp9_quantize_fp = vp9_quantize_fp_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_quantize_fp = vp9_quantize_fp_avx2;
vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c;
......
third_party/libvpx/source/config/vpx_version.h
View file @ 147e6b6a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 7 #define VERSION_MINOR 7
#define VERSION_PATCH 0 #define VERSION_PATCH 0
#define VERSION_EXTRA "897-g5de95cb09" #define VERSION_EXTRA "900-g0bfab0608"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.7.0-897-g5de95cb09" #define VERSION_STRING_NOSP "v1.7.0-900-g0bfab0608"
#define VERSION_STRING " v1.7.0-897-g5de95cb09" #define VERSION_STRING " v1.7.0-900-g0bfab0608"
third_party/libvpx/source/config/win/ia32/vp9_rtcd.h
View file @ 147e6b6a
...@@ -79,15 +79,7 @@ int vp9_denoiser_filter_sse2(const uint8_t* sig, ...@@ -79,15 +79,7 @@ int vp9_denoiser_filter_sse2(const uint8_t* sig,
int increase_denoising, int increase_denoising,
BLOCK_SIZE bs, BLOCK_SIZE bs,
int motion_magnitude); int motion_magnitude);
RTCD_EXTERN int (*vp9_denoiser_filter)(const uint8_t* sig, #define vp9_denoiser_filter vp9_denoiser_filter_sse2
int sig_stride,
const uint8_t* mc_avg,
int mc_avg_stride,
uint8_t* avg,
int avg_stride,
int increase_denoising,
BLOCK_SIZE bs,
int motion_magnitude);
int vp9_diamond_search_sad_c(const struct macroblock* x, int vp9_diamond_search_sad_c(const struct macroblock* x,
const struct search_site_config* cfg, const struct search_site_config* cfg,
...@@ -166,10 +158,7 @@ void vp9_fht16x16_sse2(const int16_t* input, ...@@ -166,10 +158,7 @@ void vp9_fht16x16_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht16x16)(const int16_t* input, #define vp9_fht16x16 vp9_fht16x16_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_fht4x4_c(const int16_t* input, void vp9_fht4x4_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -179,10 +168,7 @@ void vp9_fht4x4_sse2(const int16_t* input, ...@@ -179,10 +168,7 @@ void vp9_fht4x4_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht4x4)(const int16_t* input, #define vp9_fht4x4 vp9_fht4x4_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_fht8x8_c(const int16_t* input, void vp9_fht8x8_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -192,10 +178,7 @@ void vp9_fht8x8_sse2(const int16_t* input, ...@@ -192,10 +178,7 @@ void vp9_fht8x8_sse2(const int16_t* input,
tran_low_t* output, tran_low_t* output,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_fht8x8)(const int16_t* input, #define vp9_fht8x8 vp9_fht8x8_sse2
tran_low_t* output,
int stride,
int tx_type);
void vp9_filter_by_weight16x16_c(const uint8_t* src, void vp9_filter_by_weight16x16_c(const uint8_t* src,
int src_stride, int src_stride,
...@@ -207,11 +190,7 @@ void vp9_filter_by_weight16x16_sse2(const uint8_t* src, ...@@ -207,11 +190,7 @@ void vp9_filter_by_weight16x16_sse2(const uint8_t* src,
uint8_t* dst, uint8_t* dst,
int dst_stride, int dst_stride,
int src_weight); int src_weight);
RTCD_EXTERN void (*vp9_filter_by_weight16x16)(const uint8_t* src, #define vp9_filter_by_weight16x16 vp9_filter_by_weight16x16_sse2
int src_stride,
uint8_t* dst,
int dst_stride,
int src_weight);
void vp9_filter_by_weight8x8_c(const uint8_t* src, void vp9_filter_by_weight8x8_c(const uint8_t* src,
int src_stride, int src_stride,
...@@ -223,17 +202,11 @@ void vp9_filter_by_weight8x8_sse2(const uint8_t* src, ...@@ -223,17 +202,11 @@ void vp9_filter_by_weight8x8_sse2(const uint8_t* src,
uint8_t* dst, uint8_t* dst,
int dst_stride, int dst_stride,
int src_weight); int src_weight);
RTCD_EXTERN void (*vp9_filter_by_weight8x8)(const uint8_t* src, #define vp9_filter_by_weight8x8 vp9_filter_by_weight8x8_sse2
int src_stride,
uint8_t* dst,
int dst_stride,
int src_weight);
void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); void vp9_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride);
void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride); void vp9_fwht4x4_sse2(const int16_t* input, tran_low_t* output, int stride);
RTCD_EXTERN void (*vp9_fwht4x4)(const int16_t* input, #define vp9_fwht4x4 vp9_fwht4x4_sse2
tran_low_t* output,
int stride);
int64_t vp9_highbd_block_error_c(const tran_low_t* coeff, int64_t vp9_highbd_block_error_c(const tran_low_t* coeff,
const tran_low_t* dqcoeff, const tran_low_t* dqcoeff,
...@@ -245,11 +218,7 @@ int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff, ...@@ -245,11 +218,7 @@ int64_t vp9_highbd_block_error_sse2(const tran_low_t* coeff,
intptr_t block_size, intptr_t block_size,
int64_t* ssz, int64_t* ssz,
int bd); int bd);
RTCD_EXTERN int64_t (*vp9_highbd_block_error)(const tran_low_t* coeff, #define vp9_highbd_block_error vp9_highbd_block_error_sse2
const tran_low_t* dqcoeff,
intptr_t block_size,
int64_t* ssz,
int bd);
void vp9_highbd_fht16x16_c(const int16_t* input, void vp9_highbd_fht16x16_c(const int16_t* input,
tran_low_t* output, tran_low_t* output,
...@@ -389,10 +358,7 @@ void vp9_iht16x16_256_add_sse2(const tran_low_t* input, ...@@ -389,10 +358,7 @@ void vp9_iht16x16_256_add_sse2(const tran_low_t* input,
uint8_t* output, uint8_t* output,
int pitch, int pitch,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, #define vp9_iht16x16_256_add vp9_iht16x16_256_add_sse2
uint8_t* output,
int pitch,
int tx_type);
void vp9_iht4x4_16_add_c(const tran_low_t* input, void vp9_iht4x4_16_add_c(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
...@@ -402,10 +368,7 @@ void vp9_iht4x4_16_add_sse2(const tran_low_t* input, ...@@ -402,10 +368,7 @@ void vp9_iht4x4_16_add_sse2(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t* input, #define vp9_iht4x4_16_add vp9_iht4x4_16_add_sse2
uint8_t* dest,
int stride,
int tx_type);
void vp9_iht8x8_64_add_c(const tran_low_t* input, void vp9_iht8x8_64_add_c(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
...@@ -415,10 +378,7 @@ void vp9_iht8x8_64_add_sse2(const tran_low_t* input, ...@@ -415,10 +378,7 @@ void vp9_iht8x8_64_add_sse2(const tran_low_t* input,
uint8_t* dest, uint8_t* dest,
int stride, int stride,
int tx_type); int tx_type);
RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input, #define vp9_iht8x8_64_add vp9_iht8x8_64_add_sse2
uint8_t* dest,
int stride,
int tx_type);
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs, intptr_t n_coeffs,
...@@ -501,46 +461,18 @@ static void setup_rtcd_internal(void) { ...@@ -501,46 +461,18 @@ static void setup_rtcd_internal(void) {
(void)flags; (void)flags;
vp9_block_error = vp9_block_error_c; vp9_block_error = vp9_block_error_sse2;
if (flags & HAS_SSE2)
vp9_block_error = vp9_block_error_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_block_error = vp9_block_error_avx2; vp9_block_error = vp9_block_error_avx2;
vp9_block_error_fp = vp9_block_error_fp_c; vp9_block_error_fp = vp9_block_error_fp_sse2;
if (flags & HAS_SSE2)
vp9_block_error_fp = vp9_block_error_fp_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_block_error_fp = vp9_block_error_fp_avx2; vp9_block_error_fp = vp9_block_error_fp_avx2;
vp9_denoiser_filter = vp9_denoiser_filter_c;
if (flags & HAS_SSE2)
vp9_denoiser_filter = vp9_denoiser_filter_sse2;
vp9_diamond_search_sad = vp9_diamond_search_sad_c; vp9_diamond_search_sad = vp9_diamond_search_sad_c;
if (flags & HAS_AVX) if (flags & HAS_AVX)
vp9_diamond_search_sad = vp9_diamond_search_sad_avx; vp9_diamond_search_sad = vp9_diamond_search_sad_avx;
vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; vp9_fdct8x8_quant = vp9_fdct8x8_quant_c;
if (flags & HAS_SSSE3) if (flags & HAS_SSSE3)
vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3; vp9_fdct8x8_quant = vp9_fdct8x8_quant_ssse3;
vp9_fht16x16 = vp9_fht16x16_c;
if (flags & HAS_SSE2)
vp9_fht16x16 = vp9_fht16x16_sse2;
vp9_fht4x4 = vp9_fht4x4_c;
if (flags & HAS_SSE2)
vp9_fht4x4 = vp9_fht4x4_sse2;
vp9_fht8x8 = vp9_fht8x8_c;
if (flags & HAS_SSE2)
vp9_fht8x8 = vp9_fht8x8_sse2;
vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_c;
if (flags & HAS_SSE2)
vp9_filter_by_weight16x16 = vp9_filter_by_weight16x16_sse2;
vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_c;
if (flags & HAS_SSE2)
vp9_filter_by_weight8x8 = vp9_filter_by_weight8x8_sse2;
vp9_fwht4x4 = vp9_fwht4x4_c;
if (flags & HAS_SSE2)
vp9_fwht4x4 = vp9_fwht4x4_sse2;
vp9_highbd_block_error = vp9_highbd_block_error_c;
if (flags & HAS_SSE2)
vp9_highbd_block_error = vp9_highbd_block_error_sse2;
vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_c;
if (flags & HAS_SSE4_1) if (flags & HAS_SSE4_1)
vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1; vp9_highbd_iht16x16_256_add = vp9_highbd_iht16x16_256_add_sse4_1;
...@@ -550,18 +482,7 @@ static void setup_rtcd_internal(void) { ...@@ -550,18 +482,7 @@ static void setup_rtcd_internal(void) {
vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c; vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_c;
if (flags & HAS_SSE4_1) if (flags & HAS_SSE4_1)
vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1; vp9_highbd_iht8x8_64_add = vp9_highbd_iht8x8_64_add_sse4_1;
vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; vp9_quantize_fp = vp9_quantize_fp_sse2;
if (flags & HAS_SSE2)
vp9_iht16x16_256_add = vp9_iht16x16_256_add_sse2;
vp9_iht4x4_16_add = vp9_iht4x4_16_add_c;
if (flags & HAS_SSE2)
vp9_iht4x4_16_add = vp9_iht4x4_16_add_sse2;
vp9_iht8x8_64_add = vp9_iht8x8_64_add_c;
if (flags & HAS_SSE2)
vp9_iht8x8_64_add = vp9_iht8x8_64_add_sse2;
vp9_quantize_fp = vp9_quantize_fp_c;
if (flags & HAS_SSE2)
vp9_quantize_fp = vp9_quantize_fp_sse2;
if (flags & HAS_AVX2) if (flags & HAS_AVX2)
vp9_quantize_fp = vp9_quantize_fp_avx2; vp9_quantize_fp = vp9_quantize_fp_avx2;
vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c; vp9_scale_and_extend_frame = vp9_scale_and_extend_frame_c;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment