Commit e2e9e0d6 authored by Patrik Höglund's avatar Patrik Höglund Committed by Commit Bot

Revert "Roll src/third_party/libvpx/source/libvpx/ 753fd86e8..4ddfa331c (26 commits)"

This reverts commit 03d7e3ce.

Reason for revert: Reverting on behalf of titovartem@. Breaks WebRTC since vp9_svc_layercontext doesn't compile: https://logs.chromium.org/logs/webrtc/buildbucket/cr-buildbucket.appspot.com/8935991820767406272/+/steps/compile/0/stdout

Original change's description:
> Roll src/third_party/libvpx/source/libvpx/ 753fd86e8..4ddfa331c (26 commits)
> 
> https://chromium.googlesource.com/webm/libvpx.git/+log/753fd86e86ac..4ddfa331c4f5
> 
> $ git log 753fd86e8..4ddfa331c --date=short --no-merges --format='%ad %ae %s'
> 2018-09-05 huisu Initialize the best partition before partition RDO
> 2018-08-29 marpan vp9-svc: Allow for setting framerate per spatial layer.
> 2018-08-31 jingning Adaptive ARF factor decision
> 2018-08-29 jingning Recursive rate allocation for multi-layer ARF coding
> 2018-08-28 jingning Enable adaptive rate allocation for multi-layer ARFs
> 2018-09-04 huisu Move partition search ML models to a seperate file
> 2018-09-04 marpan vp9-svc: Fix to first_spatial_to_encode for pattern constraint.
> 2018-08-28 jingning Increase encoder buffer for multi-layer ARFs
> 2018-08-28 jingning Structure the multi-layer ARF locations
> 2018-09-03 paulwilkins Fix short first kf bug.
> 2018-08-27 jingning Assign target bits for multi-layer ARF system
> 2018-09-03 marpan vp9-svc: Add bypass flag to constrain inter_layer.
> 2018-09-03 paulwilkins Revert "Revert "Prevent double application of min rate in two pass.""
> 2018-09-02 marpan vp9-svc: Fix condition for pattern constraints
> 2018-08-27 jingning Properly update the raw_src_frame for psnr calculation
> 2018-08-25 jingning Build arf index stack
> 2018-08-31 marpan vp9-svc: Add first_spatial_layer_to_encode per superframe
> 2018-07-16 huisu ML based rectangular partition search pruning
> 2018-08-24 jingning Fix arf_src_offset calculation
> 2018-08-23 jingning Set minimum frame size to be 1 byte
> (...)
> 
> Created with:
>   roll-dep src/third_party/libvpx/source/libvpx
> R=​johannkoenig@google.com
> 
> Change-Id: Iabdcddd52bc1b080b87155333614cb0f07b34627
> Reviewed-on: https://chromium-review.googlesource.com/1214362
> Reviewed-by: Tom Finegan <tomfinegan@chromium.org>
> Commit-Queue: Jerome Jiang <jianj@google.com>
> Cr-Commit-Position: refs/heads/master@{#589741}

TBR=tomfinegan@chromium.org,johannkoenig@google.com,jianj@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Change-Id: Ie1c41b10efa405e560d79a3755e4fbada743705c
Reviewed-on: https://chromium-review.googlesource.com/1219626Reviewed-by: default avatarPatrik Höglund <phoglund@chromium.org>
Commit-Queue: Patrik Höglund <phoglund@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590287}
parent f885edf6
...@@ -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' + '@' + '4ddfa331c4f5730e1fbcf561d91602c6806ac5ae', Var('chromium_git') + '/webm/libvpx.git' + '@' + '753fd86e86ac727dccac88376260b8f54502f2a3',
'src/third_party/libwebm/source': 'src/third_party/libwebm/source':
Var('chromium_git') + '/webm/libwebm.git' + '@' + '01c1d1d76f139345c442bfc8e61b4e1cba809059', Var('chromium_git') + '/webm/libwebm.git' + '@' + '01c1d1d76f139345c442bfc8e61b4e1cba809059',
......
...@@ -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: Thursday September 06 2018 Date: Thursday August 30 2018
Branch: master Branch: master
Commit: 4ddfa331c4f5730e1fbcf561d91602c6806ac5ae Commit: 753fd86e86ac727dccac88376260b8f54502f2a3
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
......
...@@ -234,7 +234,6 @@ libvpx_srcs_x86 = [ ...@@ -234,7 +234,6 @@ libvpx_srcs_x86 = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -708,7 +707,6 @@ libvpx_srcs_x86_64 = [ ...@@ -708,7 +707,6 @@ libvpx_srcs_x86_64 = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -1183,7 +1181,6 @@ libvpx_srcs_arm = [ ...@@ -1183,7 +1181,6 @@ libvpx_srcs_arm = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -1553,7 +1550,6 @@ libvpx_srcs_arm_neon = [ ...@@ -1553,7 +1550,6 @@ libvpx_srcs_arm_neon = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -1949,7 +1945,6 @@ libvpx_srcs_arm_neon_cpu_detect = [ ...@@ -1949,7 +1945,6 @@ libvpx_srcs_arm_neon_cpu_detect = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -2400,7 +2395,6 @@ libvpx_srcs_arm64 = [ ...@@ -2400,7 +2395,6 @@ libvpx_srcs_arm64 = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -2779,7 +2773,6 @@ libvpx_srcs_mips = [ ...@@ -2779,7 +2773,6 @@ libvpx_srcs_mips = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -3119,7 +3112,6 @@ libvpx_srcs_nacl = [ ...@@ -3119,7 +3112,6 @@ libvpx_srcs_nacl = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
...@@ -3458,7 +3450,6 @@ libvpx_srcs_generic = [ ...@@ -3458,7 +3450,6 @@ libvpx_srcs_generic = [
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_multi_thread.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_noise_estimate.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_partition_models.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_picklpf.h",
"//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c", "//third_party/libvpx/source/libvpx/vp9/encoder/vp9_pickmode.c",
......
...@@ -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 "949-g4ddfa331c" #define VERSION_EXTRA "902-g753fd86e8"
#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-949-g4ddfa331c" #define VERSION_STRING_NOSP "v1.7.0-902-g753fd86e8"
#define VERSION_STRING " v1.7.0-949-g4ddfa331c" #define VERSION_STRING " v1.7.0-902-g753fd86e8"
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