add dec/vp8i.h changes from experimental

Pulled from 5529a2e^.

Change-Id: I51fe7a9c3acf1be4c43af834fd525ab3be5d7e65
This commit is contained in:
James Zern 2012-04-10 17:23:38 -07:00
parent 19f6398ed7
commit b96efd7d50

View File

@ -13,6 +13,7 @@
#define WEBP_DEC_VP8I_H_ #define WEBP_DEC_VP8I_H_
#include <string.h> // for memcpy() #include <string.h> // for memcpy()
#include "./vp8li.h"
#include "../utils/bit_reader.h" #include "../utils/bit_reader.h"
#include "../utils/thread.h" #include "../utils/thread.h"
#include "../dsp/dsp.h" #include "../dsp/dsp.h"
@ -280,6 +281,9 @@ struct VP8Decoder {
int layer_colorspace_; int layer_colorspace_;
const uint8_t* layer_data_; // compressed layer data (if present) const uint8_t* layer_data_; // compressed layer data (if present)
size_t layer_data_size_; size_t layer_data_size_;
int is_lossless_;
VP8LDecoder vp8l_decoder_;
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
@ -289,8 +293,8 @@ struct VP8Decoder {
int VP8SetError(VP8Decoder* const dec, int VP8SetError(VP8Decoder* const dec,
VP8StatusCode error, const char * const msg); VP8StatusCode error, const char * const msg);
// Validates the VP8 data-header and retrieve basic header information viz width // Validates the VP8 data-header and retrieves basic header information viz
// and height. Returns 0 in case of formatting error. *width/*height // width and height. Returns 0 in case of formatting error. *width/*height
// can be passed NULL. // can be passed NULL.
int VP8GetInfo(const uint8_t* data, int VP8GetInfo(const uint8_t* data,
uint32_t data_size, // data available so far uint32_t data_size, // data available so far