Update libwebp to 0.4.0

third_party/libwebp/enc/tree.c

 // 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.
 // -----------------------------------------------------------------------------
 //
-// Token probabilities
+// Coding of token probabilities, intra modes and segments.
 //
 // 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 }
     },
     { { 253, 136, 254, 255, 228, 219, 128, 128, 128, 128, 128 },
       { 189, 129, 242, 255, 227, 213, 255, 219, 128, 128, 128 },
       { 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 }
     },
     { { 1, 98, 248, 255, 236, 226, 255, 255, 128, 128, 128 },
       { 181, 133, 238, 254, 221, 234, 255, 154, 128, 128, 128 },
@@ skipping 276 matching lines @@
 static void PutSegment(VP8BitWriter* const bw, int s, const uint8_t* p) {
   if (VP8PutBit(bw, s >= 2, p[0])) p += 1;
   VP8PutBit(bw, s & 1, p[1]);
 }
 
 void VP8CodeIntraModes(VP8Encoder* const enc) {
   VP8BitWriter* const bw = &enc->bw_;
   VP8EncIterator it;
   VP8IteratorInit(enc, &it);
   do {
-    const VP8MBInfo* mb = it.mb_;
+    const VP8MBInfo* const mb = it.mb_;
     const uint8_t* preds = it.preds_;
     if (enc->segment_hdr_.update_map_) {
       PutSegment(bw, mb->segment_, enc->proba_.segments_);
     }
     if (enc->proba_.use_skip_proba_) {
       VP8PutBit(bw, mb->skip_, enc->proba_.skip_proba_);
     }
     if (VP8PutBit(bw, (mb->type_ != 0), 145)) {  // i16x16
       PutI16Mode(bw, preds[0]);
     } else {
       const int preds_w = enc->preds_w_;
       const uint8_t* top_pred = preds - preds_w;
       int x, y;
       for (y = 0; y < 4; ++y) {
         int left = preds[-1];
         for (x = 0; x < 4; ++x) {
           const uint8_t* const probas = kBModesProba[top_pred[x]][left];
           left = PutI4Mode(bw, preds[x], probas);
         }
         top_pred = preds;
         preds += preds_w;
       }
     }
     PutUVMode(bw, mb->uv_mode_);
-  } while (VP8IteratorNext(&it, 0));
+  } while (VP8IteratorNext(&it));
 }
 
 //------------------------------------------------------------------------------
 // Paragraph 13
 
 const uint8_t
     VP8CoeffsUpdateProba[NUM_TYPES][NUM_BANDS][NUM_CTX][NUM_PROBAS] = {
   { { { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 },
       { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 },
       { 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255 }
@@ skipping 141 matching lines @@
           }
         }
       }
     }
   }
   if (VP8PutBitUniform(bw, probas->use_skip_proba_)) {
     VP8PutValue(bw, probas->skip_proba_, 8);
   }
 }
 
-#if defined(__cplusplus) || defined(c_plusplus)
-}    // extern "C"
-#endif