libvpx: Pull from upstream

Update libvpx to a version that supports decryptor callbacks for VP9.

Note that this feature is required in the CDM's libvpx revision in
order to decode encrypted VP9, but is not required in Chromium's libvpx
in order to feed encrypted VP9 data to the CDM.

Current HEAD: 23ccf7192434399e5db3a981fbfde40e1712ed5f

git log from upstream:
68ff368 Enable tests using WebM files only if webm_io is enabled
086ae99 Fixed handling of regularly placed keyframes
95735c3 configure: quote some uses of source_path
18c0860 Add VPXD_SET_DECRYPTOR support to the VP9 decoder.
792509d gen_msvs_vcxproj.sh: support cygwin style paths
a757a99 gen_msvs_proj.sh: support cygwin style paths
8969f7c Chessboard pattern prediction filter type search in non-RD coding
522f7c8 tools_common.sh: Add run messages.
39c5a4b tools_common.sh: Set VPX_TEST_EXE_SUFFIX for windows targets.
e608418 Renaming MB_PREDICTION_MODE to PREDICTION_MODE.
54006d1 Adding macro to define vp9_variance_WxH_c() functions.
ef00307 Renaming "onyx" to "encoder".
e6222b1 Fix the CONFIG_ALPHA build.
20c3077 Rename FilterMode for compatibility with libyuv
7b7c843 Add utiltest target to Makefile.
59e733c Force ARNR filtering to be centered on the ARF frame
0b25a3c Inlining vp9_set_segmentation_map() function.
b02b362 Template macros to generate subpix variance functions.
1893122 Fix dr memory VP8 encode/decode errors
3d4ed27 Reusing vp9_get_interp_kernel() function in unit tests.
d928b34 Allow full RD TX size search for GF/ALT at speed 2
26210c6 Adds test code for supplemental superframe data
4c7af85 Change naming of end_usage parameter.
80a4f55 Enable background detection for adaptive quantizer control
bae205f Remove an unused function
96f8895 test/WebMVideoSource: fix WebMInputContext leak
513743b Inlining and removing encoder_common_init().
5a54977 Cleaning vp9_variance.{c, h}.
d5d26f7 Cleaning up vp9_rdopt.c.
76d58ba Moving set_rd_speed_thresholds{,_sub8x8} to vp9_rdopt.{h, c}.
4c60968 Don't set loop filter sharpness in vp9_change_config().
1ec4450 Bug fix for svc first pass rate control.
07f86d0 Renaming VP9_CONFIG to VP9EncoderConfig.
a6266e0 Remove ALT_REF_MC_ENABLED and tidy-up ARNR code.
4fd6317 Remove duplicate code in test/webm_video_source.h
d6fe868 Remove warn() call in webmdec.c
a7c69a7 Fix broken encoding process at sub8x8 block size
219a006 Adding get_pass() function.
52549b4 Adding is_best_mode() function.
53dbc7f Removing cq_target_quality from VP9_COMP.
d3ccf55 rename labels2mode because it was a terrible name.
02e5bde Merge two new VBR adjustment schemes.
42c1f6d Skip fetching original frame pointers for UV in background check
e3578af examples: remove off_t overrides
fba9b09 renamed pick_best_mbsegmentation and remove rd_check_segment_txsize
6f5e9a7 Relax the threshold for datarate test by 5%
5c28d1a rename mode_index to ref index in vp9_rd_pick_inter_mode_sub_8x8
e890c25 add a context tree structure to encoder
2c8c1f5 Replacing cpu_used with speed in VP9_CONFIG.
b6ec693 Remove redundant buffer initialization and mode_info assignments
085f76e Add experimental VBR adaptation method.
961594c Cleaning up vp9_init_second_pass().
e88a280 Enable more precise background detection for partition decision
99230ae Prevent reading of uninitialized value
e434d08 Remove old activity masking code.
0d8e4f9 Unfork rd_thresh sub8x8.
658daf3 Fix rate control bug.
4e9529c Renaming av_per_frame_bandwidth to avg_frame_bandwidth.
7a85ba8 Adding sad function generation macros.
2f86279 Adding scale_if_required() function.
0739cab Adding get_search_range() function.
b92eb54 webmdec: Fix return values for webm_read_frame
8f6f6ab Add consts in set_fixed_partitioning()
1cda057 Refactor common code into a function
41a4b88 Adding get_skip_encode_frame().
c1981bd Using anonymous enum instead of macros.
bda2417 Remove fatal() call in webmdec.c
f3739f9 Consistent mode names.
c8c1b43 More user friendly vpxenc help strings.
60db131 Replacing int_mv with MV.
2fc3a18 Removing unused vp9_mcomp_x86.h file.
54306b5 Reduce code duplication
f7bd127 Enable vpxenc to specify internal coded frame size
19536d6 Remove vp9_ prefix on static inline function.
0639b5c Speed 2 alternative balance.
1f58f9d Fixing error found by ioc.
6035000 Removing redundant checks from vp9_change_config().
9168f18 Add a few "const"
3766ccd Adding consts in vp9_picklpf.c.
ab3d8e6 Renaming VP9D_CONFIG to VP9DecoderConfig.
35a63b7 Cleaning up check_best_zero_mv().
335a18a Adding vp9_rc_update_framerate() function.
58c4098 Removing redundant mvsadcost local variables.
1243d26 Replace the call to set_offsets()
d30f6b3 rename README.webm -> README.libvpx
79dd5e7 Renaming zz_motion_search() to get_block_variance().
1ff4aa3 Adding RD_OPT struct.
93169f8 vp9_rc_postencode_update() cleanup.
591e383 Adding temp variable q to vp9_cyclic_refresh_setup().
63fa722 Removing unused cost arguments from mcomp functions.
1d97554 Adjust active minQ calculation for normal frames.
d83f6f0 Change Qlimit for arf kf.
73aa5b7 Replacing int_mv with MV.
5939ca9 Removing unnecessary typedef.
8503d72 Removing legacy XMA code from vp8.
a4c3e2e Cleaning up optimize_b().
31c7a9b Fix the VP9 encoding unit test failure on ARM.
a286ff8 Moving last_frame_type update out from vp9_rc_postencode_update.
4d2523b Removing output_framerate field from VP9_COMP.
69c6671 Cleaning up vp9_dthread.{c, h}.
d312738 Removing offset argument of mvcomp macros.
c8167f5 Fixing invalid ref buffer in vp9_diamond_search_sad_c().
a39b201 Remove the unneeded output_framerate from svc.
72fbccb Cleaning up vp9_rc_compute_frame_size_bounds().
11eb607 Removing unnecessary vp9_zero() call.
9cf7a0f Cleaning up optimize_b().
eb505a3 Define var threshold as unsigned int to match the type
409f8da Fix onyx_if.c to not to redefine M_LOG2_E if it's already defined.
95f14d7 Adding setup_frame() function.
c3de569 Cleaning up vp9_twopass_worst_quality().
1d5ed02 Moving frame_frags field from VP9Common to VP9_COMP.
dad9e4a Remove vestiges of large tx sizes in sub8x8 code.
1dcc1aa Prevent the usage of invalid best_mode_index
46a20d6 Removing unused initial_{width, height} from VP9Decoder.
2255085 Fix coding format in vp9_rc_regulate_q
60def47 Revert "Converting set_prev_mi() to get_prev_mi()."
666ecf2 Cleanup table declarations in vp9_rdopt.
b60d23f Removing unused code from vp9_onyx_if.c.
d1a396d Moving q_trans[] table to vp9_quantize.{c, h}.
876059f Regrouping code in rd_pick_sb_modes().
585e01b Remove duplicate code
7c891ed Minor code cleanup
3ab4d57 Remove unused tile arguments from vp_rdopt.
dcb5157 Cleanup vp9_rd_pick_inter_mode_sub8x8().
4f95a7f Fix the setting of mode_skip_mask
0ba14e6 Fixing broken build.
51b3035 Adding vp9_inc_frame_in_layer() function.
3a6670f Fix encoder uninitialized read errors reported by drmemory
bbf8971 Fix TODO typo
51415d4 Add more test files that change number of tile columns.
5db5154 Applying q_trans[] inside set_encoder_config().
191dfa8 Cleaning up get_sby_perpixel_{, diff_}variance().
f600b50 Fix avx builds on macosx with clang 5.0.
4b1c442 Removing redundant assignments.
4e66293 Use source frame difference to make partition decision
06ec873 Select prediction filter type in non-RD mode decision
9195536 third_party/libwebm: Pull from upstream
d35df2d High-level hooks for Profile 2 (10/12 bit)
22a3e30 Converting set_prev_mi() to get_prev_mi().
2dcbf8c Changing webmenc to use libwebm

