0

Roll src/third_party/libvpx/source/libvpx/ 9a032fa26..1961a92a9 (33 commits).

9a032fa262..1961a92a94

$ git log 9a032fa26..1961a92a9 --date=short --no-merges --format='%ad %ae %s'
2016-11-01 jzern vp9,tile_worker_hook: correctly set jmp target
2016-10-25 linfengz Add high bitdepth intra prediction optimization speed test
2016-10-21 linfengz Refine 8-bit intra prediction NEON optimization (mode tm)
2016-10-31 jzern idct32x32_1_add_neon: clear a couple conv warnings
2016-10-31 jzern build/make/Android.mk: s/armv8/arm64/
2016-10-31 jzern build/make/Android.mk: fix armeabi-v7a build
2016-10-31 jzern use .S suffix rather than .s for NEON asm
2016-10-31 marpan vp9-svc: Fix some stats in vp9_spatial_svc_encoder.
2016-10-31 pbos Add vp9_spatial_svc_encoder to .gitignore.
2016-10-18 jzern idct,NEON: add a tran_low_t->s16 load adapter
2016-10-21 linfengz Refine 8-bit intra prediction NEON optimization (mode h and v)
2016-10-30 marpan vp9-svc: Add checks to layer bitrates in vp9_spatial_svc_encoder.
2016-10-28 jimbankoski vpxdec.c : don't double count corrupted frames
2016-10-29 jzern tiny_ssim: fix visual studio build
2016-10-28 pbos Add temporal-layer support to tiny_ssim.
2016-10-27 marpan vp9: Updates to SVC sample encoder.
2016-10-27 pbos Add tools/tiny_ssim for generating SSIM/PSNR.
2016-10-12 paulwilkins Change to KF boost calculation.
2016-10-21 linfengz Refine 8-bit intra prediction NEON optimization (mode d45 and d135)
2016-10-26 debargha Force recode if framesize exceeds max allowed size
(...)

+ add an include path for NEON asm allowing it to include generated sources
  which match the source tree layout, e.g., vpx_dsp/arm/...

R=johannkoenig@google.com
BUG=629481

