diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-05-27 21:06:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-05-27 21:06:14 +0000 |
| commit | 1bd7a02a0a5ca735bd7f736fe67e0d6515730f53 (patch) | |
| tree | c8c58096e327c946f22364083b79b87a733c0e64 | |
| parent | 1418bedc0b752fd9dec54dc5accab2acbc2389e9 (diff) | |
| parent | 885e8549afc399b67373ed16d6c24c88d066fa8b (diff) | |
| download | libvpx-1bd7a02a0a5ca735bd7f736fe67e0d6515730f53.tar.gz | |
Merge "Snap for 6533464 from a36c34e1ee9e7660a662e9e2cb60e31332d4e2ef to sdk-release" into sdk-releaseplatform-tools-30.0.3platform-tools-30.0.2
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | METADATA | 3 | ||||
| -rw-r--r-- | libvpx/vp8/encoder/onyx_if.c | 2 | ||||
| -rw-r--r-- | libvpx/vp8/encoder/treewriter.h | 6 | ||||
| -rw-r--r-- | libwebm/Android.bp | 12 |
5 files changed, 22 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 1f0761c76..719272e97 100644 --- a/Android.bp +++ b/Android.bp @@ -1162,6 +1162,7 @@ cc_library { // cfi: true, blacklist: "libvpx_blacklist.txt", }, + min_sdk_version: "29", } cc_fuzz { diff --git a/METADATA b/METADATA new file mode 100644 index 000000000..d97975ca3 --- /dev/null +++ b/METADATA @@ -0,0 +1,3 @@ +third_party { + license_type: NOTICE +} diff --git a/libvpx/vp8/encoder/onyx_if.c b/libvpx/vp8/encoder/onyx_if.c index adc25024c..4dd289cfb 100644 --- a/libvpx/vp8/encoder/onyx_if.c +++ b/libvpx/vp8/encoder/onyx_if.c @@ -4524,9 +4524,11 @@ static void encode_frame_to_data_rate(VP8_COMP *cpi, size_t *size, /* Actual bits spent */ cpi->total_actual_bits += cpi->projected_frame_size; +#if 0 && CONFIG_INTERNAL_STATS /* Debug stats */ cpi->total_target_vs_actual += (cpi->this_frame_target - cpi->projected_frame_size); +#endif cpi->buffer_level = cpi->bits_off_target; diff --git a/libvpx/vp8/encoder/treewriter.h b/libvpx/vp8/encoder/treewriter.h index c02683a58..4e9ed6af1 100644 --- a/libvpx/vp8/encoder/treewriter.h +++ b/libvpx/vp8/encoder/treewriter.h @@ -14,6 +14,8 @@ /* Trees map alphabets into huffman-like codes suitable for an arithmetic bit coder. Timothy S Murphy 11 October 2004 */ +#include <stdint.h> + #include "./vpx_config.h" #include "vp8/common/treecoder.h" @@ -48,7 +50,9 @@ static INLINE unsigned int vp8_cost_branch(const unsigned int ct[2], vp8_prob p) { /* Imitate existing calculation */ - return ((ct[0] * vp8_cost_zero(p)) + (ct[1] * vp8_cost_one(p))) >> 8; + return (unsigned int)(((((uint64_t)ct[0]) * vp8_cost_zero(p)) + + (((uint64_t)ct[1]) * vp8_cost_one(p))) >> + 8); } /* Small functions to write explicit values and tokens, as well as diff --git a/libwebm/Android.bp b/libwebm/Android.bp index 0beefc832..60b0277f6 100644 --- a/libwebm/Android.bp +++ b/libwebm/Android.bp @@ -1,10 +1,20 @@ cc_library_static { name: "libwebm", srcs: ["mkvparser/mkvparser.cc"], - cflags: ["-Wall", "-Werror"], + cflags: [ + "-Wall", + "-Werror", + ], export_include_dirs: ["."], sanitize: { // Enable CFI if this becomes a shared library. // cfi: true, }, + min_sdk_version: "29", + host_supported: true, + target: { + darwin: { + enabled: false, + }, + }, } |