annotate mjpegdec.h @ 6443:e3adb7e96812 libavcodec

Detect and prevent reading over the end of counts_*. We pass the error through a context variable as this is simpler and i think also faster, but the return value of functions could be used instead of course. The code also ensures as a side effect that the AC decoder state does not become invalid. This fixes all known crashes. And outputs nothing in case of an error instead of random noise.
author michael
date Tue, 04 Mar 2008 21:58:34 +0000
parents 01e909d2a435
children 7fa807dd7958
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5043
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
1 /*
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
2 * MJPEG decoder
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard.
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
4 * Copyright (c) 2003 Alex Beregszaszi
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
5 * Copyright (c) 2003-2004 Michael Niedermayer
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
6 *
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
7 * This file is part of FFmpeg.
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
8 *
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
9 * FFmpeg is free software; you can redistribute it and/or
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
10 * modify it under the terms of the GNU Lesser General Public
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
11 * License as published by the Free Software Foundation; either
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
12 * version 2.1 of the License, or (at your option) any later version.
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
13 *
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
14 * FFmpeg is distributed in the hope that it will be useful,
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
17 * Lesser General Public License for more details.
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
18 *
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
19 * You should have received a copy of the GNU Lesser General Public
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
20 * License along with FFmpeg; if not, write to the Free Software
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
22 */
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
23
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
24 /**
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
25 * @file mjpegdec.h
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
26 * MJPEG decoder.
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
27 */
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
28
5830
1d83e9c34641 Add FFMPEG_ prefix to all multiple inclusion guards.
diego
parents: 5045
diff changeset
29 #ifndef FFMPEG_MJPEGDEC_H
1d83e9c34641 Add FFMPEG_ prefix to all multiple inclusion guards.
diego
parents: 5045
diff changeset
30 #define FFMPEG_MJPEGDEC_H
5043
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
31
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
32 #include "avcodec.h"
5045
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
33 #include "bitstream.h"
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
34 #include "dsputil.h"
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
35 #include "mpegvideo.h"
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
36
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
37 #define MAX_COMPONENTS 4
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
38
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
39 typedef struct MJpegDecodeContext {
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
40 AVCodecContext *avctx;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
41 GetBitContext gb;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
42
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
43 int start_code; /* current start code */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
44 int buffer_size;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
45 uint8_t *buffer;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
46
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
47 int16_t quant_matrixes[4][64];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
48 VLC vlcs[2][4];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
49 int qscale[4]; ///< quantizer scale calculated from quant_matrixes
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
50
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
51 int org_height; /* size given at codec init */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
52 int first_picture; /* true if decoding first picture */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
53 int interlaced; /* true if interlaced */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
54 int bottom_field; /* true if bottom field */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
55 int lossless;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
56 int ls;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
57 int progressive;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
58 int rgb;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
59 int rct; /* standard rct */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
60 int pegasus_rct; /* pegasus reversible colorspace transform */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
61 int bits; /* bits per component */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
62
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
63 int maxval;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
64 int near; ///< near lossless bound (si 0 for lossless)
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
65 int t1,t2,t3;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
66 int reset; ///< context halfing intervall ?rename
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
67
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
68 int width, height;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
69 int mb_width, mb_height;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
70 int nb_components;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
71 int component_id[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
72 int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
73 int v_count[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
74 int comp_index[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
75 int dc_index[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
76 int ac_index[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
77 int nb_blocks[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
78 int h_scount[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
79 int v_scount[MAX_COMPONENTS];
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
80 int h_max, v_max; /* maximum h and v counts */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
81 int quant_index[4]; /* quant table index for each component */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
82 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
83 AVFrame picture; /* picture structure */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
84 int linesize[MAX_COMPONENTS]; ///< linesize << interlaced
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
85 int8_t *qscale_table;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
86 DECLARE_ALIGNED_8(DCTELEM, block[64]);
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
87 ScanTable scantable;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
88 DSPContext dsp;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
89
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
90 int restart_interval;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
91 int restart_count;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
92
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
93 int buggy_avid;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
94 int cs_itu601;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
95 int interlace_polarity;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
96
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
97 int mjpb_skiptosod;
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
98
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
99 int cur_scan; /* current scan, used by JPEG-LS */
f0e079daad30 move MJpegDecodeContext declaration from mjpeg.h to mjpegdec.h
aurel
parents: 5044
diff changeset
100 } MJpegDecodeContext;
5043
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
101
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
102 int ff_mjpeg_decode_init(AVCodecContext *avctx);
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
103 int ff_mjpeg_decode_end(AVCodecContext *avctx);
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
104 int ff_mjpeg_decode_frame(AVCodecContext *avctx,
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
105 void *data, int *data_size,
6222
michael
parents: 5830
diff changeset
106 const uint8_t *buf, int buf_size);
5044
924fdd6175b1 move mjpeg-b decoder in its own file
aurel
parents: 5043
diff changeset
107 int ff_mjpeg_decode_dqt(MJpegDecodeContext *s);
924fdd6175b1 move mjpeg-b decoder in its own file
aurel
parents: 5043
diff changeset
108 int ff_mjpeg_decode_dht(MJpegDecodeContext *s);
924fdd6175b1 move mjpeg-b decoder in its own file
aurel
parents: 5043
diff changeset
109 int ff_mjpeg_decode_sof(MJpegDecodeContext *s);
924fdd6175b1 move mjpeg-b decoder in its own file
aurel
parents: 5043
diff changeset
110 int ff_mjpeg_decode_sos(MJpegDecodeContext *s);
5043
41d1e47e30e0 10l: forgot to svn add mjpegdec.h
aurel
parents:
diff changeset
111
5830
1d83e9c34641 Add FFMPEG_ prefix to all multiple inclusion guards.
diego
parents: 5045
diff changeset
112 #endif /* FFMPEG_MJPEGDEC_H */