annotate mjpeg.c @ 840:4c22dcf3ba65 libavcodec

cleanup
author michaelni
date Wed, 06 Nov 2002 09:30:47 +0000
parents ff66fdb1d092
children 4033915880d9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2 * MJPEG encoder and decoder
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
5 * This library is free software; you can redistribute it and/or
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
7 * License as published by the Free Software Foundation; either
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
16 * License along with this library; if not, write to the Free Software
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
18 *
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
19 * Support for external huffman table, various fixes (AVID workaround),
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
20 * aspecting and new decode_frame mechanism
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
21 * by Alex Beregszaszi <alex@naxine.org>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
22 */
776
al3x
parents: 775
diff changeset
23 //#define DEBUG
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
24 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
25 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
26 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
27
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
28 /* use two quantizer tables (one for luminance and one for chrominance) */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
29 /* not yet working */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
30 #undef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
31
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
32 typedef struct MJpegContext {
986e461dc072 Initial revision
glantau
parents:
diff changeset
33 UINT8 huff_size_dc_luminance[12];
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 UINT16 huff_code_dc_luminance[12];
986e461dc072 Initial revision
glantau
parents:
diff changeset
35 UINT8 huff_size_dc_chrominance[12];
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 UINT16 huff_code_dc_chrominance[12];
986e461dc072 Initial revision
glantau
parents:
diff changeset
37
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 UINT8 huff_size_ac_luminance[256];
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 UINT16 huff_code_ac_luminance[256];
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 UINT8 huff_size_ac_chrominance[256];
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 UINT16 huff_code_ac_chrominance[256];
986e461dc072 Initial revision
glantau
parents:
diff changeset
42 } MJpegContext;
986e461dc072 Initial revision
glantau
parents:
diff changeset
43
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
44 /* JPEG marker codes */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
45 typedef enum {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
46 /* start of frame */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
47 SOF0 = 0xc0, /* baseline */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
48 SOF1 = 0xc1, /* extended sequential, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
49 SOF2 = 0xc2, /* progressive, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
50 SOF3 = 0xc3, /* lossless, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
51
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
52 SOF5 = 0xc5, /* differential sequential, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
53 SOF6 = 0xc6, /* differential progressive, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
54 SOF7 = 0xc7, /* differential lossless, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
55 JPG = 0xc8, /* reserved for JPEG extension */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
56 SOF9 = 0xc9, /* extended sequential, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
57 SOF10 = 0xca, /* progressive, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
58 SOF11 = 0xcb, /* lossless, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
59
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
60 SOF13 = 0xcd, /* differential sequential, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
61 SOF14 = 0xce, /* differential progressive, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
62 SOF15 = 0xcf, /* differential lossless, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
63
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
64 DHT = 0xc4, /* define huffman tables */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
65
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
66 DAC = 0xcc, /* define arithmetic-coding conditioning */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
67
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
68 /* restart with modulo 8 count "m" */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
69 RST0 = 0xd0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
70 RST1 = 0xd1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
71 RST2 = 0xd2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
72 RST3 = 0xd3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
73 RST4 = 0xd4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
74 RST5 = 0xd5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
75 RST6 = 0xd6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
76 RST7 = 0xd7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
77
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
78 SOI = 0xd8, /* start of image */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
79 EOI = 0xd9, /* end of image */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
80 SOS = 0xda, /* start of scan */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
81 DQT = 0xdb, /* define quantization tables */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
82 DNL = 0xdc, /* define number of lines */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
83 DRI = 0xdd, /* define restart interval */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
84 DHP = 0xde, /* define hierarchical progression */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
85 EXP = 0xdf, /* expand reference components */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
86
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
87 APP0 = 0xe0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
88 APP1 = 0xe1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
89 APP2 = 0xe2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
90 APP3 = 0xe3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
91 APP4 = 0xe4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
92 APP5 = 0xe5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
93 APP6 = 0xe6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
94 APP7 = 0xe7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
95 APP8 = 0xe8,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
96 APP9 = 0xe9,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
97 APP10 = 0xea,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
98 APP11 = 0xeb,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
99 APP12 = 0xec,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
100 APP13 = 0xed,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
101 APP14 = 0xee,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
102 APP15 = 0xef,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
103
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
104 JPG0 = 0xf0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
105 JPG1 = 0xf1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
106 JPG2 = 0xf2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
107 JPG3 = 0xf3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
108 JPG4 = 0xf4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
109 JPG5 = 0xf5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
110 JPG6 = 0xf6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
111 JPG7 = 0xf7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
112 JPG8 = 0xf8,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
113 JPG9 = 0xf9,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
114 JPG10 = 0xfa,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
115 JPG11 = 0xfb,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
116 JPG12 = 0xfc,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
117 JPG13 = 0xfd,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
118
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
119 COM = 0xfe, /* comment */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
120
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
121 TEM = 0x01, /* temporary private use for arithmetic coding */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
122
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
123 /* 0x02 -> 0xbf reserved */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
124 } JPEG_MARKER;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
125
986e461dc072 Initial revision
glantau
parents:
diff changeset
126 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
127 /* These are the sample quantization tables given in JPEG spec section K.1.
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 * The spec says that the values given produce "good" quality, and
986e461dc072 Initial revision
glantau
parents:
diff changeset
129 * when divided by 2, "very good" quality.
986e461dc072 Initial revision
glantau
parents:
diff changeset
130 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
131 static const unsigned char std_luminance_quant_tbl[64] = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
132 16, 11, 10, 16, 24, 40, 51, 61,
986e461dc072 Initial revision
glantau
parents:
diff changeset
133 12, 12, 14, 19, 26, 58, 60, 55,
986e461dc072 Initial revision
glantau
parents:
diff changeset
134 14, 13, 16, 24, 40, 57, 69, 56,
986e461dc072 Initial revision
glantau
parents:
diff changeset
135 14, 17, 22, 29, 51, 87, 80, 62,
986e461dc072 Initial revision
glantau
parents:
diff changeset
136 18, 22, 37, 56, 68, 109, 103, 77,
986e461dc072 Initial revision
glantau
parents:
diff changeset
137 24, 35, 55, 64, 81, 104, 113, 92,
986e461dc072 Initial revision
glantau
parents:
diff changeset
138 49, 64, 78, 87, 103, 121, 120, 101,
986e461dc072 Initial revision
glantau
parents:
diff changeset
139 72, 92, 95, 98, 112, 100, 103, 99
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 static const unsigned char std_chrominance_quant_tbl[64] = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 17, 18, 24, 47, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
143 18, 21, 26, 66, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 24, 26, 56, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 47, 66, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
146 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
148 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
149 99, 99, 99, 99, 99, 99, 99, 99
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
152
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 /* IMPORTANT: these are only valid for 8-bit data precision! */
986e461dc072 Initial revision
glantau
parents:
diff changeset
155 static const UINT8 bits_dc_luminance[17] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 static const UINT8 val_dc_luminance[] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
158 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
159
986e461dc072 Initial revision
glantau
parents:
diff changeset
160 static const UINT8 bits_dc_chrominance[17] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 static const UINT8 val_dc_chrominance[] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
164
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 static const UINT8 bits_ac_luminance[17] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 static const UINT8 val_ac_luminance[] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
168 { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
986e461dc072 Initial revision
glantau
parents:
diff changeset
170 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
986e461dc072 Initial revision
glantau
parents:
diff changeset
175 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
986e461dc072 Initial revision
glantau
parents:
diff changeset
176 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
986e461dc072 Initial revision
glantau
parents:
diff changeset
178 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
986e461dc072 Initial revision
glantau
parents:
diff changeset
185 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
186 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
986e461dc072 Initial revision
glantau
parents:
diff changeset
187 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
986e461dc072 Initial revision
glantau
parents:
diff changeset
188 0xf9, 0xfa
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
190
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 static const UINT8 bits_ac_chrominance[17] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
193
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 static const UINT8 val_ac_chrominance[] =
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
986e461dc072 Initial revision
glantau
parents:
diff changeset
202 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
986e461dc072 Initial revision
glantau
parents:
diff changeset
215 0xf9, 0xfa
986e461dc072 Initial revision
glantau
parents:
diff changeset
216 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
217
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 /* isn't this function nicer than the one in the libjpeg ? */
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 static void build_huffman_codes(UINT8 *huff_size, UINT16 *huff_code,
986e461dc072 Initial revision
glantau
parents:
diff changeset
220 const UINT8 *bits_table, const UINT8 *val_table)
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 int i, j, k,nb, code, sym;
986e461dc072 Initial revision
glantau
parents:
diff changeset
223
986e461dc072 Initial revision
glantau
parents:
diff changeset
224 code = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
225 k = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 for(i=1;i<=16;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 nb = bits_table[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
228 for(j=0;j<nb;j++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 sym = val_table[k++];
986e461dc072 Initial revision
glantau
parents:
diff changeset
230 huff_size[sym] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 huff_code[sym] = code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 code++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 code <<= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
237
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 int mjpeg_init(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 MJpegContext *m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
241
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
242 m = av_malloc(sizeof(MJpegContext));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 if (!m)
986e461dc072 Initial revision
glantau
parents:
diff changeset
244 return -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
245
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
246 s->min_qcoeff=-1023;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
247 s->max_qcoeff= 1023;
357
ae179ec5fb47 correct quantizer bias
michaelni
parents: 354
diff changeset
248 s->intra_quant_bias= 1<<(QUANT_BIAS_SHIFT-1); //(a + x/2)/x
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
249
986e461dc072 Initial revision
glantau
parents:
diff changeset
250 /* build all the huffman tables */
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 build_huffman_codes(m->huff_size_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 m->huff_code_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 bits_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
254 val_dc_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
255 build_huffman_codes(m->huff_size_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
256 m->huff_code_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 bits_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 val_dc_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
259 build_huffman_codes(m->huff_size_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 m->huff_code_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 bits_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 val_ac_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 build_huffman_codes(m->huff_size_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 m->huff_code_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 bits_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
266 val_ac_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
267
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 s->mjpeg_ctx = m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
269 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
270 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
271
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 void mjpeg_close(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 {
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
274 av_free(s->mjpeg_ctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
275 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
276
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 static inline void put_marker(PutBitContext *p, int code)
986e461dc072 Initial revision
glantau
parents:
diff changeset
278 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 put_bits(p, 8, 0xff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
280 put_bits(p, 8, code);
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
282
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 /* table_class: 0 = DC coef, 1 = AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
284 static int put_huffman_table(MpegEncContext *s, int table_class, int table_id,
986e461dc072 Initial revision
glantau
parents:
diff changeset
285 const UINT8 *bits_table, const UINT8 *value_table)
986e461dc072 Initial revision
glantau
parents:
diff changeset
286 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
287 PutBitContext *p = &s->pb;
986e461dc072 Initial revision
glantau
parents:
diff changeset
288 int n, i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
289
986e461dc072 Initial revision
glantau
parents:
diff changeset
290 put_bits(p, 4, table_class);
986e461dc072 Initial revision
glantau
parents:
diff changeset
291 put_bits(p, 4, table_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
292
986e461dc072 Initial revision
glantau
parents:
diff changeset
293 n = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
294 for(i=1;i<=16;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
295 n += bits_table[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
296 put_bits(p, 8, bits_table[i]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
297 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
298
986e461dc072 Initial revision
glantau
parents:
diff changeset
299 for(i=0;i<n;i++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
300 put_bits(p, 8, value_table[i]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
301
986e461dc072 Initial revision
glantau
parents:
diff changeset
302 return n + 17;
986e461dc072 Initial revision
glantau
parents:
diff changeset
303 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
304
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 static void jpeg_table_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 PutBitContext *p = &s->pb;
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
308 int i, j, size;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
309 UINT8 *ptr;
986e461dc072 Initial revision
glantau
parents:
diff changeset
310
986e461dc072 Initial revision
glantau
parents:
diff changeset
311 /* quant matrixes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
312 put_marker(p, DQT);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
313 #ifdef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
314 put_bits(p, 16, 2 + 2 * (1 + 64));
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
315 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
316 put_bits(p, 16, 2 + 1 * (1 + 64));
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
317 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
318 put_bits(p, 4, 0); /* 8 bit precision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
319 put_bits(p, 4, 0); /* table 0 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
320 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
321 j = s->intra_scantable.permutated[i];
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
322 put_bits(p, 8, s->intra_matrix[j]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
323 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
324 #ifdef TWOMATRIXES
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
325 put_bits(p, 4, 0); /* 8 bit precision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
326 put_bits(p, 4, 1); /* table 1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
327 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
328 j = s->intra_scantable.permutated[i];
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
329 put_bits(p, 8, s->chroma_intra_matrix[j]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
330 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
331 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
332
986e461dc072 Initial revision
glantau
parents:
diff changeset
333 /* huffman table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 put_marker(p, DHT);
986e461dc072 Initial revision
glantau
parents:
diff changeset
335 flush_put_bits(p);
234
5fc0c3af3fe4 alternative bitstream writer (disabled by default, uncomment #define ALT_BISTREAM_WRITER in common.h if u want to try it)
michaelni
parents: 229
diff changeset
336 ptr = pbBufPtr(p);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
337 put_bits(p, 16, 0); /* patched later */
986e461dc072 Initial revision
glantau
parents:
diff changeset
338 size = 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
339 size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
340 size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
341
986e461dc072 Initial revision
glantau
parents:
diff changeset
342 size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 ptr[0] = size >> 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
345 ptr[1] = size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
346 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
347
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
348 static void jpeg_put_comments(MpegEncContext *s)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
349 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
350 PutBitContext *p = &s->pb;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
351 int size;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
352 UINT8 *ptr;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
353
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
354 if (s->aspect_ratio_info)
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
355 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
356 /* JFIF header */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
357 put_marker(p, APP0);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
358 put_bits(p, 16, 16);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
359 put_string(p, "JFIF"); /* this puts the trailing zero-byte too */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
360 put_bits(p, 16, 0x0201); /* v 1.02 */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
361 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
362 switch(s->aspect_ratio_info)
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
363 {
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
364 case FF_ASPECT_4_3_625:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
365 case FF_ASPECT_4_3_525:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
366 put_bits(p, 16, 4);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
367 put_bits(p, 16, 3);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
368 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
369 case FF_ASPECT_16_9_625:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
370 case FF_ASPECT_16_9_525:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
371 put_bits(p, 16, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
372 put_bits(p, 16, 9);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
373 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
374 case FF_ASPECT_EXTENDED:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
375 put_bits(p, 16, s->aspected_width);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
376 put_bits(p, 16, s->aspected_height);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
377 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
378 case FF_ASPECT_SQUARE:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
379 default:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
380 put_bits(p, 16, 1); /* aspect: 1:1 */
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
381 put_bits(p, 16, 1);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
382 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
383 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
384 put_bits(p, 8, 0); /* thumbnail width */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
385 put_bits(p, 8, 0); /* thumbnail height */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
386 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
387
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
388 /* comment */
676
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
389 if(!ff_bit_exact){
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
390 put_marker(p, COM);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
391 flush_put_bits(p);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
392 ptr = pbBufPtr(p);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
393 put_bits(p, 16, 0); /* patched later */
527
d02d0e6db25c * clean compiler warning
kabi
parents: 507
diff changeset
394 #define MJPEG_VERSION "FFmpeg" LIBAVCODEC_VERSION "b" LIBAVCODEC_BUILD_STR
676
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
395 put_string(p, MJPEG_VERSION);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
396 size = strlen(MJPEG_VERSION)+3;
527
d02d0e6db25c * clean compiler warning
kabi
parents: 507
diff changeset
397 #undef MJPEG_VERSION
676
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
398 ptr[0] = size >> 8;
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
399 ptr[1] = size;
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
400 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
401 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
402
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
403 void mjpeg_picture_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
404 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
405 put_marker(&s->pb, SOI);
986e461dc072 Initial revision
glantau
parents:
diff changeset
406
370
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
407 if (!s->mjpeg_data_only_frames)
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
408 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
409 jpeg_put_comments(s);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
410
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
411 if (s->mjpeg_write_tables) jpeg_table_header(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
412
986e461dc072 Initial revision
glantau
parents:
diff changeset
413 put_marker(&s->pb, SOF0);
986e461dc072 Initial revision
glantau
parents:
diff changeset
414
986e461dc072 Initial revision
glantau
parents:
diff changeset
415 put_bits(&s->pb, 16, 17);
986e461dc072 Initial revision
glantau
parents:
diff changeset
416 put_bits(&s->pb, 8, 8); /* 8 bits/component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
417 put_bits(&s->pb, 16, s->height);
986e461dc072 Initial revision
glantau
parents:
diff changeset
418 put_bits(&s->pb, 16, s->width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
419 put_bits(&s->pb, 8, 3); /* 3 components */
986e461dc072 Initial revision
glantau
parents:
diff changeset
420
986e461dc072 Initial revision
glantau
parents:
diff changeset
421 /* Y component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 put_bits(&s->pb, 8, 1); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
423 put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
424 put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
425 put_bits(&s->pb, 8, 0); /* select matrix */
986e461dc072 Initial revision
glantau
parents:
diff changeset
426
986e461dc072 Initial revision
glantau
parents:
diff changeset
427 /* Cb component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 put_bits(&s->pb, 8, 2); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
429 put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
430 put_bits(&s->pb, 4, s->mjpeg_vsample[1]); /* V factor */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
431 #ifdef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
432 put_bits(&s->pb, 8, 1); /* select matrix */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
433 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
434 put_bits(&s->pb, 8, 0); /* select matrix */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
435 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
436
986e461dc072 Initial revision
glantau
parents:
diff changeset
437 /* Cr component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 put_bits(&s->pb, 8, 3); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
439 put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
440 put_bits(&s->pb, 4, s->mjpeg_vsample[2]); /* V factor */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
441 #ifdef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
442 put_bits(&s->pb, 8, 1); /* select matrix */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
443 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
444 put_bits(&s->pb, 8, 0); /* select matrix */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
445 #endif
370
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
446 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
447
986e461dc072 Initial revision
glantau
parents:
diff changeset
448 /* scan header */
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 put_marker(&s->pb, SOS);
986e461dc072 Initial revision
glantau
parents:
diff changeset
450 put_bits(&s->pb, 16, 12); /* length */
986e461dc072 Initial revision
glantau
parents:
diff changeset
451 put_bits(&s->pb, 8, 3); /* 3 components */
986e461dc072 Initial revision
glantau
parents:
diff changeset
452
986e461dc072 Initial revision
glantau
parents:
diff changeset
453 /* Y component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
454 put_bits(&s->pb, 8, 1); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
455 put_bits(&s->pb, 4, 0); /* DC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
456 put_bits(&s->pb, 4, 0); /* AC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
457
986e461dc072 Initial revision
glantau
parents:
diff changeset
458 /* Cb component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
459 put_bits(&s->pb, 8, 2); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
460 put_bits(&s->pb, 4, 1); /* DC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
461 put_bits(&s->pb, 4, 1); /* AC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
462
986e461dc072 Initial revision
glantau
parents:
diff changeset
463 /* Cr component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
464 put_bits(&s->pb, 8, 3); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
465 put_bits(&s->pb, 4, 1); /* DC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
466 put_bits(&s->pb, 4, 1); /* AC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
467
986e461dc072 Initial revision
glantau
parents:
diff changeset
468 put_bits(&s->pb, 8, 0); /* Ss (not used) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
469 put_bits(&s->pb, 8, 63); /* Se (not used) */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
470 put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
471 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
472
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
473 static void escape_FF(MpegEncContext *s)
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
474 {
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
475 int size= get_bit_count(&s->pb) - s->header_bits;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
476 int i, ff_count;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
477 uint8_t *buf= s->pb.buf + (s->header_bits>>3);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
478 int align= (-(int)(buf))&3;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
479
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
480 assert((size&7) == 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
481 size >>= 3;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
482
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
483 ff_count=0;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
484 for(i=0; i<size && i<align; i++){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
485 if(buf[i]==0xFF) ff_count++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
486 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
487 for(; i<size-15; i+=16){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
488 int acc, v;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
489
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
490 v= *(uint32_t*)(&buf[i]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
491 acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
492 v= *(uint32_t*)(&buf[i+4]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
493 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
494 v= *(uint32_t*)(&buf[i+8]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
495 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
496 v= *(uint32_t*)(&buf[i+12]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
497 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
498
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
499 acc>>=4;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
500 acc+= (acc>>16);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
501 acc+= (acc>>8);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
502 ff_count+= acc&0xFF;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
503 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
504 for(; i<size; i++){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
505 if(buf[i]==0xFF) ff_count++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
506 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
507
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
508 if(ff_count==0) return;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
509
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
510 /* skip put bits */
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
511 for(i=0; i<ff_count-3; i+=4)
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
512 put_bits(&s->pb, 32, 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
513 put_bits(&s->pb, (ff_count-i)*8, 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
514 flush_put_bits(&s->pb);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
515
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
516 for(i=size-1; ff_count; i--){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
517 int v= buf[i];
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
518
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
519 if(v==0xFF){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
520 //printf("%d %d\n", i, ff_count);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
521 buf[i+ff_count]= 0;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
522 ff_count--;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
523 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
524
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
525 buf[i+ff_count]= v;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
526 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
527 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
528
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
529 void mjpeg_picture_trailer(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
530 {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
531 int pad= (-get_bit_count(&s->pb))&7;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
532
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
533 put_bits(&s->pb, pad,0xFF>>(8-pad));
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
534 flush_put_bits(&s->pb);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
535
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
536 escape_FF(s);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
537
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
538 put_marker(&s->pb, EOI);
986e461dc072 Initial revision
glantau
parents:
diff changeset
539 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
540
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
541 static inline void mjpeg_encode_dc(MpegEncContext *s, int val,
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
542 UINT8 *huff_size, UINT16 *huff_code)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
543 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
544 int mant, nbits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
545
986e461dc072 Initial revision
glantau
parents:
diff changeset
546 if (val == 0) {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
547 put_bits(&s->pb, huff_size[0], huff_code[0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
548 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
549 mant = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
550 if (val < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
551 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
552 mant--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
553 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
554
986e461dc072 Initial revision
glantau
parents:
diff changeset
555 /* compute the log (XXX: optimize) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
556 nbits = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
557 while (val != 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
558 val = val >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
559 nbits++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
560 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
561
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
562 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
563
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
564 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
565 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
566 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
567
986e461dc072 Initial revision
glantau
parents:
diff changeset
568 static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
569 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
570 int mant, nbits, code, i, j;
986e461dc072 Initial revision
glantau
parents:
diff changeset
571 int component, dc, run, last_index, val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
572 MJpegContext *m = s->mjpeg_ctx;
986e461dc072 Initial revision
glantau
parents:
diff changeset
573 UINT8 *huff_size_ac;
986e461dc072 Initial revision
glantau
parents:
diff changeset
574 UINT16 *huff_code_ac;
986e461dc072 Initial revision
glantau
parents:
diff changeset
575
986e461dc072 Initial revision
glantau
parents:
diff changeset
576 /* DC coef */
986e461dc072 Initial revision
glantau
parents:
diff changeset
577 component = (n <= 3 ? 0 : n - 4 + 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
578 dc = block[0]; /* overflow is impossible */
986e461dc072 Initial revision
glantau
parents:
diff changeset
579 val = dc - s->last_dc[component];
986e461dc072 Initial revision
glantau
parents:
diff changeset
580 if (n < 4) {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
581 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
582 huff_size_ac = m->huff_size_ac_luminance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
583 huff_code_ac = m->huff_code_ac_luminance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
584 } else {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
585 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 huff_size_ac = m->huff_size_ac_chrominance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
587 huff_code_ac = m->huff_code_ac_chrominance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
588 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
589 s->last_dc[component] = dc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
590
986e461dc072 Initial revision
glantau
parents:
diff changeset
591 /* AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
592
986e461dc072 Initial revision
glantau
parents:
diff changeset
593 run = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
594 last_index = s->block_last_index[n];
986e461dc072 Initial revision
glantau
parents:
diff changeset
595 for(i=1;i<=last_index;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
596 j = s->intra_scantable.permutated[i];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
597 val = block[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
598 if (val == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
599 run++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
600 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
601 while (run >= 16) {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
602 put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
603 run -= 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
604 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
605 mant = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
606 if (val < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
607 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
608 mant--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
609 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
610
986e461dc072 Initial revision
glantau
parents:
diff changeset
611 /* compute the log (XXX: optimize) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
612 nbits = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
613 while (val != 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
614 val = val >> 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
615 nbits++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
616 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
617 code = (run << 4) | nbits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
618
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
619 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
620
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
621 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 run = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
623 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
624 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
625
986e461dc072 Initial revision
glantau
parents:
diff changeset
626 /* output EOB only if not already 64 values */
986e461dc072 Initial revision
glantau
parents:
diff changeset
627 if (last_index < 63 || run != 0)
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
628 put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
629 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
630
986e461dc072 Initial revision
glantau
parents:
diff changeset
631 void mjpeg_encode_mb(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
632 DCTELEM block[6][64])
986e461dc072 Initial revision
glantau
parents:
diff changeset
633 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
634 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
635 for(i=0;i<6;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 encode_block(s, block[i], i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
637 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
638 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
639
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
640 /******************************************/
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
641 /* decoding */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
642
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
643 #define MAX_COMPONENTS 4
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
644
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
645 typedef struct MJpegDecodeContext {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
646 AVCodecContext *avctx;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
647 GetBitContext gb;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
648 int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
649
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
650 int start_code; /* current start code */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
651 int buffer_size;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
652 UINT8 *buffer;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
653
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
654 INT16 quant_matrixes[4][64];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
655 VLC vlcs[2][4];
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
656
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
657 int org_width, org_height; /* size given at codec init */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
658 int first_picture; /* true if decoding first picture */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
659 int interlaced; /* true if interlaced */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
660 int bottom_field; /* true if bottom field */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
661
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
662 int width, height;
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
663 int nb_components;
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
664 int component_id[MAX_COMPONENTS];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
665 int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
666 int v_count[MAX_COMPONENTS];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
667 int h_max, v_max; /* maximum h and v counts */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
668 int quant_index[4]; /* quant table index for each component */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
669 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
670 UINT8 *current_picture[MAX_COMPONENTS]; /* picture structure */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
671 int linesize[MAX_COMPONENTS];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
672 DCTELEM block[64] __align8;
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
673 ScanTable scantable;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
674 void (*idct_put)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
675
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
676 int restart_interval;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
677 int restart_count;
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
678
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
679 int buggy_avid;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
680 int interlace_polarity;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
681 } MJpegDecodeContext;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
682
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
683 static int mjpeg_decode_dht(MJpegDecodeContext *s);
375
749b5c16c0f7 - Warning fix.
pulento
parents: 370
diff changeset
684
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
685 static void build_vlc(VLC *vlc, const UINT8 *bits_table, const UINT8 *val_table,
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
686 int nb_codes)
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
687 {
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
688 UINT8 huff_size[256];
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
689 UINT16 huff_code[256];
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
690
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
691 memset(huff_size, 0, sizeof(huff_size));
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
692 build_huffman_codes(huff_size, huff_code, bits_table, val_table);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
693
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
694 init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
695 }
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
696
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
697 static int mjpeg_decode_init(AVCodecContext *avctx)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
698 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
699 MJpegDecodeContext *s = avctx->priv_data;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
700 MpegEncContext s2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
701
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
702 s->avctx = avctx;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
703
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
704 /* ugly way to get the idct & scantable */
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
705 memset(&s2, 0, sizeof(MpegEncContext));
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
706 s2.flags= avctx->flags;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
707 s2.avctx= avctx;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
708 // s2->out_format = FMT_MJPEG;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
709 s2.width = 8;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
710 s2.height = 8;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
711 if (MPV_common_init(&s2) < 0)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
712 return -1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
713 s->scantable= s2.intra_scantable;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
714 s->idct_put= s2.idct_put;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
715 MPV_common_end(&s2);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
716
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
717 s->mpeg_enc_ctx_allocated = 0;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
718 s->buffer_size = 102400; /* smaller buffer should be enough,
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
719 but photojpg files could ahive bigger sizes */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
720 s->buffer = av_malloc(s->buffer_size);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
721 s->start_code = -1;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
722 s->first_picture = 1;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
723 s->org_width = avctx->width;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
724 s->org_height = avctx->height;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
725
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
726 build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
727 build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
728 build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
729 build_vlc(&s->vlcs[1][1], bits_ac_chrominance, val_ac_chrominance, 251);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
730
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
731 if (avctx->flags & CODEC_FLAG_EXTERN_HUFF)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
732 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
733 printf("mjpeg: using external huffman table\n");
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
734 init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
735 mjpeg_decode_dht(s);
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
736 /* should check for error - but dunno */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
737 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
738
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
739 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
740 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
741
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
742 /* quantize tables */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
743 static int mjpeg_decode_dqt(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
744 {
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
745 int len, index, i, j;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
746
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
747 len = get_bits(&s->gb, 16) - 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
748
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
749 while (len >= 65) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
750 /* only 8 bit precision handled */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
751 if (get_bits(&s->gb, 4) != 0)
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
752 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
753 dprintf("dqt: 16bit precision\n");
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
754 return -1;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
755 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
756 index = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
757 if (index >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
758 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
759 dprintf("index=%d\n", index);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
760 /* read quant table */
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
761 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
762 j = s->scantable.permutated[i];
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
763 s->quant_matrixes[index][j] = get_bits(&s->gb, 8);
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
764 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
765 len -= 65;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
766 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
767
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
768 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
769 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
770
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
771 /* decode huffman tables and build VLC decoders */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
772 static int mjpeg_decode_dht(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
773 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
774 int len, index, i, class, n, v, code_max;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
775 UINT8 bits_table[17];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
776 UINT8 val_table[256];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
777
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
778 len = get_bits(&s->gb, 16) - 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
779
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
780 while (len > 0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
781 if (len < 17)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
782 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
783 class = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
784 if (class >= 2)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
785 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
786 index = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
787 if (index >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
788 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
789 n = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
790 for(i=1;i<=16;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
791 bits_table[i] = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
792 n += bits_table[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
793 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
794 len -= 17;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
795 if (len < n || n > 256)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
796 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
797
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
798 code_max = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
799 for(i=0;i<n;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
800 v = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
801 if (v > code_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
802 code_max = v;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
803 val_table[i] = v;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
804 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
805 len -= n;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
806
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
807 /* build VLC and flush previous vlc if present */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
808 free_vlc(&s->vlcs[class][index]);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
809 dprintf("class=%d index=%d nb_codes=%d\n",
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
810 class, index, code_max + 1);
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
811 build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
812 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
813 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
814 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
815
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
816 static int mjpeg_decode_sof0(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
817 {
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
818 int len, nb_components, i, width, height;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
819
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
820 /* XXX: verify len field validity */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
821 len = get_bits(&s->gb, 16);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
822 /* only 8 bits/component accepted */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
823 if (get_bits(&s->gb, 8) != 8)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
824 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
825 height = get_bits(&s->gb, 16);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
826 width = get_bits(&s->gb, 16);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
827 dprintf("sof0: picture: %dx%d\n", width, height);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
828
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
829 nb_components = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
830 if (nb_components <= 0 ||
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
831 nb_components > MAX_COMPONENTS)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
832 return -1;
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
833 s->nb_components = nb_components;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
834 s->h_max = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
835 s->v_max = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
836 for(i=0;i<nb_components;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
837 /* component id */
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
838 s->component_id[i] = get_bits(&s->gb, 8) - 1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
839 s->h_count[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
840 s->v_count[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
841 /* compute hmax and vmax (only used in interleaved case) */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
842 if (s->h_count[i] > s->h_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
843 s->h_max = s->h_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
844 if (s->v_count[i] > s->v_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
845 s->v_max = s->v_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
846 s->quant_index[i] = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
847 if (s->quant_index[i] >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
848 return -1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
849 dprintf("component %d %d:%d id: %d quant:%d\n", i, s->h_count[i],
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
850 s->v_count[i], s->component_id[i], s->quant_index[i]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
851 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
852
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
853 /* if different size, realloc/alloc picture */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
854 /* XXX: also check h_count and v_count */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
855 if (width != s->width || height != s->height) {
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
856 for(i=0;i<MAX_COMPONENTS;i++)
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
857 av_freep(&s->current_picture[i]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
858 s->width = width;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
859 s->height = height;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
860 /* test interlaced mode */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
861 if (s->first_picture &&
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
862 s->org_height != 0 &&
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
863 s->height < ((s->org_height * 3) / 4)) {
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
864 s->interlaced = 1;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
865 // s->bottom_field = (s->interlace_polarity) ? 1 : 0;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
866 s->bottom_field = 0;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
867 }
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
868
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
869 for(i=0;i<nb_components;i++) {
226
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
870 int w, h;
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
871 w = (s->width + 8 * s->h_max - 1) / (8 * s->h_max);
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
872 h = (s->height + 8 * s->v_max - 1) / (8 * s->v_max);
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
873 w = w * 8 * s->h_count[i];
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
874 h = h * 8 * s->v_count[i];
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
875 if (s->interlaced)
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
876 w *= 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
877 s->linesize[i] = w;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
878 /* memory test is done in mjpeg_decode_sos() */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
879 s->current_picture[i] = av_mallocz(w * h);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
880 }
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
881 s->first_picture = 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
882 }
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
883
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
884 if (len != (8+(3*nb_components)))
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
885 {
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
886 dprintf("decode_sof0: error, len(%d) mismatch\n", len);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
887 }
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
888
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
889 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
890 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
891
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
892 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
893 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
894 int code, diff;
780
a48bb8bc63dd get_vlc2()
michaelni
parents: 779
diff changeset
895 #if 1
a48bb8bc63dd get_vlc2()
michaelni
parents: 779
diff changeset
896 code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
897 #else
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
898 code = get_vlc(&s->gb, &s->vlcs[0][dc_index]);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
899 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
900 if (code < 0)
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
901 {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
902 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index,
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
903 &s->vlcs[0][dc_index]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
904 return 0xffff;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
905 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
906 if (code == 0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
907 diff = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
908 } else {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
909 diff = get_bits(&s->gb, code);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
910 if ((diff & (1 << (code - 1))) == 0)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
911 diff = (-1 << code) | (diff + 1);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
912 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
913 return diff;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
914 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
915
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
916 /* decode block and dequantize */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
917 static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
918 int component, int dc_index, int ac_index, int quant_index)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
919 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
920 int nbits, code, i, j, level;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
921 int run, val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
922 VLC *ac_vlc;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
923 INT16 *quant_matrix;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
924
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
925 /* DC coef */
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
926 val = mjpeg_decode_dc(s, dc_index);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
927 if (val == 0xffff) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
928 dprintf("error dc\n");
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
929 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
930 }
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
931 quant_matrix = s->quant_matrixes[quant_index];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
932 val = val * quant_matrix[0] + s->last_dc[component];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
933 s->last_dc[component] = val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
934 block[0] = val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
935 /* AC coefs */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
936 ac_vlc = &s->vlcs[1][ac_index];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
937 i = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
938 for(;;) {
780
a48bb8bc63dd get_vlc2()
michaelni
parents: 779
diff changeset
939 #if 1
a48bb8bc63dd get_vlc2()
michaelni
parents: 779
diff changeset
940 code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table, 9, 2);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
941 #else
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
942 code = get_vlc(&s->gb, ac_vlc);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
943 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
944 if (code < 0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
945 dprintf("error ac\n");
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
946 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
947 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
948 /* EOB */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
949 if (code == 0)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
950 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
951 if (code == 0xf0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
952 i += 16;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
953 } else {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
954 run = code >> 4;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
955 nbits = code & 0xf;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
956 level = get_bits(&s->gb, nbits);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
957 if ((level & (1 << (nbits - 1))) == 0)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
958 level = (-1 << nbits) | (level + 1);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
959 i += run;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
960 if (i >= 64) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
961 dprintf("error count: %d\n", i);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
962 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
963 }
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
964 j = s->scantable.permutated[i];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
965 block[j] = level * quant_matrix[j];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
966 i++;
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
967 if (i >= 64)
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
968 break;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
969 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
970 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
971 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
972 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
973
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
974 static int mjpeg_decode_sos(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
975 {
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
976 int len, nb_components, i, j, n, h, v, ret;
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
977 int mb_width, mb_height, mb_x, mb_y, vmax, hmax, index, id;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
978 int comp_index[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
979 int dc_index[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
980 int ac_index[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
981 int nb_blocks[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
982 int h_count[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
983 int v_count[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
984
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
985 /* XXX: verify len field validity */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
986 len = get_bits(&s->gb, 16);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
987 nb_components = get_bits(&s->gb, 8);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
988 if (len != 6+2*nb_components)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
989 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
990 dprintf("decode_sos: invalid len (%d)\n", len);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
991 return -1;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
992 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
993 /* XXX: only interleaved scan accepted */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
994 if (nb_components != 3)
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
995 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
996 dprintf("decode_sos: components(%d) mismatch\n", nb_components);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
997 return -1;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
998 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
999 vmax = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1000 hmax = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1001 for(i=0;i<nb_components;i++) {
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1002 id = get_bits(&s->gb, 8) - 1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1003 dprintf("component: %d\n", id);
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1004 /* find component index */
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1005 for(index=0;index<s->nb_components;index++)
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1006 if (id == s->component_id[index])
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1007 break;
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1008 if (index == s->nb_components)
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1009 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1010 dprintf("decode_sos: index(%d) out of components\n", index);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1011 return -1;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1012 }
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1013
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1014 comp_index[i] = index;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1015 nb_blocks[i] = s->h_count[index] * s->v_count[index];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1016 h_count[i] = s->h_count[index];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1017 v_count[i] = s->v_count[index];
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1018
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1019 dc_index[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1020 ac_index[i] = get_bits(&s->gb, 4);
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1021
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1022 if (dc_index[i] < 0 || ac_index[i] < 0 ||
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1023 dc_index[i] >= 4 || ac_index[i] >= 4)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1024 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1025 switch(s->start_code)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1026 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1027 case SOF0:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1028 if (dc_index[i] > 1 || ac_index[i] > 1)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1029 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1030 break;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1031 case SOF1:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1032 case SOF2:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1033 if (dc_index[i] > 3 || ac_index[i] > 3)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1034 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1035 break;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1036 case SOF3:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1037 if (dc_index[i] > 3 || ac_index[i] != 0)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1038 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1039 break;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1040 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1041 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1042 skip_bits(&s->gb, 8); /* Ss */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1043 skip_bits(&s->gb, 8); /* Se */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1044 skip_bits(&s->gb, 8); /* Ah and Al (each are 4 bits) */
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1045
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1046 for(i=0;i<nb_components;i++)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1047 s->last_dc[i] = 1024;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1048
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1049 if (nb_components > 1) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1050 /* interleaved stream */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1051 mb_width = (s->width + s->h_max * 8 - 1) / (s->h_max * 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1052 mb_height = (s->height + s->v_max * 8 - 1) / (s->v_max * 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1053 } else {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1054 h = s->h_max / s->h_count[comp_index[0]];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1055 v = s->v_max / s->v_count[comp_index[0]];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1056 mb_width = (s->width + h * 8 - 1) / (h * 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1057 mb_height = (s->height + v * 8 - 1) / (v * 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1058 nb_blocks[0] = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1059 h_count[0] = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1060 v_count[0] = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1061 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1062
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1063 for(mb_y = 0; mb_y < mb_height; mb_y++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1064 for(mb_x = 0; mb_x < mb_width; mb_x++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1065 for(i=0;i<nb_components;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1066 UINT8 *ptr;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1067 int x, y, c;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1068 n = nb_blocks[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1069 c = comp_index[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1070 h = h_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1071 v = v_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1072 x = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1073 y = 0;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1074 if (s->restart_interval && !s->restart_count)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1075 s->restart_count = s->restart_interval;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1076 for(j=0;j<n;j++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1077 memset(s->block, 0, sizeof(s->block));
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1078 if (decode_block(s, s->block, i,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1079 dc_index[i], ac_index[i],
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1080 s->quant_index[c]) < 0) {
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
1081 dprintf("error y=%d x=%d\n", mb_y, mb_x);
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1082 ret = -1;
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1083 goto the_end;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1084 }
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1085 // dprintf("mb: %d %d processed\n", mb_y, mb_x);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1086 ptr = s->current_picture[c] +
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1087 (s->linesize[c] * (v * mb_y + y) * 8) +
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1088 (h * mb_x + x) * 8;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1089 if (s->interlaced && s->bottom_field)
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1090 ptr += s->linesize[c] >> 1;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
1091 s->idct_put(ptr, s->linesize[c], s->block);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1092 if (++x == h) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1093 x = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1094 y++;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1095 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1096 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1097 }
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1098 /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1099
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1100 if ((s->restart_interval < 1350) && !--s->restart_count) {
584
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1101 align_get_bits(&s->gb);
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1102 skip_bits(&s->gb, 16); /* skip RSTn */
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1103 for (j=0; j<nb_components; j++) /* reset dc */
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1104 s->last_dc[j] = 1024;
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1105 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1106 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1107 }
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1108 ret = 0;
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1109 the_end:
44
92d51f683931 added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents: 37
diff changeset
1110 emms_c();
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1111 return ret;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1112 out_of_range:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1113 dprintf("decode_sos: ac/dc index out of range\n");
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1114 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1115 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1116
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1117 static int mjpeg_decode_dri(MJpegDecodeContext *s)
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1118 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1119 if (get_bits(&s->gb, 16) != 4)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1120 return -1;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1121 s->restart_interval = get_bits(&s->gb, 16);
507
b5b91e89b88c * turned into debug message - it's annoying when watching mjpeg files
kabi
parents: 477
diff changeset
1122 dprintf("restart interval: %d\n", s->restart_interval);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1123
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1124 return 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1125 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1126
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1127 static int mjpeg_decode_app(MJpegDecodeContext *s)
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1128 {
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1129 int len, id;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1130
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1131 /* XXX: verify len field validity */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1132 len = get_bits(&s->gb, 16);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1133 if (len < 5)
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1134 return -1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1135
811
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1136 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1137 id = be2me_32(id);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1138 len -= 6;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1139
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1140 /* buggy AVID, it puts EOI only at every 10th frame */
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1141 /* also this fourcc is used by non-avid files too, it holds some
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1142 informations, but it's always present in AVID creates files */
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1143 if (id == ff_get_fourcc("AVI1"))
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1144 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1145 /* structure:
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1146 4bytes AVI1
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1147 1bytes polarity
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1148 1bytes always zero
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1149 4bytes field_size
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1150 4bytes field_size_less_padding
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1151 */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1152 s->buggy_avid = 1;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1153 // if (s->first_picture)
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1154 // printf("mjpeg: workarounding buggy AVID\n");
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1155 s->interlace_polarity = get_bits(&s->gb, 8);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1156 #if 0
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1157 skip_bits(&s->gb, 8);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1158 skip_bits(&s->gb, 32);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1159 skip_bits(&s->gb, 32);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1160 len -= 10;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1161 #endif
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1162 // if (s->interlace_polarity)
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1163 // printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1164 goto out;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1165 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1166
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1167 // len -= 2;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1168
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1169 if (id == ff_get_fourcc("JFIF"))
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1170 {
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1171 int t_w, t_h;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1172 skip_bits(&s->gb, 8); /* the trailing zero-byte */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1173 printf("mjpeg: JFIF header found (version: %x.%x)\n",
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1174 get_bits(&s->gb, 8), get_bits(&s->gb, 8));
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1175 if (get_bits(&s->gb, 8) == 0)
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1176 {
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1177 s->avctx->aspect_ratio_info = FF_ASPECT_EXTENDED;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1178 s->avctx->aspected_width = get_bits(&s->gb, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1179 s->avctx->aspected_height = get_bits(&s->gb, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1180 }
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1181 else
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1182 {
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1183 skip_bits(&s->gb, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1184 skip_bits(&s->gb, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1185 }
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1186 t_w = get_bits(&s->gb, 8);
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1187 t_h = get_bits(&s->gb, 8);
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1188 if (t_w && t_h)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1189 {
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1190 /* skip thumbnail */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1191 if (len-10-(t_w*t_h*3) > 0)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1192 len -= t_w*t_h*3;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1193 }
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1194 len -= 10;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1195 goto out;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1196 }
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1197
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1198 if (id == ff_get_fourcc("Adob") && (get_bits(&s->gb, 8) == 'e'))
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1199 {
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1200 printf("mjpeg: Adobe header found\n");
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1201 skip_bits(&s->gb, 16); /* version */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1202 skip_bits(&s->gb, 16); /* flags0 */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1203 skip_bits(&s->gb, 16); /* flags1 */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1204 skip_bits(&s->gb, 8); /* transform */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1205 len -= 7;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1206 goto out;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1207 }
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1208
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1209 /* Apple MJPEG-A */
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1210 if ((s->start_code == APP1) && (len > (0x28 - 8)))
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1211 {
811
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1212 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1213 id = be2me_32(id);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1214 len -= 4;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1215 if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1216 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1217 #if 0
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1218 skip_bits(&s->gb, 32); /* field size */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1219 skip_bits(&s->gb, 32); /* pad field size */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1220 skip_bits(&s->gb, 32); /* next off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1221 skip_bits(&s->gb, 32); /* quant off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1222 skip_bits(&s->gb, 32); /* huff off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1223 skip_bits(&s->gb, 32); /* image off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1224 skip_bits(&s->gb, 32); /* scan off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1225 skip_bits(&s->gb, 32); /* data off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1226 #endif
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1227 if (s->first_picture)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1228 printf("mjpeg: Apple MJPEG-A header found\n");
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1229 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1230 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1231
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1232 out:
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1233 /* slow but needed for extreme adobe jpegs */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1234 if (len < 0)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1235 printf("mjpeg: error, decode_app parser read over the end\n");
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1236 while(--len > 0)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1237 skip_bits(&s->gb, 8);
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1238
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1239 return 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1240 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1241
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1242 static int mjpeg_decode_com(MJpegDecodeContext *s)
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1243 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1244 int len, i;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1245 UINT8 *cbuf;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1246
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1247 /* XXX: verify len field validity */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1248 len = get_bits(&s->gb, 16)-2;
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
1249 cbuf = av_malloc(len+1);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1250
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1251 for (i = 0; i < len; i++)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1252 cbuf[i] = get_bits(&s->gb, 8);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1253 if (cbuf[i-1] == '\n')
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1254 cbuf[i-1] = 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1255 else
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1256 cbuf[i] = 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1257
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1258 printf("mjpeg comment: '%s'\n", cbuf);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1259
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1260 /* buggy avid, it puts EOI only at every 10th frame */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1261 if (!strcmp(cbuf, "AVID"))
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1262 {
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1263 s->buggy_avid = 1;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1264 // if (s->first_picture)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1265 // printf("mjpeg: workarounding buggy AVID\n");
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1266 }
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1267
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
1268 av_free(cbuf);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1269
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1270 return 0;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1271 }
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1272
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1273 #if 0
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1274 static int valid_marker_list[] =
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1275 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1276 /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1277 /* 0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1278 /* 1 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1279 /* 2 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1280 /* 3 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1281 /* 4 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1282 /* 5 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1283 /* 6 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1284 /* 7 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1285 /* 8 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1286 /* 9 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1287 /* a */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1288 /* b */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1289 /* c */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1290 /* d */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1291 /* e */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1292 /* f */ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1293 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1294 #endif
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1295
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1296 /* return the 8 bit start code value and update the search
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1297 state. Return -1 if no start code found */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1298 static int find_marker(UINT8 **pbuf_ptr, UINT8 *buf_end)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1299 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1300 UINT8 *buf_ptr;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1301 unsigned int v, v2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1302 int val;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1303 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1304 int skipped=0;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1305 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1306
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1307 buf_ptr = *pbuf_ptr;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1308 while (buf_ptr < buf_end) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1309 v = *buf_ptr++;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1310 v2 = *buf_ptr;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1311 if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe)) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1312 val = *buf_ptr++;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1313 goto found;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1314 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1315 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1316 skipped++;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1317 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1318 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1319 val = -1;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1320 found:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1321 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1322 dprintf("find_marker skipped %d bytes\n", skipped);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1323 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1324 *pbuf_ptr = buf_ptr;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1325 return val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1326 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1327
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1328 static int mjpeg_decode_frame(AVCodecContext *avctx,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1329 void *data, int *data_size,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1330 UINT8 *buf, int buf_size)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1331 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1332 MJpegDecodeContext *s = avctx->priv_data;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1333 UINT8 *buf_end, *buf_ptr;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1334 int i, start_code;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1335 AVPicture *picture = data;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1336
68
99cc25b48e24 fix got_picture output
glantau
parents: 64
diff changeset
1337 *data_size = 0;
99cc25b48e24 fix got_picture output
glantau
parents: 64
diff changeset
1338
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1339 /* no supplementary picture */
68
99cc25b48e24 fix got_picture output
glantau
parents: 64
diff changeset
1340 if (buf_size == 0)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1341 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1342
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1343 buf_ptr = buf;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1344 buf_end = buf + buf_size;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1345 while (buf_ptr < buf_end) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1346 /* find start next marker */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1347 start_code = find_marker(&buf_ptr, buf_end);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1348 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1349 /* EOF */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1350 if (start_code < 0) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1351 goto the_end;
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1352 } else {
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1353 dprintf("marker=%x avail_size_in_buf=%d\n", start_code, buf_end - buf_ptr);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1354
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1355 if ((buf_end - buf_ptr) > s->buffer_size)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1356 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1357 av_free(s->buffer);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1358 s->buffer_size = buf_end-buf_ptr;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1359 s->buffer = av_malloc(s->buffer_size);
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1360 dprintf("buffer too small, expanding to %d bytes\n",
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1361 s->buffer_size);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1362 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1363
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1364 /* unescape buffer of SOS */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1365 if (start_code == SOS)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1366 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1367 UINT8 *src = buf_ptr;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1368 UINT8 *dst = s->buffer;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1369
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1370 while (src<buf_end)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1371 {
779
915524c08334 3rd 10l - don't let it read data beyond the end of frame
arpi_esp
parents: 778
diff changeset
1372 UINT8 x = *(src++);
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1373
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1374 #if 0
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1375 if (x == 0xff && *src == 0xff)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1376 break;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1377 #endif
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1378 *(dst++) = x;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1379 if (x == 0xff)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1380 {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
1381 while(*src == 0xff) src++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
1382
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1383 x = *(src++);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1384 if (x >= 0xd0 && x <= 0xd7)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1385 *(dst++) = x;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1386 else if (x)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1387 break;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1388 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1389 }
779
915524c08334 3rd 10l - don't let it read data beyond the end of frame
arpi_esp
parents: 778
diff changeset
1390 init_get_bits(&s->gb, s->buffer, dst - s->buffer);
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1391
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1392 dprintf("escaping removed %d bytes\n",
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1393 (buf_end - buf_ptr) - (dst - s->buffer));
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1394 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1395 else
777
da879983a88f minor speedup noticed by arpi
al3x
parents: 776
diff changeset
1396 init_get_bits(&s->gb, buf_ptr, buf_end - buf_ptr);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1397
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1398 s->start_code = start_code;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1399
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1400 /* process markers */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1401 if (start_code >= 0xd0 && start_code <= 0xd7) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1402 dprintf("restart marker: %d\n", start_code&0x0f);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1403 } else if (s->first_picture) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1404 /* APP fields */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1405 if (start_code >= 0xe0 && start_code <= 0xef)
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1406 mjpeg_decode_app(s);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1407 /* Comment */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1408 else if (start_code == COM)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1409 mjpeg_decode_com(s);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1410 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1411
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1412 switch(start_code) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1413 case SOI:
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1414 s->restart_interval = 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1415 /* nothing to do on SOI */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1416 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1417 case DQT:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1418 mjpeg_decode_dqt(s);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1419 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1420 case DHT:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1421 mjpeg_decode_dht(s);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1422 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1423 case SOF0:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1424 mjpeg_decode_sof0(s);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1425 break;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1426 case EOI:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1427 eoi_parser:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1428 {
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1429 int l;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1430 if (s->interlaced) {
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1431 s->bottom_field ^= 1;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1432 /* if not bottom field, do not output image yet */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1433 if (s->bottom_field)
540
4cee7ce37e10 don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents: 527
diff changeset
1434 goto not_the_end;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1435 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1436 for(i=0;i<3;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1437 picture->data[i] = s->current_picture[i];
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1438 #if 1
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1439 l = s->linesize[i];
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1440 if (s->interlaced)
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1441 l >>= 1;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1442 picture->linesize[i] = l;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1443 #else
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1444 picture->linesize[i] = (s->interlaced) ?
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1445 s->linesize[i] >> 1 : s->linesize[i];
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1446 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1447 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1448 *data_size = sizeof(AVPicture);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1449 avctx->height = s->height;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1450 if (s->interlaced)
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1451 avctx->height *= 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1452 avctx->width = s->width;
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1453 /* XXX: not complete test ! */
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1454 switch((s->h_count[0] << 4) | s->v_count[0]) {
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1455 case 0x11:
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1456 avctx->pix_fmt = PIX_FMT_YUV444P;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1457 break;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1458 case 0x21:
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1459 avctx->pix_fmt = PIX_FMT_YUV422P;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1460 break;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1461 default:
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1462 case 0x22:
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1463 avctx->pix_fmt = PIX_FMT_YUV420P;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1464 break;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1465 }
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1466 /* dummy quality */
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1467 /* XXX: infer it with matrix */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1468 avctx->quality = 3;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1469 goto the_end;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1470 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1471 break;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1472 case SOS:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1473 mjpeg_decode_sos(s);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1474 /* buggy avid puts EOI every 10-20th frame */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1475 /* if restart period is over process EOI */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1476 if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1477 goto eoi_parser;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1478 break;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1479 case DRI:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1480 mjpeg_decode_dri(s);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1481 break;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1482 case SOF1:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1483 case SOF2:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1484 case SOF3:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1485 case SOF5:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1486 case SOF6:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1487 case SOF7:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1488 case SOF9:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1489 case SOF10:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1490 case SOF11:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1491 case SOF13:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1492 case SOF14:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1493 case SOF15:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1494 case JPG:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1495 printf("mjpeg: unsupported coding type (%x)\n", start_code);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1496 break;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1497 // default:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1498 // printf("mjpeg: unsupported marker (%x)\n", start_code);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1499 // break;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1500 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1501
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1502 not_the_end:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1503 /* eof process start code */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1504 buf_ptr += (get_bits_count(&s->gb)+7)/8;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1505 dprintf("marker parser used %d bytes (%d bits)\n",
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1506 (get_bits_count(&s->gb)+7)/8, get_bits_count(&s->gb));
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1507 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1508 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1509 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1510 the_end:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1511
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1512 dprintf("mjpeg decode frame unused %d bytes\n", buf_end - buf_ptr);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1513 // return buf_end - buf_ptr;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1514 return buf_ptr - buf;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1515 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1516
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1517 static int mjpeg_decode_end(AVCodecContext *avctx)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1518 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1519 MJpegDecodeContext *s = avctx->priv_data;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1520 int i, j;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1521
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1522 av_free(s->buffer);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1523 for(i=0;i<MAX_COMPONENTS;i++)
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
1524 av_free(s->current_picture[i]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1525 for(i=0;i<2;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1526 for(j=0;j<4;j++)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1527 free_vlc(&s->vlcs[i][j]);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1528 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1529 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1530 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1531
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1532 AVCodec mjpeg_decoder = {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1533 "mjpeg",
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1534 CODEC_TYPE_VIDEO,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1535 CODEC_ID_MJPEG,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1536 sizeof(MJpegDecodeContext),
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1537 mjpeg_decode_init,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1538 NULL,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1539 mjpeg_decode_end,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1540 mjpeg_decode_frame,
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1541 0,
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1542 NULL
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1543 };