diff options
author | Hangyu Kuang <hkuang@google.com> | 2016-07-06 14:21:45 -0700 |
---|---|---|
committer | Hangyu Kuang <hkuang@google.com> | 2016-07-08 09:51:10 -0700 |
commit | f047e7ca6983218eed7703c7afd51fed7bd3b5c9 (patch) | |
tree | 2667579566b6270c21ee4b495b4cd119af5ccf5b /files/include/libyuv/mjpeg_decoder.h | |
parent | bb74e3e19b98261031216de8cadcef34cccd9e4a (diff) | |
download | libyuv-f047e7ca6983218eed7703c7afd51fed7bd3b5c9.tar.gz |
Update libyuv to r1602 version to get best performance.android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-release
Bug: 29870647
Change-Id: I8ec9fab7f55765fa33ebe7ba1c7ad2147f418de2
Diffstat (limited to 'files/include/libyuv/mjpeg_decoder.h')
-rw-r--r-- | files/include/libyuv/mjpeg_decoder.h | 72 |
1 files changed, 38 insertions, 34 deletions
diff --git a/files/include/libyuv/mjpeg_decoder.h b/files/include/libyuv/mjpeg_decoder.h index 67090cf0..8423121d 100644 --- a/files/include/libyuv/mjpeg_decoder.h +++ b/files/include/libyuv/mjpeg_decoder.h @@ -4,7 +4,7 @@ * Use of this source code is governed by a BSD-style license * that can be found in the LICENSE file in the root of the source * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may + * in the file PATENTS. All contributing project authors may * be found in the AUTHORS file in the root of the source tree. */ @@ -13,6 +13,7 @@ #include "libyuv/basic_types.h" +#ifdef __cplusplus // NOTE: For a simplified public API use convert.h MJPGToI420(). struct jpeg_common_struct; @@ -21,6 +22,16 @@ struct jpeg_source_mgr; namespace libyuv { +#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; enum JpegSubsamplingType { @@ -32,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 @@ -41,7 +63,7 @@ struct SetJmpErrorMgr; // MJPEG frames. // // See http://tools.ietf.org/html/rfc2435 -class MJpegDecoder { +class LIBYUV_API MJpegDecoder { public: typedef void (*CallbackFunction)(void* opaque, const uint8* const* data, @@ -59,11 +81,12 @@ class 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(); @@ -107,7 +130,7 @@ class 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 @@ -116,13 +139,13 @@ class 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. @@ -130,34 +153,14 @@ class 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); @@ -169,9 +172,9 @@ class 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. @@ -185,4 +188,5 @@ class MJpegDecoder { } // namespace libyuv +#endif // __cplusplus #endif // INCLUDE_LIBYUV_MJPEG_DECODER_H_ NOLINT |