Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(683)

Side by Side Diff: patched-ffmpeg-mt/libavcodec/mjpegdec.h

Issue 789004: ffmpeg roll of source to mar 9 version... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: '' Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * MJPEG decoder 2 * MJPEG decoder
3 * Copyright (c) 2000, 2001 Fabrice Bellard 3 * Copyright (c) 2000, 2001 Fabrice Bellard
4 * Copyright (c) 2003 Alex Beregszaszi 4 * Copyright (c) 2003 Alex Beregszaszi
5 * Copyright (c) 2003-2004 Michael Niedermayer 5 * Copyright (c) 2003-2004 Michael Niedermayer
6 * 6 *
7 * This file is part of FFmpeg. 7 * This file is part of FFmpeg.
8 * 8 *
9 * FFmpeg is free software; you can redistribute it and/or 9 * FFmpeg is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Lesser General Public 10 * modify it under the terms of the GNU Lesser General Public
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 int nb_blocks[MAX_COMPONENTS]; 77 int nb_blocks[MAX_COMPONENTS];
78 int h_scount[MAX_COMPONENTS]; 78 int h_scount[MAX_COMPONENTS];
79 int v_scount[MAX_COMPONENTS]; 79 int v_scount[MAX_COMPONENTS];
80 int h_max, v_max; /* maximum h and v counts */ 80 int h_max, v_max; /* maximum h and v counts */
81 int quant_index[4]; /* quant table index for each component */ 81 int quant_index[4]; /* quant table index for each component */
82 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do t hat ?) */ 82 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do t hat ?) */
83 AVFrame picture; /* picture structure */ 83 AVFrame picture; /* picture structure */
84 int got_picture; ///< we found a SOF and pict ure is valid, too. 84 int got_picture; ///< we found a SOF and pict ure is valid, too.
85 int linesize[MAX_COMPONENTS]; ///< linesize << interlaced 85 int linesize[MAX_COMPONENTS]; ///< linesize << interlaced
86 int8_t *qscale_table; 86 int8_t *qscale_table;
87 DECLARE_ALIGNED_16(DCTELEM, block)[64]; 87 DECLARE_ALIGNED(16, DCTELEM, block)[64];
88 DCTELEM (*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive m ode) 88 DCTELEM (*blocks[MAX_COMPONENTS])[64]; ///< intermediate sums (progressive m ode)
89 uint8_t *last_nnz[MAX_COMPONENTS]; 89 uint8_t *last_nnz[MAX_COMPONENTS];
90 uint64_t coefs_finished[MAX_COMPONENTS]; ///< bitmask of which coefs have be en completely decoded (progressive mode) 90 uint64_t coefs_finished[MAX_COMPONENTS]; ///< bitmask of which coefs have be en completely decoded (progressive mode)
91 ScanTable scantable; 91 ScanTable scantable;
92 DSPContext dsp; 92 DSPContext dsp;
93 93
94 int restart_interval; 94 int restart_interval;
95 int restart_count; 95 int restart_count;
96 96
97 int buggy_avid; 97 int buggy_avid;
(...skipping 13 matching lines...) Expand all
111 int ff_mjpeg_decode_end(AVCodecContext *avctx); 111 int ff_mjpeg_decode_end(AVCodecContext *avctx);
112 int ff_mjpeg_decode_frame(AVCodecContext *avctx, 112 int ff_mjpeg_decode_frame(AVCodecContext *avctx,
113 void *data, int *data_size, 113 void *data, int *data_size,
114 AVPacket *avpkt); 114 AVPacket *avpkt);
115 int ff_mjpeg_decode_dqt(MJpegDecodeContext *s); 115 int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
116 int ff_mjpeg_decode_dht(MJpegDecodeContext *s); 116 int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
117 int ff_mjpeg_decode_sof(MJpegDecodeContext *s); 117 int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
118 int ff_mjpeg_decode_sos(MJpegDecodeContext *s); 118 int ff_mjpeg_decode_sos(MJpegDecodeContext *s);
119 119
120 #endif /* AVCODEC_MJPEGDEC_H */ 120 #endif /* AVCODEC_MJPEGDEC_H */
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698