Roll src/third_party/libvpx/source/libvpx/ d636fe53a..be5df6080 (20 commits)
https://chromium.googlesource.com/webm/libvpx.git/+log/d636fe53af52..be5df6080154
$ git log d636fe53a..be5df6080 --date=short --no-merges --format='%ad %ae %s'
2018-04-09 marpan vp9-svc: Make constrained_layer_drop default for svc.
2018-04-05 jianj Fix settings for num of tiles in samples & tests.
2018-04-06 marpan vp9-svc: Hybrid search on spatial layers whose base is key.
2018-04-06 marpan Revert "vp9-svc: Fix to first superframe when inter_layer is off."
2018-04-04 marpan vp9-svc: Fix to first superframe when inter_layer is off.
2018-04-05 marpan vp9-svc: Fix to disable cyclic refresh on key superframes.
2018-04-05 johannkoenig update codereview.settings
2018-03-27 johannkoenig ios configure: quiet shell warning
2018-04-03 marpan vp9-svc: Fix in choose_partitioning for different scaling.
2018-04-03 linfengz rm CONVERT_TO_SHORTPTR in vpx_highbd_comp_avg_pred
2018-04-03 marpan Fix to svc sample enocoder for visual studio build.
2018-04-02 johannkoenig remove support for yuv 411
2018-04-02 marpan vp9-svc: Fix to svc sample encoder for write_out.
2018-03-30 jzern vp9_datarate_test: relax over shoot constraints
2018-03-30 jianj VP9 SVC: Write bitstream for each spatial layer in sample.
2018-03-30 jianj Code cleanup for datarate tests.
2018-03-28 jianj Split datarate_test.cc to vp8, vp9, svc ones.
2018-03-27 johannkoenig helper script for sanitizer testing
2018-03-26 linfengz Shrink size of mode_map in struct TileDataEnc
2018-03-26 linfengz Update sad4d x86 functions
Created with:
roll-dep src/third_party/libvpx/source/libvpx
[email protected]
Change-Id: I49e1a06d1f7ab71c77bc0cdbc11fddd0cdcd4cc7
Reviewed-on: https://chromium-review.googlesource.com/1008641
Reviewed-by: Johann Koenig <[email protected]>
Commit-Queue: Jerome Jiang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#550248}diff --git a/DEPS b/DEPS
index 938c8ad..aae98cd7 100644
--- a/DEPS
+++ b/DEPS
@@ -664,7 +664,7 @@
},
'src/third_party/libvpx/source/libvpx':
- Var('chromium_git') + '/webm/libvpx.git' + '@' + 'd636fe53af525c30f3bbd7224e7e56d447d0eb3d',
+ Var('chromium_git') + '/webm/libvpx.git' + '@' + 'be5df6080154e58db88fa3640e127efd18c04bde',
'src/third_party/libwebm/source':
Var('chromium_git') + '/webm/libwebm.git' + '@' + 'b03c65468b06d097f27235d93d76bfc45f490ede',
diff --git a/third_party/libvpx/README.chromium b/third_party/libvpx/README.chromium
index a879498..ef97e284 100644
--- a/third_party/libvpx/README.chromium
+++ b/third_party/libvpx/README.chromium
@@ -5,9 +5,9 @@
License File: source/libvpx/LICENSE
Security Critical: yes
-Date: Thursday March 29 2018
+Date: Monday April 09 2018
Branch: master
-Commit: d636fe53af525c30f3bbd7224e7e56d447d0eb3d
+Commit: be5df6080154e58db88fa3640e127efd18c04bde
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and
diff --git a/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h
index ad8928bf..9770717 100644
--- a/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/linux/generic/vpx_dsp_rtcd.h
@@ -1723,10 +1723,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
diff --git a/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
index 2ad1642..4e665cc 100644
--- a/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/linux/ia32/vpx_dsp_rtcd.h
@@ -3642,10 +3642,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
diff --git a/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h
index 4f34b7a..49a7371 100644
--- a/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/linux/x64/vpx_dsp_rtcd.h
@@ -2955,10 +2955,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
diff --git a/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h
index 2ad1642..4e665cc 100644
--- a/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/mac/ia32/vpx_dsp_rtcd.h
@@ -3642,10 +3642,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
diff --git a/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h
index 4f34b7a..49a7371 100644
--- a/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/mac/x64/vpx_dsp_rtcd.h
@@ -2955,10 +2955,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
diff --git a/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h
index ad8928bf..9770717 100644
--- a/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/nacl/vpx_dsp_rtcd.h
@@ -1723,10 +1723,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
diff --git a/third_party/libvpx/source/config/vpx_version.h b/third_party/libvpx/source/config/vpx_version.h
index f93e75fe..cf24c88 100644
--- a/third_party/libvpx/source/config/vpx_version.h
+++ b/third_party/libvpx/source/config/vpx_version.h
@@ -2,7 +2,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 7
#define VERSION_PATCH 0
-#define VERSION_EXTRA "233-gd636fe53a"
+#define VERSION_EXTRA "262-gbe5df6080"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.7.0-233-gd636fe53a"
-#define VERSION_STRING " v1.7.0-233-gd636fe53a"
+#define VERSION_STRING_NOSP "v1.7.0-262-gbe5df6080"
+#define VERSION_STRING " v1.7.0-262-gbe5df6080"
diff --git a/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h
index 2ad1642..4e665cc 100644
--- a/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/win/ia32/vpx_dsp_rtcd.h
@@ -3642,10 +3642,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
diff --git a/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h
index 4f34b7a..49a7371 100644
--- a/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/win/x64/vpx_dsp_rtcd.h
@@ -2955,10 +2955,10 @@
#define vpx_highbd_avg_8x8 vpx_highbd_avg_8x8_c
void vpx_highbd_comp_avg_pred_c(uint16_t* comp_pred,
- const uint8_t* pred8,
+ const uint16_t* pred,
int width,
int height,
- const uint8_t* ref8,
+ const uint16_t* ref,
int ref_stride);
#define vpx_highbd_comp_avg_pred vpx_highbd_comp_avg_pred_c
