Chromium Code Reviews| Index: third_party/libwebp/dec/vp8i.h |
| diff --git a/third_party/libwebp/dec/vp8i.h b/third_party/libwebp/dec/vp8i.h |
| index 4382edfd8e7a64cea17601e23b18abc73453d300..1aa92385a755285e4820e8df23f5a93fb07fc572 100644 |
| --- a/third_party/libwebp/dec/vp8i.h |
| +++ b/third_party/libwebp/dec/vp8i.h |
| @@ -27,7 +27,7 @@ extern "C" { |
| // version numbers |
| #define DEC_MAJ_VERSION 0 |
| -#define DEC_MIN_VERSION 2 |
| +#define DEC_MIN_VERSION 3 |
| #define DEC_REV_VERSION 0 |
| #define ONLY_KEYFRAME_CODE // to remove any code related to P-Frames |
| @@ -157,7 +157,7 @@ typedef struct { // filter specs |
| } VP8FInfo; |
| typedef struct { // used for syntax-parsing |
| - unsigned int nz_; // non-zero AC/DC coeffs |
| + unsigned int nz_:24; // non-zero AC/DC coeffs (24bit) |
| unsigned int dc_nz_:1; // non-zero DC coeffs |
| unsigned int skip_:1; // block type |
|
fbarchard
2013/03/22 18:56:44
consider padding explicitely to 32 bits.
|
| } VP8MB; |
| @@ -269,9 +269,9 @@ struct VP8Decoder { |
| uint32_t non_zero_ac_; |
| // Filtering side-info |
| - int filter_type_; // 0=off, 1=simple, 2=complex |
| - int filter_row_; // per-row flag |
| - uint8_t filter_levels_[NUM_MB_SEGMENTS]; // precalculated per-segment |
| + int filter_type_; // 0=off, 1=simple, 2=complex |
| + int filter_row_; // per-row flag |
| + VP8FInfo fstrengths_[NUM_MB_SEGMENTS][2]; // precalculated per-segment/type |
| // extensions |
| const uint8_t* alpha_data_; // compressed alpha data (if present) |
| @@ -312,8 +312,6 @@ VP8StatusCode VP8EnterCritical(VP8Decoder* const dec, VP8Io* const io); |
| int VP8ExitCritical(VP8Decoder* const dec, VP8Io* const io); |
| // Process the last decoded row (filtering + output) |
| int VP8ProcessRow(VP8Decoder* const dec, VP8Io* const io); |
| -// Store a block, along with filtering params |
| -void VP8StoreBlock(VP8Decoder* const dec); |
| // To be called at the start of a new scanline, to initialize predictors. |
| void VP8InitScanline(VP8Decoder* const dec); |
| // Decode one macroblock. Returns false if there is not enough data. |