| Index: third_party/libwebp/dec/vp8i.h
|
| diff --git a/third_party/libwebp/dec/vp8i.h b/third_party/libwebp/dec/vp8i.h
|
| index 3f4cf297d9952b81fcb2d4496f2cb85a637c2b28..7cc1840f5c1f84b4fa76c1d5dab5184dd2e87df0 100644
|
| --- a/third_party/libwebp/dec/vp8i.h
|
| +++ b/third_party/libwebp/dec/vp8i.h
|
| @@ -31,7 +31,7 @@ extern "C" {
|
| // version numbers
|
| #define DEC_MAJ_VERSION 0
|
| #define DEC_MIN_VERSION 4
|
| -#define DEC_REV_VERSION 0
|
| +#define DEC_REV_VERSION 1
|
|
|
| // intra prediction modes
|
| enum { B_DC_PRED = 0, // 4x4 modes
|
| @@ -195,6 +195,8 @@ typedef struct {
|
| uint32_t non_zero_y_;
|
| uint32_t non_zero_uv_;
|
| uint8_t dither_; // local dithering strength (deduced from non_zero_*)
|
| + uint8_t skip_;
|
| + uint8_t segment_;
|
| } VP8MBData;
|
|
|
| // Persistent information needed by the parallel processing
|
| @@ -265,7 +267,6 @@ struct VP8Decoder {
|
| uint8_t* intra_t_; // top intra modes values: 4 * mb_w_
|
| uint8_t intra_l_[4]; // left intra modes values
|
|
|
| - uint8_t segment_; // segment of the currently parsed block
|
| VP8TopSamples* yuv_t_; // top y/u/v samples
|
|
|
| VP8MB* mb_info_; // contextual macroblock info (mb_w_ + 1)
|
| @@ -295,12 +296,8 @@ struct VP8Decoder {
|
| const uint8_t* alpha_data_; // compressed alpha data (if present)
|
| size_t alpha_data_size_;
|
| int is_alpha_decoded_; // true if alpha_data_ is decoded in alpha_plane_
|
| - uint8_t* alpha_plane_; // output. Persistent, contains the whole data.
|
| -
|
| - // extensions
|
| - int layer_colorspace_;
|
| - const uint8_t* layer_data_; // compressed layer data (if present)
|
| - size_t layer_data_size_;
|
| + uint8_t* alpha_plane_; // output. Persistent, contains the whole data.
|
| + int alpha_dithering_; // derived from decoding options (0=off, 100=full).
|
| };
|
|
|
| //------------------------------------------------------------------------------
|
| @@ -313,7 +310,8 @@ int VP8SetError(VP8Decoder* const dec,
|
| // in tree.c
|
| void VP8ResetProba(VP8Proba* const proba);
|
| void VP8ParseProba(VP8BitReader* const br, VP8Decoder* const dec);
|
| -void VP8ParseIntraMode(VP8BitReader* const br, VP8Decoder* const dec);
|
| +// parses one row of intra mode data in partition 0, returns !eof
|
| +int VP8ParseIntraModeRow(VP8BitReader* const br, VP8Decoder* const dec);
|
|
|
| // in quant.c
|
| void VP8ParseQuant(VP8Decoder* const dec);
|
| @@ -347,9 +345,6 @@ int VP8DecodeMB(VP8Decoder* const dec, VP8BitReader* const token_br);
|
| const uint8_t* VP8DecompressAlphaRows(VP8Decoder* const dec,
|
| int row, int num_rows);
|
|
|
| -// in layer.c
|
| -int VP8DecodeLayer(VP8Decoder* const dec);
|
| -
|
| //------------------------------------------------------------------------------
|
|
|
| #ifdef __cplusplus
|
|
|