summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-05-27Merge WebView M40 build 1832189 into AOSP.HEADandroid-m-preview-2android-m-preview-1mastermainTorne (Richard Coles)
2015-01-16Merge from Chromium at DEPS revision 40.0.2214.87webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-releaseBen Murdoch
This commit was generated by merge_to_master.py. Change-Id: I151e384461675513d2c69f802571715efac981fa
2015-01-16Merge third_party/libvpx from ↵Ben Murdoch
https://chromium.googlesource.com/chromium/deps/libvpx.git at 715db78484f91a05fbd0584c0ed6e9d2ffc9be06 This commit was generated by merge_from_chromium.py. Change-Id: I90ac6108f49e7607f35328c51ae6fde86c22e679
2015-01-13vp9: sync threads after a longjmpJohann
Synchronize all threads immediately as a subsequent decode call may cause a resize invalidating some allocations. fixes one aspect of crbug.com/437655 https://gerrit.chromium.org/gerrit/73143 BUG=437655 R=tomfinegan@chromium.org Review URL: https://codereview.chromium.org//848963004
2014-12-05Temporarily disable -Werror in Chromium.android-m-previewmaster-soongTorne (Richard Coles)
Temporarily disable the use of -Werror in the AOSP copy of Chromium so that the system-wide default warnings can be changed without breaking Chromium. We'll re-enable it once the warnings are settled and we've fixed any issues. Bug: 18632512 Change-Id: Ib0531a81f3d927002416692c01c2d79226c3d5e2
2014-11-06Merge from Chromium at DEPS revision db3f05efe0f9Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I5ecd0c5a352c96b180972dd1dfdc96b32cf123e2
2014-11-05Update makefiles after merge of Chromium at 5a645aa13b82Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I545fa99bae9a3a2673de0fda1f22c1951f92ad93
2014-11-05Update makefiles after merge of Chromium at a2687e6f753cAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I2de5c09962d9becc194f95397a04eea24e81fa5b
2014-11-05Update makefiles after merge of Chromium at 2d0da5605d75Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Icdf257d7b59d3c8bfcc664c3231bd4c0cd2c6013
2014-11-04Update makefiles after merge of Chromium at a99b7ad25d02Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ida112c6626f06d224367b11efd39a5e674588988
2014-10-31Update makefiles after merge of Chromium at a41c404b1c7fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib12da0f7244f56d6103796cd2f158ba23e1580ef
2014-10-31Update makefiles after merge of Chromium at b210e2d62956Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ica6c73729055b09005920905e2697a002664ea46
2014-10-28Update makefiles after merge of Chromium at 82ca3b654cdaAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia1b25c5a435317cd950d4d03f0459c750aabadfc
2014-10-27Merge from Chromium at DEPS revision 614f7b807940Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia291ffea62df95fdd855fa2457129ab0d5b74d39
2014-10-24Update makefiles after merge of Chromium at d3db2ff38e13Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I59621bac3f32af80f2dbe44f2de406af91a34190
2014-10-24Merge third_party/libvpx from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libvpx.git at 2e5ced5fd62a73f4f5687ab19520b3aad1c53f6f This commit was generated by merge_from_chromium.py. Change-Id: I2eabbbf96fbf159697438e99580e47c744772d3d
2014-10-23Update makefiles after merge of Chromium at 9ef958e74e13Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I81b2ee0fe8b18f30515557808a5923be85d0ecea
2014-10-23libvpx: Pull from upstreamjohannkoenig@google.com
Current HEAD: 687c56e8026978f8ccfd5b3fbfee4dbd1de466e1 git log from upstream: 7045aec SAD32xh and SAD64xh for AVX2 7c4992c Remove the dependency in token storing locations f0c3da9 Alter adjustment of two pass GF/ARF boost with Q. 73ae6e4 Add highbitdepth function for vp9_avg_8x8 e1111fb Remove unused VAR_BASED_FIXED_PARTITION flag 5e766cc Use rate/distortion thresholds to control non-RD partition search 6f77bff Updates to aggressive denoising mode. e3bf55d Correct the logic of ready_for_new_data. 6356d21 vp9_denoiser_sse2.c: solve windows build error. e2612fb Add init and reset functions for RD_COST struct 94ecfa3 Reset rate cost value in rd mode search 8514d03 vp9_denoiser_sse2.c: eliminate gcc warnings 50c59cd Adds a set of end-to-end encode tests ed100c0 Fix an ioc issue in super_block_uvrd 716ae78 Change initialization of static_scene_max_gf_interval. 68b550f [spatial svc]Another workaround to avoid using prev_mi d5130af Revert "Move input frame scaling into the recode loop" 4680329 Revert "[spatial svc]Another workaround to avoid using prev_mi" 23fc1f7 Fix in bit-shift operation for highbitdepth decode 91657ab fix CONFIG_SPATIAL_SVC warning 09ea74f Some updates for Speed 6/VAR_BASED_PARTITION. <...> TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/668403002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@292609 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-10-19Update makefiles after merge of Chromium at 89b463ddd92bAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I214d22a2830885bb316d92ce9f6394ae1b700383
2014-10-15Update makefiles after merge of Chromium at 6e9c84566c9fAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iedc2a01b4fff2a629bbb374cf069c0baebd4f1bd
2014-10-09Update makefiles after merge of Chromium at 89cfb59e11edAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I40b74b0d43dfa20fb9a98c7db300bcb6007b49ee
2014-09-30Update makefiles after merge of Chromium at 9c6ac85c45faAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3bf0e82dbe7792d9fcf1a4e5a48bf0d87d01c115
2014-09-30Merge from Chromium at DEPS revision 267aeeb8d85cPrimiano Tucci
This commit was generated by merge_to_master.py. Change-Id: Ibe3eceb872795061abe4aff95f63e8b2a81df2c4
2014-09-26Update makefiles after merge of Chromium at ba4cf8bb6dc7Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I221f5d99b4fbffab2da2d9759bc529a8a5bfc984
2014-09-25gn: Fix build on Windowsckocagil@chromium.org
R=brettw@chromium.org, johannkoenig@google.com Review URL: https://codereview.chromium.org/603173004 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@292146 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-24Merge third_party/libvpx from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libvpx.git at efe9712d52c2d216fb3d1ceb508b8148847a7e4b This commit was generated by merge_from_chromium.py. Change-Id: I001fde9953b66e6dbdb5e0c751ef66aecc5b3f08
2014-09-24Make sure gcc4.6 is not usedjohannkoenig@chromium.org
Cherry pick https://gerrit.chromium.org/gerrit/#/c/71645/ Intrinsic support in gcc4.6 is poor. Make sure it is not being used. Since the vp8_shortwalsh4x4 function has not previously caused any build failures, this patch should not have any effect in Chromium. TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/597033002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@292105 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-23Update makefiles after merge of Chromium at 861ff7506729Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ief9c5cd4023ab546c3486a85c186ccc1daa66267
2014-09-23Merge third_party/libvpx from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libvpx.git at 55f7ba2f1239ae021542c0524b777010a1d885b6 This commit was generated by merge_from_chromium.py. Change-Id: I8b9c8e7c2b01ca65a27dada3418851fba9bf1140
2014-09-22Reinstate VPX_ compatibility definesjohannkoenig@chromium.org
While waiting for changes to percolate through various trees, reinstate VPX_IMG_FMT_* and VPX_PLANE_* defines to fix the build. TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/588403002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@292079 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-22libvpx: Pull from upstreamjohannkoenig@chromium.org
Current HEAD: 38b6aed8fdf50e701c070e708ff7933cc3a61117 git log from upstream: 209ee12 [spatial svc] Remove vpx_svc_parameters_t and the loop that sets it for each layer 4f5b2b2 [spatial svc]Remove quantizers option. Use max/min quantizers for each layer. 76885de [spatial svc] Use string for quantizers and scale-factors option in the test app f7023ea Remove unnecessary local variable declaration eee904c Adaptive mode search scheduling db71c1b Fix compile warning. c70cea9 Remove mi_grid_* structures. f34d728 test/tools_common.sh: Add support for dumping list of tests. 822b516 High bit-depth coefficient coding functions c768162 build/make/iosbuild.sh: Support extra configure args. c47e420 build/make/rtcd.pl: Add missing arm64 support. 9d3fb75 rtcd: relocate 'extern "C" {' declaration 06fce6b vp8: Update to the adaptive denoising mode. 4eece0d Add a conditional compilation macro to VP8 unit test. 1328431 FIX: vp9_loopfilter_intrin_sse2.c a86e6e8 Add unit test for VP9 denoiser. f780b16 [spatial svc] Use same golden frame for all temporal layers 0d3c3d3 Adds high bitdepth convolve, interpred & scaling c389b37 Substantial reworking of code for arf and kf groups. 217e3cb Improved mb_lpf_horizontal_edge_w_sse2_16() #2 7d0e4f9 Resolves a few gcc warnings f265dde vp8: common: postproc: fix signed overflow of statement of (X +c) >= X when '-Werror=strict-overflow' is set. 1220b49 arm: Fix building vp8_mse16x16_neon.c with MSVC 81a8138 Adding high-bitdepth intra prediction functions 175d9df Remove memset of every external frame buffer. adaec4d Speeding up decode_coeffs(). <...> TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/592203002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@292074 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-22Update makefiles after merge of Chromium at fb34b348eeadAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I56a144190f2980d7859ab41ccf250773904c595d
2014-09-19Merge third_party/libvpx from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libvpx.git at 42ddeba4a7ad6382898ef2e57dc4bd9f9da57aca This commit was generated by merge_from_chromium.py. Change-Id: I2ae719c7efaeff0be88009b953ab7be3223f19be
2014-09-19Add include dirs to dependent targets in the GN build.brettw@chromium.org
This will enable it to be hooked up. TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/584253002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@292050 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-16Merge third_party/libvpx from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libvpx.git at 4947d55857acf2bf968016a7a00fe2b10fd52131 This commit was generated by merge_from_chromium.py. Change-Id: I73a91435614edfef95910f0cbf4639bee9442170
2014-09-13Update makefiles after merge of Chromium at 6a4d455b8650Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Icb9f7591cd26971a587ac851bd2afc6bb2a4f1ad
2014-09-13GN & libvpx: Missing deps for generating ASM offsetshclam@chromium.org
Add the dependency for generating ASM offsets. TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/570793002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291961 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-13GN & libvpx: Convert ARM assembly files and compilehclam@chromium.org
libvpx's assembly source files for ARM need to be converted before they can be compiled. This change coverts them to GAS format and compile. R=brettw@chromium.org, johannkoenig@google.com Review URL: https://codereview.chromium.org/567883002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291959 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-11Update makefiles after merge of Chromium at b62471bd5180Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I5e621e365faf0a11227075d3eeae4e41ed17a5cc
2014-09-10Update makefiles after merge of Chromium at a301aef21f9eAndroid Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib70b0e8275cd4729647d78ac584032ed0c52c06c
2014-09-10Update makefiles after merge of Chromium at d0b993bb2548Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I22c9c559fb677151ff9f6ae09b01f8190f7a9e59
2014-09-09generate_gypi.sh: wrap long linesjohannkoenig@chromium.org
R=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/556013002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291888 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-09Print git log in commit orderjohannkoenig@chromium.org
Use --topo-order to list commits in the order they were actually committed. TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/560483002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291880 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-09Update makefiles after merge of Chromium at facf66e09bf8Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I12eb2a45a95e2ec0d13af16c4d5a5b97fe3c6ce3
2014-09-09Update makefiles after merge of Chromium at 457b0a1c9412Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia870ee4e55344286f5478b3ecde74a5845cfd386
2014-09-09GN: Build libvpx on ARM NEONhclam@chromium.org
libvpx can now build and link on ARM NEON. TBR=tomfinegan Review URL: https://codereview.chromium.org/557623002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291871 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-09Update makefiles after merge of Chromium at 595b5cf6e271Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I894877cc049b2a44fccc91f29076022fa3590ee6
2014-09-09Merge third_party/libvpx from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/libvpx.git at d95585fb0ec024f6abd96f7b02e0df58019d46af This commit was generated by merge_from_chromium.py. Change-Id: Ie583b4d0fc1b392f1b78abfc232d7f02c9960f51
2014-09-08libvpx: Pull from upstreamjohannkoenig@chromium.org
Current HEAD: c731d6a4f19eea861ceb2ff31399420b2452eb74 git log from upstream: 395f2e8 vp8 encoder: remove vp8_yv12_copy_partial_frame_neon 980abf6 Fixing Mac OS build. fcd431f libyuv: cherry-pick MSVC arm build fix 1f19ebb Replacing vp9_get_mb_ss_sse2 asm implementation with intrinsics. 1dd9a63 Correct the mode decisions in special cases 1100e26 Removing postproc mmx code. c97f5e8 vp8 common: change 'HAVE_NEON_ASM' to 'HAVE_NEON' for compiling functions of NEON intrinsics. a808344 fix x86-darwin* build 35fadf1 bilinearpredict_neon: fix type conversion warnings bb4950d vp9: correct context buffer resize check 440f509 vp9: fail decode if block/frame refs are corrupt dbdb87b Fix a visual studio warning d435148 Enable adaptive motion search for ARF coding b1153f3 Map motion magnitude in VP9 denoiser. 7897059 Adding temp cpi var. 91998e6 Removing sz member from vpx_codec_priv. d75266f Update the condition when COPY_BLOCK is chosen. 4909435 Removing unused function prototypes. 202edb3 Actually resetting random generator for all variance test cases. e30f769 Fix a bug in VP9 denoiser. ec94967 Revert "Revert "VP8 for ARMv8 by using NEON intrinsics 10"" a51704d vp8 common: change 'HAVE_NEON_ASM' to 'HAVE_NEON' for compiling idct_blk_neon.c. 0002da3 arm: Fix building vp8_subpixelvariance_neon.c with MSVC 48197f0 Adding sse2 variant for vp9_mse{8x8, 8x16, 16x8}. <...> TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/554673004 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291859 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-09-06GN: Build libvpx on ARMhclam@chromium.org
My previous patch didn't work. Shouldn't use media_use_libvpx because it's in third_party. Instead I just commented out the entire target for NEON intrinsics. TBR=tomfinegan@chromium.org Review URL: https://codereview.chromium.org/547883002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/libvpx@291844 4ff67af0-8c30-449e-8e8b-ad334ec8d88c