Index: third_party/libwebp/dsp/dsp.h |
diff --git a/third_party/libwebp/dsp/dsp.h b/third_party/libwebp/dsp/dsp.h |
index 24d0c188c43ca06daa015c202f707f8b39d9dd7d..933df60b43244a2956d51eb16cb2065e6e6e48c1 100644 |
--- a/third_party/libwebp/dsp/dsp.h |
+++ b/third_party/libwebp/dsp/dsp.h |
@@ -49,8 +49,6 @@ extern VP8CPUInfo VP8GetCPUInfo; |
//------------------------------------------------------------------------------ |
// Encoding |
-int VP8GetAlpha(const int histo[]); |
- |
// Transforms |
// VP8Idct: Does one of two inverse transforms. If do_two is set, the transforms |
// will be done for (ref, in, dst) and (ref + 4, in + 16, dst + 4). |
@@ -85,10 +83,11 @@ typedef int (*VP8QuantizeBlock)(int16_t in[16], int16_t out[16], |
int n, const struct VP8Matrix* const mtx); |
extern VP8QuantizeBlock VP8EncQuantizeBlock; |
-// Compute susceptibility based on DCT-coeff histograms: |
-// the higher, the "easier" the macroblock is to compress. |
-typedef int (*VP8CHisto)(const uint8_t* ref, const uint8_t* pred, |
- int start_block, int end_block); |
+// Collect histogram for susceptibility calculation and accumulate in histo[]. |
+struct VP8Histogram; |
+typedef void (*VP8CHisto)(const uint8_t* ref, const uint8_t* pred, |
+ int start_block, int end_block, |
+ struct VP8Histogram* const histo); |
extern const int VP8DspScan[16 + 4 + 4]; |
extern VP8CHisto VP8CollectHistogram; |
@@ -104,7 +103,7 @@ extern VP8DecIdct2 VP8Transform; |
extern VP8DecIdct VP8TransformUV; |
extern VP8DecIdct VP8TransformDC; |
extern VP8DecIdct VP8TransformDCUV; |
-extern void (*VP8TransformWHT)(const int16_t* in, int16_t* out); |
+extern VP8WHT VP8TransformWHT; |
// *dst is the destination block, with stride BPS. Boundary samples are |
// assumed accessible when needed. |
@@ -159,6 +158,9 @@ extern WebPUpsampleLinePairFunc WebPUpsamplers[/* MODE_LAST */]; |
// Initializes SSE2 version of the fancy upsamplers. |
void WebPInitUpsamplersSSE2(void); |
+// NEON version |
+void WebPInitUpsamplersNEON(void); |
+ |
#endif // FANCY_UPSAMPLING |
// Point-sampling methods. |
@@ -200,6 +202,7 @@ extern void (*WebPApplyAlphaMultiply4444)( |
void WebPInitPremultiply(void); |
void WebPInitPremultiplySSE2(void); // should not be called directly. |
+void WebPInitPremultiplyNEON(void); |
//------------------------------------------------------------------------------ |