diff options
Diffstat (limited to 'chromium/third_party/libyuv/include/libyuv/mjpeg_decoder.h')
-rw-r--r-- | chromium/third_party/libyuv/include/libyuv/mjpeg_decoder.h | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/chromium/third_party/libyuv/include/libyuv/mjpeg_decoder.h b/chromium/third_party/libyuv/include/libyuv/mjpeg_decoder.h index 7bb82fce146..82fd95df21b 100644 --- a/chromium/third_party/libyuv/include/libyuv/mjpeg_decoder.h +++ b/chromium/third_party/libyuv/include/libyuv/mjpeg_decoder.h @@ -11,10 +11,9 @@ #ifndef INCLUDE_LIBYUV_MJPEG_DECODER_H_ // NOLINT #define INCLUDE_LIBYUV_MJPEG_DECODER_H_ -#ifdef __cplusplus - #include "libyuv/basic_types.h" +#ifdef __cplusplus // NOTE: For a simplified public API use convert.h MJPGToI420(). struct jpeg_common_struct; @@ -23,7 +22,15 @@ struct jpeg_source_mgr; namespace libyuv { -bool ValidateJpeg(const uint8* sample, size_t sample_size); +#ifdef __cplusplus +extern "C" { +#endif + +LIBYUV_BOOL ValidateJpeg(const uint8* sample, size_t sample_size); + +#ifdef __cplusplus +} // extern "C" +#endif static const uint32 kUnknownDataSize = 0xFFFFFFFF; @@ -36,6 +43,17 @@ enum JpegSubsamplingType { kJpegUnknown }; +struct Buffer { + const uint8* data; + int len; +}; + +struct BufferVector { + Buffer* buffers; + int len; + int pos; +}; + struct SetJmpErrorMgr; // MJPEG ("Motion JPEG") is a pseudo-standard video codec where the frames are @@ -63,11 +81,12 @@ class LIBYUV_API MJpegDecoder { ~MJpegDecoder(); // Loads a new frame, reads its headers, and determines the uncompressed - // image format. Returns true if image looks valid and format is supported. - // If return value is true, then the values for all the following getters - // are populated. + // image format. + // Returns LIBYUV_TRUE if image looks valid and format is supported. + // If return value is LIBYUV_TRUE, then the values for all the following + // getters are populated. // src_len is the size of the compressed mjpeg frame in bytes. - bool LoadFrame(const uint8* src, size_t src_len); + LIBYUV_BOOL LoadFrame(const uint8* src, size_t src_len); // Returns width of the last loaded frame in pixels. int GetWidth(); @@ -111,7 +130,7 @@ class LIBYUV_API MJpegDecoder { // Call this after LoadFrame() if you decide you don't want to decode it // after all. - bool UnloadFrame(); + LIBYUV_BOOL UnloadFrame(); // Decodes the entire image into a one-buffer-per-color-component format. // dst_width must match exactly. dst_height must be <= to image height; if @@ -120,13 +139,13 @@ class LIBYUV_API MJpegDecoder { // at least GetComponentSize(i). The pointers in planes are incremented // to point to after the end of the written data. // TODO(fbarchard): Add dst_x, dst_y to allow specific rect to be decoded. - bool DecodeToBuffers(uint8** planes, int dst_width, int dst_height); + LIBYUV_BOOL DecodeToBuffers(uint8** planes, int dst_width, int dst_height); // Decodes the entire image and passes the data via repeated calls to a // callback function. Each call will get the data for a whole number of // image scanlines. // TODO(fbarchard): Add dst_x, dst_y to allow specific rect to be decoded. - bool DecodeToCallback(CallbackFunction fn, void* opaque, + LIBYUV_BOOL DecodeToCallback(CallbackFunction fn, void* opaque, int dst_width, int dst_height); // The helper function which recognizes the jpeg sub-sampling type. @@ -134,34 +153,15 @@ class LIBYUV_API MJpegDecoder { int* subsample_x, int* subsample_y, int number_of_components); private: - struct Buffer { - const uint8* data; - int len; - }; - - struct BufferVector { - Buffer* buffers; - int len; - int pos; - }; - - // Methods that are passed to jpeglib. - static int fill_input_buffer(jpeg_decompress_struct* cinfo); - static void init_source(jpeg_decompress_struct* cinfo); - static void skip_input_data(jpeg_decompress_struct* cinfo, - long num_bytes); // NOLINT - static void term_source(jpeg_decompress_struct* cinfo); - - static void ErrorHandler(jpeg_common_struct* cinfo); void AllocOutputBuffers(int num_outbufs); void DestroyOutputBuffers(); - bool StartDecode(); - bool FinishDecode(); + LIBYUV_BOOL StartDecode(); + LIBYUV_BOOL FinishDecode(); void SetScanlinePointers(uint8** data); - bool DecodeImcuRow(); + LIBYUV_BOOL DecodeImcuRow(); int GetComponentScanlinePadding(int component); @@ -173,9 +173,9 @@ class LIBYUV_API MJpegDecoder { jpeg_source_mgr* source_mgr_; SetJmpErrorMgr* error_mgr_; - // true iff at least one component has scanline padding. (i.e., + // LIBYUV_TRUE iff at least one component has scanline padding. (i.e., // GetComponentScanlinePadding() != 0.) - bool has_scanline_padding_; + LIBYUV_BOOL has_scanline_padding_; // Temporaries used to point to scanline outputs. int num_outbufs_; // Outermost size of all arrays below. |