diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-02-10 22:37:07 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-02-10 22:37:07 -0300 |
| commit | abb985e755ccf858149294868eff8a9a9feca67e (patch) | |
| tree | 2a82fd9f87ddecfb14b08d8599bb2417b3cea7ff /drivers/webp/enc/tree.c | |
| parent | 1c7726820ec53b486e946bb42cac98a600c5bdb5 (diff) | |
Reverted to older version of WebP, newer one crashed on Android.
Diffstat (limited to 'drivers/webp/enc/tree.c')
| -rw-r--r-- | drivers/webp/enc/tree.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/drivers/webp/enc/tree.c b/drivers/webp/enc/tree.c index e5d05e5221..8b25e5e488 100644 --- a/drivers/webp/enc/tree.c +++ b/drivers/webp/enc/tree.c @@ -1,24 +1,27 @@ // Copyright 2011 Google Inc. All Rights Reserved. // -// Use of this source code is governed by a BSD-style license -// that can be found in the COPYING file in the root of the source -// tree. An additional intellectual property rights grant can be found -// in the file PATENTS. All contributing project authors may -// be found in the AUTHORS file in the root of the source tree. +// This code is licensed under the same terms as WebM: +// Software License Agreement: http://www.webmproject.org/license/software/ +// Additional IP Rights Grant: http://www.webmproject.org/license/additional/ // ----------------------------------------------------------------------------- // -// Coding of token probabilities, intra modes and segments. +// Token probabilities // // Author: Skal (pascal.massimino@gmail.com) #include "./vp8enci.h" +#if defined(__cplusplus) || defined(c_plusplus) +extern "C" { +#endif + //------------------------------------------------------------------------------ // Default probabilities // Paragraph 13.5 const uint8_t VP8CoeffsProba0[NUM_TYPES][NUM_BANDS][NUM_CTX][NUM_PROBAS] = { + // genereated using vp8_default_coef_probs() in entropy.c:129 { { { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }, { 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 } @@ -315,7 +318,7 @@ void VP8CodeIntraModes(VP8Encoder* const enc) { VP8EncIterator it; VP8IteratorInit(enc, &it); do { - const VP8MBInfo* const mb = it.mb_; + const VP8MBInfo* mb = it.mb_; const uint8_t* preds = it.preds_; if (enc->segment_hdr_.update_map_) { PutSegment(bw, mb->segment_, enc->proba_.segments_); @@ -340,7 +343,7 @@ void VP8CodeIntraModes(VP8Encoder* const enc) { } } PutUVMode(bw, mb->uv_mode_); - } while (VP8IteratorNext(&it)); + } while (VP8IteratorNext(&it, 0)); } //------------------------------------------------------------------------------ @@ -502,3 +505,6 @@ void VP8WriteProbas(VP8BitWriter* const bw, const VP8Proba* const probas) { } } +#if defined(__cplusplus) || defined(c_plusplus) +} // extern "C" +#endif |