libwebp-0.6.0-rc1

third_party/libwebp/enc/frame_enc.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.
 // -----------------------------------------------------------------------------
 //
 //   frame coding and analysis
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
 #include <string.h>
 #include <math.h>
 
-#include "./cost.h"
-#include "./vp8enci.h"
+#include "./cost_enc.h"
+#include "./vp8i_enc.h"
 #include "../dsp/dsp.h"
 #include "../webp/format_constants.h"  // RIFF constants
 
 #define SEGMENT_VISU 0
 #define DEBUG_SEARCH 0    // useful to track search convergence
 
 //------------------------------------------------------------------------------
 // multi-pass convergence
 
 #define HEADER_SIZE_ESTIMATE (RIFF_HEADER_SIZE + CHUNK_HEADER_SIZE +  \
@@ skipping 212 matching lines @@
     const int sign = c < 0;
     int v = sign ? -c : c;
     if (!VP8PutBit(bw, v != 0, p[1])) {
       p = res->prob[VP8EncBands[n]][0];
       continue;
     }
     if (!VP8PutBit(bw, v > 1, p[2])) {
       p = res->prob[VP8EncBands[n]][1];
     } else {
       if (!VP8PutBit(bw, v > 4, p[3])) {
-        if (VP8PutBit(bw, v != 2, p[4]))
+        if (VP8PutBit(bw, v != 2, p[4])) {
           VP8PutBit(bw, v == 4, p[5]);
+        }
       } else if (!VP8PutBit(bw, v > 10, p[6])) {
         if (!VP8PutBit(bw, v > 6, p[7])) {
           VP8PutBit(bw, v == 6, 159);
         } else {
           VP8PutBit(bw, v >= 9, 165);
           VP8PutBit(bw, !(v & 1), 145);
         }
       } else {
         int mask;
         const uint8_t* tab;
@@ skipping 287 matching lines @@
     VP8ModeScore info;
     VP8IteratorImport(&it, NULL);
     if (VP8Decimate(&it, &info, rd_opt)) {
       // Just record the number of skips and act like skip_proba is not used.
       enc->proba_.nb_skip_++;
     }
     RecordResiduals(&it, &info);
     size += info.R + info.H;
     size_p0 += info.H;
     distortion += info.D;
-    if (percent_delta && !VP8IteratorProgress(&it, percent_delta))
+    if (percent_delta && !VP8IteratorProgress(&it, percent_delta)) {
       return 0;
+    }
     VP8IteratorSaveBoundary(&it);
   } while (VP8IteratorNext(&it) && --nb_mbs > 0);
 
   size_p0 += enc->segment_hdr_.size_;
   if (s->do_size_search) {
     size += FinalizeSkipProba(enc);
     size += FinalizeTokenProbas(&enc->proba_);
     size = ((size + size_p0 + 1024) >> 11) + HEADER_SIZE_ESTIMATE;
     s->value = (double)size;
   } else {
@@ skipping 271 matching lines @@
 
 int VP8EncTokenLoop(VP8Encoder* const enc) {
   (void)enc;
   return 0;   // we shouldn't be here.
 }
 
 #endif    // DISABLE_TOKEN_BUFFER
 
 //------------------------------------------------------------------------------