commit 8b720228d581a84fd173b6dcb2fa295b59db489a
author Vikas Arora <vikasa@google.com> Thu Jan 02 16:48:02 2014 -0800
committer Vikas Arora <vikasa@google.com> Fri Jan 03 00:58:56 2014 +0000
tree ae0a6ca74d13766aa6c94805c9c5296beeb7c80f
parent 513e97bd307573e2adc776eb5368bd129aceaa4a

Updated the libwebp with version 0.4.0-rc1

Updated the libwebp with the release 0.4.0-rc1 (change#I22be12d8).

Build & Ran following tests for Nexus N7 (Razor)
runtest --path cts/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
runtest --path cts/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
runtest --path cts/tests/tests/graphics/src/android/graphics/cts/BitmapRegionDecoderTest.java
runtest --path cts/tests/tests/graphics/src/android/graphics/cts/Bitmap_CompressFormatTest.java
runtest --path cts/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
runtest --path cts/tests/tests/graphics/src/android/graphics/cts/BitmapFactory_OptionsTest.java
runtest --path cts/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java

Also did the full Android build for following targets:
- flo
- grouper
- mako
- x86

Before this change is submitted, need to submit the change for cts/tests to update the threshold for WebP encoding for color-mode RGB565.
(Refer: https://googleplex-android-review.git.corp.google.com/#/c/403360/)

Change-Id: Ib2db2ebf0395276d45c3e8dc70d7b451e3678e6f

src/dsp/enc.c

diff --git a/src/dsp/enc.c b/src/dsp/enc.c
index 552807a..fcc6ec8 100644
--- a/src/dsp/enc.c
+++ b/src/dsp/enc.c
@@ -11,14 +11,12 @@
 //
 // Author: Skal (pascal.massimino@gmail.com)
 
+#include <assert.h>
 #include <stdlib.h>  // for abs()
+
 #include "./dsp.h"
 #include "../enc/vp8enci.h"
 
-#if defined(__cplusplus) || defined(c_plusplus)
-extern "C" {
-#endif
-
 static WEBP_INLINE uint8_t clip_8b(int v) {
   return (!(v & ~0xff)) ? v : (v < 0) ? 0 : 255;
 }
@@ -190,7 +188,7 @@
 
 static void FTransformWHT(const int16_t* in, int16_t* out) {
   // input is 12b signed
-  int16_t tmp[16];
+  int32_t tmp[16];
   int i;
   for (i = 0; i < 4; ++i, in += 64) {
     const int a0 = (in[0 * 16] + in[2 * 16]);  // 13b
@@ -652,6 +650,31 @@
   return (last >= 0);
 }
 
+static int QuantizeBlockWHT(int16_t in[16], int16_t out[16],
+                            const VP8Matrix* const mtx) {
+  int n, last = -1;
+  for (n = 0; n < 16; ++n) {
+    const int j = kZigzag[n];
+    const int sign = (in[j] < 0);
+    const int coeff = sign ? -in[j] : in[j];
+    assert(mtx->sharpen_[j] == 0);
+    if (coeff > mtx->zthresh_[j]) {
+      const int Q = mtx->q_[j];
+      const int iQ = mtx->iq_[j];
+      const int B = mtx->bias_[j];
+      out[n] = QUANTDIV(coeff, iQ, B);
+      if (out[n] > MAX_LEVEL) out[n] = MAX_LEVEL;
+      if (sign) out[n] = -out[n];
+      in[j] = out[n] * Q;
+      if (out[n]) last = n;
+    } else {
+      out[n] = 0;
+      in[j] = 0;
+    }
+  }
+  return (last >= 0);
+}
+
 //------------------------------------------------------------------------------
 // Block copy
 
@@ -686,6 +709,7 @@
 VP8WMetric VP8TDisto4x4;
 VP8WMetric VP8TDisto16x16;
 VP8QuantizeBlock VP8EncQuantizeBlock;
+VP8QuantizeBlockWHT VP8EncQuantizeBlockWHT;
 VP8BlockCopy VP8Copy4x4;
 
 extern void VP8EncDspInitSSE2(void);
@@ -710,6 +734,7 @@
   VP8TDisto4x4 = Disto4x4;
   VP8TDisto16x16 = Disto16x16;
   VP8EncQuantizeBlock = QuantizeBlock;
+  VP8EncQuantizeBlockWHT = QuantizeBlockWHT;
   VP8Copy4x4 = Copy4x4;
 
   // If defined, use CPUInfo() to overwrite some pointers with faster versions.
@@ -726,6 +751,3 @@
   }
 }
 
-#if defined(__cplusplus) || defined(c_plusplus)
-}    // extern "C"
-#endif