BUG=361318
TBR=tomfinegan@chromium.org

Review URL: https://chromereviews.googleplex.com/36617013

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@265970 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

1 files changed, 4 insertions, 2 deletions

diff --git a/libvpx_srcs_arm_neon_cpu_detect.gypi b/libvpx_srcs_arm_neon_cpu_detect.gypi
index 0a03a57..f339705 100644
--- a/libvpx_srcs_arm_neon_cpu_detect.gypi
+++ b/libvpx_srcs_arm_neon_cpu_detect.gypi
@@ -292,6 +292,8 @@
     '<(libvpx_source)/vp9/encoder/vp9_bitstream.c',
     '<(libvpx_source)/vp9/encoder/vp9_bitstream.h',
     '<(libvpx_source)/vp9/encoder/vp9_block.h',
+    '<(libvpx_source)/vp9/encoder/vp9_context_tree.c',
+    '<(libvpx_source)/vp9/encoder/vp9_context_tree.h',
     '<(libvpx_source)/vp9/encoder/vp9_cost.c',
     '<(libvpx_source)/vp9/encoder/vp9_cost.h',
     '<(libvpx_source)/vp9/encoder/vp9_dct.c',
@@ -301,6 +303,8 @@
     '<(libvpx_source)/vp9/encoder/vp9_encodemb.h',
     '<(libvpx_source)/vp9/encoder/vp9_encodemv.c',
     '<(libvpx_source)/vp9/encoder/vp9_encodemv.h',
+    '<(libvpx_source)/vp9/encoder/vp9_encoder.c',
+    '<(libvpx_source)/vp9/encoder/vp9_encoder.h',
     '<(libvpx_source)/vp9/encoder/vp9_extend.c',
     '<(libvpx_source)/vp9/encoder/vp9_extend.h',
     '<(libvpx_source)/vp9/encoder/vp9_firstpass.c',
@@ -311,8 +315,6 @@
     '<(libvpx_source)/vp9/encoder/vp9_mbgraph.h',
     '<(libvpx_source)/vp9/encoder/vp9_mcomp.c',
     '<(libvpx_source)/vp9/encoder/vp9_mcomp.h',
-    '<(libvpx_source)/vp9/encoder/vp9_onyx_if.c',
-    '<(libvpx_source)/vp9/encoder/vp9_onyx_int.h',
     '<(libvpx_source)/vp9/encoder/vp9_picklpf.c',
     '<(libvpx_source)/vp9/encoder/vp9_picklpf.h',
     '<(libvpx_source)/vp9/encoder/vp9_pickmode.c',