diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/mjpegdec.h')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/mjpegdec.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/mjpegdec.h b/chromium/third_party/ffmpeg/libavcodec/mjpegdec.h index 1335c66b8dd..a94778846e9 100644 --- a/chromium/third_party/ffmpeg/libavcodec/mjpegdec.h +++ b/chromium/third_party/ffmpeg/libavcodec/mjpegdec.h @@ -30,6 +30,8 @@ #define AVCODEC_MJPEGDEC_H #include "libavutil/log.h" +#include "libavutil/pixdesc.h" +#include "libavutil/stereo3d.h" #include "avcodec.h" #include "get_bits.h" @@ -67,6 +69,7 @@ typedef struct MJpegDecodeContext { int bits; /* bits per component */ int colr; int xfrm; + int adobe_transform; int maxval; int near; ///< near lossless bound (si 0 for lossless) @@ -99,6 +102,7 @@ typedef struct MJpegDecodeContext { int16_t (*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive mode) uint8_t *last_nnz[MAX_COMPONENTS]; uint64_t coefs_finished[MAX_COMPONENTS]; ///< bitmask of which coefs have been completely decoded (progressive mode) + int palette_index; ScanTable scantable; DSPContext dsp; HpelDSPContext hdsp; @@ -120,6 +124,10 @@ typedef struct MJpegDecodeContext { int extern_huff; AVDictionary *exif_metadata; + + AVStereo3D *stereo3d; ///!< stereoscopic information (cached, since it is read before frame allocation) + + const AVPixFmtDescriptor *pix_desc; } MJpegDecodeContext; int ff_mjpeg_decode_init(AVCodecContext *avctx); @@ -131,7 +139,8 @@ int ff_mjpeg_decode_dqt(MJpegDecodeContext *s); int ff_mjpeg_decode_dht(MJpegDecodeContext *s); int ff_mjpeg_decode_sof(MJpegDecodeContext *s); int ff_mjpeg_decode_sos(MJpegDecodeContext *s, - const uint8_t *mb_bitmask, const AVFrame *reference); + const uint8_t *mb_bitmask,int mb_bitmask_size, + const AVFrame *reference); int ff_mjpeg_find_marker(MJpegDecodeContext *s, const uint8_t **buf_ptr, const uint8_t *buf_end, const uint8_t **unescaped_buf_ptr, int *unescaped_buf_size); |