Review-Url: https://codereview.chromium.org/2471423002
Cr-Commit-Position: refs/heads/master@{#429704}
This commit is contained in:
jzern
2016-11-03 14:49:39 -07:00
committed by Commit bot
parent 5d71aefe92
commit 9334c34dbc
8 changed files with 34 additions and 18 deletions
DEPS
third_party/libvpx

2
DEPS

@ -192,7 +192,7 @@ deps = {
Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',
'src/third_party/libvpx/source/libvpx':
Var('chromium_git') + '/webm/libvpx.git' + '@' + '9a032fa2628ee55ec557d2c03fb09ead796eea3d',
Var('chromium_git') + '/webm/libvpx.git' + '@' + '1961a92a940ce73bb4f522c3e87b1fbdea216112',
'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '3c7a09882102bfd6fecdb9d7296f43a8501db95e',

@ -228,8 +228,11 @@ if (current_cpu == "arm" && arm_assembly_sources != []) {
action_foreach("convert_arm_assembly") {
script = "//third_party/libvpx/run_perl.py"
sources = arm_assembly_sources
gen_file =
get_label_info("//third_party/libvpx/source/libvpx", "root_gen_dir") +
"/{{source_root_relative_dir}}/{{source_file_part}}.S"
outputs = [
"$target_gen_dir/{{source_name_part}}.S",
gen_file,
]
if (is_ios) {
ads2gas_script =
@ -244,7 +247,7 @@ if (current_cpu == "arm" && arm_assembly_sources != []) {
"-i",
"{{source}}",
"-o",
rebase_path("$target_gen_dir/{{source_name_part}}.S"),
rebase_path(gen_file),
]
}
@ -255,6 +258,11 @@ if (current_cpu == "arm" && arm_assembly_sources != []) {
configs += [ ":libvpx_warnings" ]
if (cpu_arch_full == "arm-neon" || cpu_arch_full == "arm-neon-cpu-detect") {
asmflags = [ "-mfpu=neon" ]
# allow asm files to include generated sources which match the source
# tree layout, e.g., vpx_dsp/arm/...
include_dirs = [ get_label_info("//third_party/libvpx/source/libvpx",
"target_gen_dir") ]
}
deps = [
":convert_arm_assembly",

@ -5,9 +5,9 @@ License: BSD
License File: source/libvpx/LICENSE
Security Critical: yes
Date: Saturday October 22 2016
Date: Tuesday November 01 2016
Branch: master
Commit: 9a032fa2628ee55ec557d2c03fb09ead796eea3d
Commit: 1961a92a940ce73bb4f522c3e87b1fbdea216112
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and

@ -1516,6 +1516,10 @@ libvpx_srcs_arm_neon = [
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/fwd_txfm_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/hadamard_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct_neon.h",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/intrapred_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_vertical_4_dual_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/sad4d_neon.c",
@ -1587,12 +1591,11 @@ libvpx_srcs_arm_neon = [
libvpx_srcs_arm_neon_assembly = [
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/intrapred_neon_asm.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_16_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_4_neon.asm",
@ -1876,6 +1879,7 @@ libvpx_srcs_arm_neon_cpu_detect = [
"//third_party/libvpx/source/libvpx/vpx/vpx_image.h",
"//third_party/libvpx/source/libvpx/vpx/vpx_integer.h",
"//third_party/libvpx/source/libvpx/vpx_dsp/add_noise.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct_neon.h",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/transpose_neon.h",
"//third_party/libvpx/source/libvpx/vpx_dsp/avg.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/bitreader.c",
@ -1939,12 +1943,11 @@ libvpx_srcs_arm_neon_cpu_detect = [
libvpx_srcs_arm_neon_cpu_detect_assembly = [
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_1_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_add_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/intrapred_neon_asm.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_16_neon.asm",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_4_neon.asm",
@ -1984,6 +1987,9 @@ libvpx_srcs_arm_neon_cpu_detect_neon = [
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/fwd_txfm_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/hadamard_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/intrapred_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_vertical_4_dual_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/sad4d_neon.c",
@ -2297,11 +2303,13 @@ libvpx_srcs_arm64 = [
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct16x16_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct32x32_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_1_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct4x4_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct8x8_add_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/idct_neon.h",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/intrapred_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/loopfilter_neon.c",
"//third_party/libvpx/source/libvpx/vpx_dsp/arm/sad4d_neon.c",

@ -337,7 +337,7 @@ void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int dest_s
RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
@ -936,7 +936,7 @@ static void setup_rtcd_internal(void)
vpx_idct32x32_1_add = vpx_idct32x32_1_add_c;
if (flags & HAS_NEON) vpx_idct32x32_1_add = vpx_idct32x32_1_add_neon;
vpx_idct32x32_34_add = vpx_idct32x32_34_add_c;
if (flags & HAS_NEON) vpx_idct32x32_34_add = vpx_idct32x32_1024_add_neon;
if (flags & HAS_NEON) vpx_idct32x32_34_add = vpx_idct32x32_34_add_neon;
vpx_idct4x4_16_add = vpx_idct4x4_16_add_c;
if (flags & HAS_NEON) vpx_idct4x4_16_add = vpx_idct4x4_16_add_neon;
vpx_idct4x4_1_add = vpx_idct4x4_1_add_c;

@ -337,8 +337,8 @@ void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int dest_s
#define vpx_idct32x32_1_add vpx_idct32x32_1_add_neon
void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
#define vpx_idct32x32_34_add vpx_idct32x32_1024_add_neon
void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
#define vpx_idct32x32_34_add vpx_idct32x32_34_add_neon
void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);

@ -337,8 +337,8 @@ void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int dest_s
#define vpx_idct32x32_1_add vpx_idct32x32_1_add_neon
void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
#define vpx_idct32x32_34_add vpx_idct32x32_1024_add_neon
void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
#define vpx_idct32x32_34_add vpx_idct32x32_34_add_neon
void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);

@ -1,7 +1,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 6
#define VERSION_PATCH 0
#define VERSION_EXTRA "612-g9a032fa"
#define VERSION_EXTRA "670-g1961a92"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
#define VERSION_STRING_NOSP "v1.6.0-612-g9a032fa"
#define VERSION_STRING " v1.6.0-612-g9a032fa"
#define VERSION_STRING_NOSP "v1.6.0-670-g1961a92"
#define VERSION_STRING " v1.6.0-670-g1961a92"