annotate mjpeg.c @ 4443:54bed3ee58f3 libavcodec

simpify state and make code 2% faster reimar, dont hesitate to flame me for not sending patches and feel free to revert any or all of my changes to lzo.c if you dont like them
author michael
date Wed, 31 Jan 2007 10:34:13 +0000
parents 05e932ddaaa9
children ce643a22f049
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.
2181
3b84b5fea968 new copyrights
alex
parents: 2173
diff changeset
4 * Copyright (c) 2003 Alex Beregszaszi
3b84b5fea968 new copyrights
alex
parents: 2173
diff changeset
5 * Copyright (c) 2003-2004 Michael Niedermayer
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
6 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3929
diff changeset
7 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3929
diff changeset
8 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3929
diff changeset
9 * FFmpeg is free software; you can redistribute it and/or
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
10 * modify it under the terms of the GNU Lesser General Public
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
11 * License as published by the Free Software Foundation; either
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3929
diff changeset
12 * version 2.1 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
13 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3929
diff changeset
14 * FFmpeg is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
17 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
18 *
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
19 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3929
diff changeset
20 * License along with FFmpeg; if not, write to the Free Software
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
21 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
22 *
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
23 * Support for external huffman table, various fixes (AVID workaround),
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
24 * aspecting, new decode_frame mechanism and apple mjpeg-b support
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
25 * by Alex Beregszaszi <alex@naxine.org>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
26 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
27
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
28 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
29 * @file mjpeg.c
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
30 * MJPEG encoder and decoder.
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
31 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
32
776
al3x
parents: 775
diff changeset
33 //#define DEBUG
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
34 #include <assert.h>
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
35
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
37 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
38 #include "mpegvideo.h"
4252
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
39 #include "bytestream.h"
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
40
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
41 /* 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
42 /* not yet working */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
43 #undef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
44
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
45 typedef struct MJpegContext {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
46 uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
47 uint16_t huff_code_dc_luminance[12];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
48 uint8_t huff_size_dc_chrominance[12];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
49 uint16_t huff_code_dc_chrominance[12];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
50
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
51 uint8_t huff_size_ac_luminance[256];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
52 uint16_t huff_code_ac_luminance[256];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
53 uint8_t huff_size_ac_chrominance[256];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
54 uint16_t huff_code_ac_chrominance[256];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
55 } MJpegContext;
986e461dc072 Initial revision
glantau
parents:
diff changeset
56
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
57 /* JPEG marker codes */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
58 typedef enum {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
59 /* start of frame */
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
60 SOF0 = 0xc0, /* baseline */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
61 SOF1 = 0xc1, /* extended sequential, huffman */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
62 SOF2 = 0xc2, /* progressive, huffman */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
63 SOF3 = 0xc3, /* lossless, huffman */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
64
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
65 SOF5 = 0xc5, /* differential sequential, huffman */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
66 SOF6 = 0xc6, /* differential progressive, huffman */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
67 SOF7 = 0xc7, /* differential lossless, huffman */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
68 JPG = 0xc8, /* reserved for JPEG extension */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
69 SOF9 = 0xc9, /* extended sequential, arithmetic */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
70 SOF10 = 0xca, /* progressive, arithmetic */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
71 SOF11 = 0xcb, /* lossless, arithmetic */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
72
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
73 SOF13 = 0xcd, /* differential sequential, arithmetic */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
74 SOF14 = 0xce, /* differential progressive, arithmetic */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
75 SOF15 = 0xcf, /* differential lossless, arithmetic */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
76
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
77 DHT = 0xc4, /* define huffman tables */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
78
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
79 DAC = 0xcc, /* define arithmetic-coding conditioning */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
80
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
81 /* 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
82 RST0 = 0xd0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
83 RST1 = 0xd1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
84 RST2 = 0xd2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
85 RST3 = 0xd3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
86 RST4 = 0xd4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
87 RST5 = 0xd5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
88 RST6 = 0xd6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
89 RST7 = 0xd7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
90
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
91 SOI = 0xd8, /* start of image */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
92 EOI = 0xd9, /* end of image */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
93 SOS = 0xda, /* start of scan */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
94 DQT = 0xdb, /* define quantization tables */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
95 DNL = 0xdc, /* define number of lines */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
96 DRI = 0xdd, /* define restart interval */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
97 DHP = 0xde, /* define hierarchical progression */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
98 EXP = 0xdf, /* expand reference components */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
99
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
100 APP0 = 0xe0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
101 APP1 = 0xe1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
102 APP2 = 0xe2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
103 APP3 = 0xe3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
104 APP4 = 0xe4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
105 APP5 = 0xe5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
106 APP6 = 0xe6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
107 APP7 = 0xe7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
108 APP8 = 0xe8,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
109 APP9 = 0xe9,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
110 APP10 = 0xea,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
111 APP11 = 0xeb,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
112 APP12 = 0xec,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
113 APP13 = 0xed,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
114 APP14 = 0xee,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
115 APP15 = 0xef,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
116
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
117 JPG0 = 0xf0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
118 JPG1 = 0xf1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
119 JPG2 = 0xf2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
120 JPG3 = 0xf3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
121 JPG4 = 0xf4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
122 JPG5 = 0xf5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
123 JPG6 = 0xf6,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
124 SOF48 = 0xf7, ///< JPEG-LS
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
125 LSE = 0xf8, ///< JPEG-LS extension parameters
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
126 JPG9 = 0xf9,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
127 JPG10 = 0xfa,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
128 JPG11 = 0xfb,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
129 JPG12 = 0xfc,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
130 JPG13 = 0xfd,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
131
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
132 COM = 0xfe, /* comment */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
133
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
134 TEM = 0x01, /* temporary private use for arithmetic coding */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
135
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
136 /* 0x02 -> 0xbf reserved */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
137 } JPEG_MARKER;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
138
986e461dc072 Initial revision
glantau
parents:
diff changeset
139 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 /* These are the sample quantization tables given in JPEG spec section K.1.
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 * The spec says that the values given produce "good" quality, and
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 * when divided by 2, "very good" quality.
986e461dc072 Initial revision
glantau
parents:
diff changeset
143 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 static const unsigned char std_luminance_quant_tbl[64] = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 16, 11, 10, 16, 24, 40, 51, 61,
986e461dc072 Initial revision
glantau
parents:
diff changeset
146 12, 12, 14, 19, 26, 58, 60, 55,
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 14, 13, 16, 24, 40, 57, 69, 56,
986e461dc072 Initial revision
glantau
parents:
diff changeset
148 14, 17, 22, 29, 51, 87, 80, 62,
986e461dc072 Initial revision
glantau
parents:
diff changeset
149 18, 22, 37, 56, 68, 109, 103, 77,
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 24, 35, 55, 64, 81, 104, 113, 92,
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 49, 64, 78, 87, 103, 121, 120, 101,
986e461dc072 Initial revision
glantau
parents:
diff changeset
152 72, 92, 95, 98, 112, 100, 103, 99
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 static const unsigned char std_chrominance_quant_tbl[64] = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
155 17, 18, 24, 47, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 18, 21, 26, 66, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 24, 26, 56, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
158 47, 66, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
160 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 99, 99, 99, 99, 99, 99, 99, 99
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
165
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
167 /* IMPORTANT: these are only valid for 8-bit data precision! */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
168 static const uint8_t bits_dc_luminance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
170 static const uint8_t val_dc_luminance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
172
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
173 static const uint8_t bits_dc_chrominance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
175 static const uint8_t val_dc_chrominance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
176 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
177
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
178 static const uint8_t bits_ac_luminance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
180 static const uint8_t val_ac_luminance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
986e461dc072 Initial revision
glantau
parents:
diff changeset
185 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
986e461dc072 Initial revision
glantau
parents:
diff changeset
186 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
986e461dc072 Initial revision
glantau
parents:
diff changeset
187 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
986e461dc072 Initial revision
glantau
parents:
diff changeset
188 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
986e461dc072 Initial revision
glantau
parents:
diff changeset
190 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
986e461dc072 Initial revision
glantau
parents:
diff changeset
193 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
201 0xf9, 0xfa
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
202 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
203
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
204 static const uint8_t bits_ac_chrominance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 { /* 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
206
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
207 static const uint8_t val_ac_chrominance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
986e461dc072 Initial revision
glantau
parents:
diff changeset
215 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
986e461dc072 Initial revision
glantau
parents:
diff changeset
216 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
986e461dc072 Initial revision
glantau
parents:
diff changeset
217 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
986e461dc072 Initial revision
glantau
parents:
diff changeset
220 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
986e461dc072 Initial revision
glantau
parents:
diff changeset
224 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
225 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
986e461dc072 Initial revision
glantau
parents:
diff changeset
227 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
228 0xf9, 0xfa
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
230
986e461dc072 Initial revision
glantau
parents:
diff changeset
231 /* isn't this function nicer than the one in the libjpeg ? */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
232 static void build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
233 const uint8_t *bits_table, const uint8_t *val_table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 int i, j, k,nb, code, sym;
986e461dc072 Initial revision
glantau
parents:
diff changeset
236
986e461dc072 Initial revision
glantau
parents:
diff changeset
237 code = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 k = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 for(i=1;i<=16;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 nb = bits_table[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 for(j=0;j<nb;j++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 sym = val_table[k++];
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 huff_size[sym] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
244 huff_code[sym] = code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
245 code++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 code <<= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
249 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
250
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1522
diff changeset
251 #ifdef CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 int mjpeg_init(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
254 MJpegContext *m;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
255
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
256 m = av_malloc(sizeof(MJpegContext));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 if (!m)
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
259
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
260 s->min_qcoeff=-1023;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
261 s->max_qcoeff= 1023;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
262
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 /* build all the huffman tables */
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 build_huffman_codes(m->huff_size_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 m->huff_code_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
266 bits_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
267 val_dc_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 build_huffman_codes(m->huff_size_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
269 m->huff_code_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
270 bits_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
271 val_dc_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 build_huffman_codes(m->huff_size_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 m->huff_code_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
274 bits_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
275 val_ac_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
276 build_huffman_codes(m->huff_size_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 m->huff_code_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
278 bits_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 val_ac_chrominance);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
280
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 s->mjpeg_ctx = m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
282 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
284
986e461dc072 Initial revision
glantau
parents:
diff changeset
285 void mjpeg_close(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
286 {
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
287 av_free(s->mjpeg_ctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
288 }
1530
3b31998fe22f disable encoders where appropriate (patch courtesy of BERO
melanson
parents: 1522
diff changeset
289 #endif //CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
290
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
291 #define PREDICT(ret, topleft, top, left, predictor)\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
292 switch(predictor){\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
293 case 1: ret= left; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
294 case 2: ret= top; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
295 case 3: ret= topleft; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
296 case 4: ret= left + top - topleft; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
297 case 5: ret= left + ((top - topleft)>>1); break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
298 case 6: ret= top + ((left - topleft)>>1); break;\
1455
c4539ef4d8cb removed warnings
bellard
parents: 1363
diff changeset
299 default:\
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
300 case 7: ret= (left + top)>>1; break;\
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
301 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
302
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1322
diff changeset
303 #ifdef CONFIG_ENCODERS
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
304 static inline void put_marker(PutBitContext *p, int code)
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 put_bits(p, 8, 0xff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 put_bits(p, 8, code);
986e461dc072 Initial revision
glantau
parents:
diff changeset
308 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
309
986e461dc072 Initial revision
glantau
parents:
diff changeset
310 /* table_class: 0 = DC coef, 1 = AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
311 static int put_huffman_table(MpegEncContext *s, int table_class, int table_id,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
312 const uint8_t *bits_table, const uint8_t *value_table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
313 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 PutBitContext *p = &s->pb;
986e461dc072 Initial revision
glantau
parents:
diff changeset
315 int n, i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
316
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 put_bits(p, 4, table_class);
986e461dc072 Initial revision
glantau
parents:
diff changeset
318 put_bits(p, 4, table_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
319
986e461dc072 Initial revision
glantau
parents:
diff changeset
320 n = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
321 for(i=1;i<=16;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
322 n += bits_table[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
323 put_bits(p, 8, bits_table[i]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
324 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
325
986e461dc072 Initial revision
glantau
parents:
diff changeset
326 for(i=0;i<n;i++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
327 put_bits(p, 8, value_table[i]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
328
986e461dc072 Initial revision
glantau
parents:
diff changeset
329 return n + 17;
986e461dc072 Initial revision
glantau
parents:
diff changeset
330 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
331
986e461dc072 Initial revision
glantau
parents:
diff changeset
332 static void jpeg_table_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
333 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 PutBitContext *p = &s->pb;
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
335 int i, j, size;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
336 uint8_t *ptr;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
337
986e461dc072 Initial revision
glantau
parents:
diff changeset
338 /* quant matrixes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
339 put_marker(p, DQT);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
340 #ifdef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
341 put_bits(p, 16, 2 + 2 * (1 + 64));
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
342 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 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
344 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
345 put_bits(p, 4, 0); /* 8 bit precision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
346 put_bits(p, 4, 0); /* table 0 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
347 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
348 j = s->intra_scantable.permutated[i];
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
349 put_bits(p, 8, s->intra_matrix[j]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
350 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
351 #ifdef TWOMATRIXES
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
352 put_bits(p, 4, 0); /* 8 bit precision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
353 put_bits(p, 4, 1); /* table 1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
354 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
355 j = s->intra_scantable.permutated[i];
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
356 put_bits(p, 8, s->chroma_intra_matrix[j]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
359
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 /* huffman table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 put_marker(p, DHT);
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 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
363 ptr = pbBufPtr(p);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 put_bits(p, 16, 0); /* patched later */
986e461dc072 Initial revision
glantau
parents:
diff changeset
365 size = 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
366 size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
367 size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
368
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
369 size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
370 size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
371 ptr[0] = size >> 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
372 ptr[1] = size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
373 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
374
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
375 static void jpeg_put_comments(MpegEncContext *s)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
376 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
377 PutBitContext *p = &s->pb;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
378 int size;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
379 uint8_t *ptr;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
380
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
381 if (s->aspect_ratio_info /* && !lossless */)
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
382 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
383 /* JFIF header */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
384 put_marker(p, APP0);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
385 put_bits(p, 16, 16);
2885
5dfb90019814 Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
diego
parents: 2846
diff changeset
386 ff_put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
387 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
388 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
1548
dd544554ed42 AVRational
michael
parents: 1530
diff changeset
389 put_bits(p, 16, s->avctx->sample_aspect_ratio.num);
dd544554ed42 AVRational
michael
parents: 1530
diff changeset
390 put_bits(p, 16, s->avctx->sample_aspect_ratio.den);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
391 put_bits(p, 8, 0); /* thumbnail width */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
392 put_bits(p, 8, 0); /* thumbnail height */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
393 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
394
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
395 /* comment */
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1064
diff changeset
396 if(!(s->flags & CODEC_FLAG_BITEXACT)){
676
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
397 put_marker(p, COM);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
398 flush_put_bits(p);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
399 ptr = pbBufPtr(p);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
400 put_bits(p, 16, 0); /* patched later */
2885
5dfb90019814 Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
diego
parents: 2846
diff changeset
401 ff_put_string(p, LIBAVCODEC_IDENT, 1);
1118
8248e652d64e simplified
al3x
parents: 1106
diff changeset
402 size = strlen(LIBAVCODEC_IDENT)+3;
676
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
403 ptr[0] = size >> 8;
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
404 ptr[1] = size;
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
405 }
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
406
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
407 if( s->avctx->pix_fmt == PIX_FMT_YUV420P
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
408 ||s->avctx->pix_fmt == PIX_FMT_YUV422P
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
409 ||s->avctx->pix_fmt == PIX_FMT_YUV444P){
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
410 put_marker(p, COM);
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
411 flush_put_bits(p);
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
412 ptr = pbBufPtr(p);
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
413 put_bits(p, 16, 0); /* patched later */
2885
5dfb90019814 Rename put_string to ff_put_string to avoid a symbol clash on Mac OS X.
diego
parents: 2846
diff changeset
414 ff_put_string(p, "CS=ITU601", 1);
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
415 size = strlen("CS=ITU601")+3;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
416 ptr[0] = size >> 8;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
417 ptr[1] = size;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
418 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
419 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
420
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
421 void mjpeg_picture_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
422 {
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
423 const int lossless= s->avctx->codec_id != CODEC_ID_MJPEG;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
424 const int ls = s->avctx->codec_id == CODEC_ID_JPEGLS;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
425
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
426 assert(!(ls && s->mjpeg_write_tables));
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
427
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
428 put_marker(&s->pb, SOI);
986e461dc072 Initial revision
glantau
parents:
diff changeset
429
370
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
430 if (!s->mjpeg_data_only_frames)
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
431 {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
432 jpeg_put_comments(s);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
433
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
434 if (s->mjpeg_write_tables) jpeg_table_header(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
435
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
436 switch(s->avctx->codec_id){
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
437 case CODEC_ID_MJPEG: put_marker(&s->pb, SOF0 ); break;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
438 case CODEC_ID_LJPEG: put_marker(&s->pb, SOF3 ); break;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
439 case CODEC_ID_JPEGLS: put_marker(&s->pb, SOF48); break;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
440 default: assert(0);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
441 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
442
986e461dc072 Initial revision
glantau
parents:
diff changeset
443 put_bits(&s->pb, 16, 17);
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
444 if(lossless && s->avctx->pix_fmt == PIX_FMT_RGBA32)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
445 put_bits(&s->pb, 8, 9); /* 9 bits/component RCT */
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
446 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
447 put_bits(&s->pb, 8, 8); /* 8 bits/component */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
448 put_bits(&s->pb, 16, s->height);
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 put_bits(&s->pb, 16, s->width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
450 put_bits(&s->pb, 8, 3); /* 3 components */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
451
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
452 /* Y component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
453 put_bits(&s->pb, 8, 1); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
454 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
455 put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
456 put_bits(&s->pb, 8, 0); /* select matrix */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
457
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
458 /* Cb component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
459 put_bits(&s->pb, 8, 2); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
460 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
461 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
462 #ifdef TWOMATRIXES
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
463 put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
464 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
465 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
466 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
467
986e461dc072 Initial revision
glantau
parents:
diff changeset
468 /* Cr component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
469 put_bits(&s->pb, 8, 3); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
470 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
471 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
472 #ifdef TWOMATRIXES
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
473 put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
474 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
475 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
476 #endif
370
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
477 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
478
986e461dc072 Initial revision
glantau
parents:
diff changeset
479 /* scan header */
986e461dc072 Initial revision
glantau
parents:
diff changeset
480 put_marker(&s->pb, SOS);
986e461dc072 Initial revision
glantau
parents:
diff changeset
481 put_bits(&s->pb, 16, 12); /* length */
986e461dc072 Initial revision
glantau
parents:
diff changeset
482 put_bits(&s->pb, 8, 3); /* 3 components */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
483
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
484 /* Y component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
485 put_bits(&s->pb, 8, 1); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
486 put_bits(&s->pb, 4, 0); /* DC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
487 put_bits(&s->pb, 4, 0); /* AC huffman table index */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
488
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
489 /* Cb component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
490 put_bits(&s->pb, 8, 2); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
491 put_bits(&s->pb, 4, 1); /* DC huffman table index */
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
492 put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
493
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
494 /* Cr component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
495 put_bits(&s->pb, 8, 3); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
496 put_bits(&s->pb, 4, 1); /* DC huffman table index */
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
497 put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
498
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
499 put_bits(&s->pb, 8, (lossless && !ls) ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
500
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
501 switch(s->avctx->codec_id){
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
502 case CODEC_ID_MJPEG: put_bits(&s->pb, 8, 63); break; /* Se (not used) */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
503 case CODEC_ID_LJPEG: put_bits(&s->pb, 8, 0); break; /* not used */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
504 case CODEC_ID_JPEGLS: put_bits(&s->pb, 8, 1); break; /* ILV = line interleaved */
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
505 default: assert(0);
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
506 }
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
507
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
508 put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
509
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
510 //FIXME DC/AC entropy table selectors stuff in jpegls
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
511 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
512
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
513 static void escape_FF(MpegEncContext *s, int start)
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
514 {
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
515 int size= put_bits_count(&s->pb) - start*8;
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
516 int i, ff_count;
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
517 uint8_t *buf= s->pb.buf + start;
1266
ec946cb74397 Warning fixes.
mellum
parents: 1150
diff changeset
518 int align= (-(size_t)(buf))&3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
519
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
520 assert((size&7) == 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
521 size >>= 3;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
522
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
523 ff_count=0;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
524 for(i=0; i<size && i<align; i++){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
525 if(buf[i]==0xFF) ff_count++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
526 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
527 for(; i<size-15; i+=16){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
528 int acc, v;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
529
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
530 v= *(uint32_t*)(&buf[i]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
531 acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
532 v= *(uint32_t*)(&buf[i+4]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
533 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
534 v= *(uint32_t*)(&buf[i+8]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
535 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
536 v= *(uint32_t*)(&buf[i+12]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
537 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
538
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
539 acc>>=4;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
540 acc+= (acc>>16);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
541 acc+= (acc>>8);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
542 ff_count+= acc&0xFF;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
543 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
544 for(; i<size; i++){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
545 if(buf[i]==0xFF) ff_count++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
546 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
547
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
548 if(ff_count==0) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
549
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
550 /* skip put bits */
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
551 for(i=0; i<ff_count-3; i+=4)
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
552 put_bits(&s->pb, 32, 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
553 put_bits(&s->pb, (ff_count-i)*8, 0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
554 flush_put_bits(&s->pb);
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
555
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
556 for(i=size-1; ff_count; i--){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
557 int v= buf[i];
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
558
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
559 if(v==0xFF){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
560 //printf("%d %d\n", i, ff_count);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
561 buf[i+ff_count]= 0;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
562 ff_count--;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
563 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
564
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
565 buf[i+ff_count]= v;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
566 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
567 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
568
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
569 void ff_mjpeg_stuffing(PutBitContext * pbc)
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
570 {
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
571 int length;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
572 length= (-put_bits_count(pbc))&7;
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
573 if(length) put_bits(pbc, length, (1<<length)-1);
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
574 }
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
575
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
576 void mjpeg_picture_trailer(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
577 {
1799
95612d423fde multithreaded/SMP motion estimation
michael
parents: 1795
diff changeset
578 ff_mjpeg_stuffing(&s->pb);
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
579 flush_put_bits(&s->pb);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
580
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
581 assert((s->header_bits&7)==0);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
582
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
583 escape_FF(s, s->header_bits>>3);
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
584
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
585 put_marker(&s->pb, EOI);
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
587
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
588 static inline void mjpeg_encode_dc(MpegEncContext *s, int val,
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
589 uint8_t *huff_size, uint16_t *huff_code)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
590 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
591 int mant, nbits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
592
986e461dc072 Initial revision
glantau
parents:
diff changeset
593 if (val == 0) {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
594 put_bits(&s->pb, huff_size[0], huff_code[0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
595 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
596 mant = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
597 if (val < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
598 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
599 mant--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
600 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
601
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1322
diff changeset
602 nbits= av_log2_16bit(val) + 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
603
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
604 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
605
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
606 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
607 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
608 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
609
986e461dc072 Initial revision
glantau
parents:
diff changeset
610 static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
611 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
612 int mant, nbits, code, i, j;
986e461dc072 Initial revision
glantau
parents:
diff changeset
613 int component, dc, run, last_index, val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
614 MJpegContext *m = s->mjpeg_ctx;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
615 uint8_t *huff_size_ac;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
616 uint16_t *huff_code_ac;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
617
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
618 /* DC coef */
3929
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
619 component = (n <= 3 ? 0 : (n&1) + 1);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
620 dc = block[0]; /* overflow is impossible */
986e461dc072 Initial revision
glantau
parents:
diff changeset
621 val = dc - s->last_dc[component];
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 if (n < 4) {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
623 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
624 huff_size_ac = m->huff_size_ac_luminance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
625 huff_code_ac = m->huff_code_ac_luminance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
626 } else {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
627 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
628 huff_size_ac = m->huff_size_ac_chrominance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
629 huff_code_ac = m->huff_code_ac_chrominance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
630 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
631 s->last_dc[component] = dc;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
632
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
633 /* AC coefs */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
634
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
635 run = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 last_index = s->block_last_index[n];
986e461dc072 Initial revision
glantau
parents:
diff changeset
637 for(i=1;i<=last_index;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
638 j = s->intra_scantable.permutated[i];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
639 val = block[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
640 if (val == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
641 run++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
642 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
643 while (run >= 16) {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
644 put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
645 run -= 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
646 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
647 mant = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
648 if (val < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
649 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
650 mant--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
651 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
652
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
653 nbits= av_log2(val) + 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
654 code = (run << 4) | nbits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
655
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
656 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
657
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
658 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
659 run = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
660 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
661 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
662
986e461dc072 Initial revision
glantau
parents:
diff changeset
663 /* output EOB only if not already 64 values */
986e461dc072 Initial revision
glantau
parents:
diff changeset
664 if (last_index < 63 || run != 0)
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
665 put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
666 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
667
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
668 void mjpeg_encode_mb(MpegEncContext *s,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
669 DCTELEM block[6][64])
986e461dc072 Initial revision
glantau
parents:
diff changeset
670 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
671 int i;
3929
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
672 for(i=0;i<5;i++) {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
673 encode_block(s, block[i], i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
674 }
3929
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
675 if (s->chroma_format == CHROMA_420) {
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
676 encode_block(s, block[5], 5);
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
677 } else {
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
678 encode_block(s, block[6], 6);
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
679 encode_block(s, block[5], 5);
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
680 encode_block(s, block[7], 7);
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
681 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
682 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
683
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
684 static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
685 MpegEncContext * const s = avctx->priv_data;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
686 MJpegContext * const m = s->mjpeg_ctx;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
687 AVFrame *pict = data;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
688 const int width= s->width;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
689 const int height= s->height;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
690 AVFrame * const p= (AVFrame*)&s->current_picture;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
691 const int predictor= avctx->prediction_method+1;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
692
1522
79dddc5cd990 removed the obsolete and unused parameters of init_put_bits
alex
parents: 1519
diff changeset
693 init_put_bits(&s->pb, buf, buf_size);
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
694
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
695 *p = *pict;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
696 p->pict_type= FF_I_TYPE;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
697 p->key_frame= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
698
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
699 mjpeg_picture_header(s);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
700
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
701 s->header_bits= put_bits_count(&s->pb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
702
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
703 if(avctx->pix_fmt == PIX_FMT_RGBA32){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
704 int x, y, i;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
705 const int linesize= p->linesize[0];
2522
e25782262d7d kill warnings patch by (M?ns Rullg?rd <mru inprovide com>)
michael
parents: 2453
diff changeset
706 uint16_t (*buffer)[4]= (void *) s->rd_scratchpad;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
707 int left[3], top[3], topleft[3];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
708
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
709 for(i=0; i<3; i++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
710 buffer[0][i]= 1 << (9 - 1);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
711 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
712
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
713 for(y = 0; y < height; y++) {
1363
michaelni
parents: 1359
diff changeset
714 const int modified_predictor= y ? predictor : 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
715 uint8_t *ptr = p->data[0] + (linesize * y);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
716
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
717 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < width*3*4){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
718 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
719 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
720 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
721
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
722 for(i=0; i<3; i++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
723 top[i]= left[i]= topleft[i]= buffer[0][i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
724 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
725 for(x = 0; x < width; x++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
726 buffer[x][1] = ptr[4*x+0] - ptr[4*x+1] + 0x100;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
727 buffer[x][2] = ptr[4*x+2] - ptr[4*x+1] + 0x100;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
728 buffer[x][0] = (ptr[4*x+0] + 2*ptr[4*x+1] + ptr[4*x+2])>>2;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
729
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
730 for(i=0;i<3;i++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
731 int pred, diff;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
732
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
733 PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
734
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
735 topleft[i]= top[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
736 top[i]= buffer[x+1][i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
737
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
738 left[i]= buffer[x][i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
739
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
740 diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
741
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
742 if(i==0)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
743 mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
744 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
745 mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
746 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
747 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
748 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
749 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
750 int mb_x, mb_y, i;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
751 const int mb_width = (width + s->mjpeg_hsample[0] - 1) / s->mjpeg_hsample[0];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
752 const int mb_height = (height + s->mjpeg_vsample[0] - 1) / s->mjpeg_vsample[0];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
753
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
754 for(mb_y = 0; mb_y < mb_height; mb_y++) {
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
755 if(s->pb.buf_end - s->pb.buf - (put_bits_count(&s->pb)>>3) < mb_width * 4 * 3 * s->mjpeg_hsample[0] * s->mjpeg_vsample[0]){
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
756 av_log(s->avctx, AV_LOG_ERROR, "encoded frame too large\n");
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
757 return -1;
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
758 }
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
759 for(mb_x = 0; mb_x < mb_width; mb_x++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
760 if(mb_x==0 || mb_y==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
761 for(i=0;i<3;i++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
762 uint8_t *ptr;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
763 int x, y, h, v, linesize;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
764 h = s->mjpeg_hsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
765 v = s->mjpeg_vsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
766 linesize= p->linesize[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
767
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
768 for(y=0; y<v; y++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
769 for(x=0; x<h; x++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
770 int pred;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
771
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
772 ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
773 if(y==0 && mb_y==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
774 if(x==0 && mb_x==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
775 pred= 128;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
776 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
777 pred= ptr[-1];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
778 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
779 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
780 if(x==0 && mb_x==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
781 pred= ptr[-linesize];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
782 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
783 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
784 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
785 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
786
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
787 if(i==0)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
788 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
789 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
790 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
791 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
792 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
793 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
794 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
795 for(i=0;i<3;i++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
796 uint8_t *ptr;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
797 int x, y, h, v, linesize;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
798 h = s->mjpeg_hsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
799 v = s->mjpeg_vsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
800 linesize= p->linesize[i];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
801
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
802 for(y=0; y<v; y++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
803 for(x=0; x<h; x++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
804 int pred;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
805
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
806 ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
807 //printf("%d %d %d %d %8X\n", mb_x, mb_y, x, y, ptr);
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
808 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
809
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
810 if(i==0)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
811 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
812 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
813 mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
814 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
815 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
816 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
817 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
818 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
819 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
820 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
821
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
822 emms_c();
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
823
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
824 mjpeg_picture_trailer(s);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
825 s->picture_number++;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
826
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
827 flush_put_bits(&s->pb);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
828 return pbBufPtr(&s->pb) - s->pb.buf;
1786
b7340afa261a get_bit_count -> put_bits_count
alex
parents: 1754
diff changeset
829 // return (put_bits_count(&f->pb)+7)/8;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
830 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
831
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1322
diff changeset
832 #endif //CONFIG_ENCODERS
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
833
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
834 /******************************************/
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
835 /* decoding */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
836
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
837 #define MAX_COMPONENTS 4
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
838
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
839 typedef struct MJpegDecodeContext {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
840 AVCodecContext *avctx;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
841 GetBitContext gb;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
842 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
843
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
844 int start_code; /* current start code */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
845 int buffer_size;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
846 uint8_t *buffer;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
847
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
848 int16_t quant_matrixes[4][64];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
849 VLC vlcs[2][4];
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
850 int qscale[4]; ///< quantizer scale calculated from quant_matrixes
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
851
1679
55c03fa692a9 set AVCodecContext.width/height before get_buffer()
michael
parents: 1619
diff changeset
852 int org_height; /* size given at codec init */
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
853 int first_picture; /* true if decoding first picture */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
854 int interlaced; /* true if interlaced */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
855 int bottom_field; /* true if bottom field */
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
856 int lossless;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
857 int ls;
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
858 int progressive;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
859 int rgb;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
860 int rct; /* standard rct */
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
861 int pegasus_rct; /* pegasus reversible colorspace transform */
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
862 int bits; /* bits per component */
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
863
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
864 int maxval;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
865 int near; ///< near lossless bound (si 0 for lossless)
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
866 int t1,t2,t3;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
867 int reset; ///< context halfing intervall ?rename
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
868
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
869 int width, height;
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
870 int mb_width, mb_height;
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
871 int nb_components;
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
872 int component_id[MAX_COMPONENTS];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
873 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
874 int v_count[MAX_COMPONENTS];
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
875 int comp_index[MAX_COMPONENTS];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
876 int dc_index[MAX_COMPONENTS];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
877 int ac_index[MAX_COMPONENTS];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
878 int nb_blocks[MAX_COMPONENTS];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
879 int h_scount[MAX_COMPONENTS];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
880 int v_scount[MAX_COMPONENTS];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
881 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
882 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
883 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
884 AVFrame picture; /* picture structure */
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
885 int linesize[MAX_COMPONENTS]; ///< linesize << interlaced
2367
c353719836af fix some type mismatches patch by (Jeff Muizelaar <muizelaar rogers com>)
michael
parents: 2360
diff changeset
886 int8_t *qscale_table;
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3078
diff changeset
887 DECLARE_ALIGNED_8(DCTELEM, block[64]);
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
888 ScanTable scantable;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
889 void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
890 void (*idct_add)(uint8_t *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
891
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
892 int restart_interval;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
893 int restart_count;
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
894
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
895 int buggy_avid;
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
896 int cs_itu601;
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
897 int interlace_polarity;
2333
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
898
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
899 int mjpb_skiptosod;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
900
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
901 int cur_scan; /* current scan, used by JPEG-LS */
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
902 } MJpegDecodeContext;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
903
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
904 #include "jpeg_ls.c" //FIXME make jpeg-ls more independant
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
905
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
906 static int mjpeg_decode_dht(MJpegDecodeContext *s);
375
749b5c16c0f7 - Warning fix.
pulento
parents: 370
diff changeset
907
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
908 static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table,
3227
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
909 int nb_codes, int use_static, int is_ac)
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
910 {
3227
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
911 uint8_t huff_size[256+16];
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
912 uint16_t huff_code[256+16];
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
913
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
914 assert(nb_codes <= 256);
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
915
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
916 memset(huff_size, 0, sizeof(huff_size));
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
917 build_huffman_codes(huff_size, huff_code, bits_table, val_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
918
3227
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
919 if(is_ac){
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
920 memmove(huff_size+16, huff_size, sizeof(uint8_t)*nb_codes);
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
921 memmove(huff_code+16, huff_code, sizeof(uint16_t)*nb_codes);
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
922 memset(huff_size, 0, sizeof(uint8_t)*16);
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
923 memset(huff_code, 0, sizeof(uint16_t)*16);
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
924 nb_codes += 16;
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
925 }
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
926
2370
26560d4fdb1f Memory leak fix patch by (Burkhard Plaum <plaum >at< ipf.uni-stuttgart )dot( de>)
michael
parents: 2367
diff changeset
927 return init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2, use_static);
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
928 }
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
929
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
930 static int mjpeg_decode_init(AVCodecContext *avctx)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
931 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
932 MJpegDecodeContext *s = avctx->priv_data;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
933 MpegEncContext s2;
2802
4db6127e20b8 reset restart_count when restart_interval is set and fill the
reimar
parents: 2799
diff changeset
934 memset(s, 0, sizeof(MJpegDecodeContext));
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
935
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
936 s->avctx = avctx;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
937
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1064
diff changeset
938 /* ugly way to get the idct & scantable FIXME */
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
939 memset(&s2, 0, sizeof(MpegEncContext));
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
940 s2.avctx= avctx;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
941 // s2->out_format = FMT_MJPEG;
1892
5ac49e7a1b8f init cleanup
michael
parents: 1799
diff changeset
942 dsputil_init(&s2.dsp, avctx);
5ac49e7a1b8f init cleanup
michael
parents: 1799
diff changeset
943 DCT_common_init(&s2);
5ac49e7a1b8f init cleanup
michael
parents: 1799
diff changeset
944
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
945 s->scantable= s2.intra_scantable;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1064
diff changeset
946 s->idct_put= s2.dsp.idct_put;
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
947 s->idct_add= s2.dsp.idct_add;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
948
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
949 s->mpeg_enc_ctx_allocated = 0;
2799
924c7e66ced8 dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
michael
parents: 2798
diff changeset
950 s->buffer_size = 0;
924c7e66ced8 dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
michael
parents: 2798
diff changeset
951 s->buffer = NULL;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
952 s->start_code = -1;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
953 s->first_picture = 1;
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2267
diff changeset
954 s->org_height = avctx->coded_height;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
955
3227
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
956 build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12, 0, 0);
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
957 build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12, 0, 0);
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
958 build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251, 0, 1);
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
959 build_vlc(&s->vlcs[1][1], bits_ac_chrominance, val_ac_chrominance, 251, 0, 1);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
960
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
961 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
962 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
963 av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
964 init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
965 mjpeg_decode_dht(s);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
966 /* should check for error - but dunno */
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
967 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
968
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
969 return 0;
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
2319
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
972
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
973 /**
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
974 * finds the end of the current frame in the bitstream.
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
975 * @return the position of the first byte of the next frame, or -1
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
976 */
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
977 static int find_frame_end(ParseContext *pc, const uint8_t *buf, int buf_size){
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
978 int vop_found, i;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
979 uint16_t state;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
980
2319
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
981 vop_found= pc->frame_start_found;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
982 state= pc->state;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
983
2319
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
984 i=0;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
985 if(!vop_found){
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
986 for(i=0; i<buf_size; i++){
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
987 state= (state<<8) | buf[i];
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
988 if(state == 0xFFD8){
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
989 i++;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
990 vop_found=1;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
991 break;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
992 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
993 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
994 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
995
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
996 if(vop_found){
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
997 /* EOF considered as end of frame */
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
998 if (buf_size == 0)
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
999 return 0;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1000 for(; i<buf_size; i++){
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1001 state= (state<<8) | buf[i];
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1002 if(state == 0xFFD8){
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1003 pc->frame_start_found=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1004 pc->state=0;
2319
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1005 return i-1;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1006 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1007 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1008 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1009 pc->frame_start_found= vop_found;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1010 pc->state= state;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1011 return END_NOT_FOUND;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1012 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1013
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1014 static int jpeg_parse(AVCodecParserContext *s,
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1015 AVCodecContext *avctx,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1016 uint8_t **poutbuf, int *poutbuf_size,
2319
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1017 const uint8_t *buf, int buf_size)
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1018 {
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1019 ParseContext *pc = s->priv_data;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1020 int next;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1021
2319
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1022 next= find_frame_end(pc, buf, buf_size);
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1023
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1024 if (ff_combine_frame(pc, next, (uint8_t **)&buf, &buf_size) < 0) {
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1025 *poutbuf = NULL;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1026 *poutbuf_size = 0;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1027 return buf_size;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1028 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1029
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1030 *poutbuf = (uint8_t *)buf;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1031 *poutbuf_size = buf_size;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1032 return next;
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1033 }
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
1034
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1035 /* quantize tables */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1036 static int mjpeg_decode_dqt(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1037 {
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
1038 int len, index, i, j;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1039
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1040 len = get_bits(&s->gb, 16) - 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1041
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1042 while (len >= 65) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1043 /* only 8 bit precision handled */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1044 if (get_bits(&s->gb, 4) != 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1045 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1046 dprintf("dqt: 16bit precision\n");
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1047 return -1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1048 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1049 index = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1050 if (index >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1051 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1052 dprintf("index=%d\n", index);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1053 /* read quant table */
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
1054 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
1055 j = s->scantable.permutated[i];
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1056 s->quant_matrixes[index][j] = get_bits(&s->gb, 8);
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
1057 }
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1058
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1059 //XXX FIXME finetune, and perhaps add dc too
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1060 s->qscale[index]= FFMAX(
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1061 s->quant_matrixes[index][s->scantable.permutated[1]],
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1062 s->quant_matrixes[index][s->scantable.permutated[8]]) >> 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1063 dprintf("qscale[%d]: %d\n", index, s->qscale[index]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1064 len -= 65;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1065 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1066
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1067 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1068 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1069
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1070 /* decode huffman tables and build VLC decoders */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1071 static int mjpeg_decode_dht(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1072 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1073 int len, index, i, class, n, v, code_max;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1074 uint8_t bits_table[17];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1075 uint8_t val_table[256];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1076
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1077 len = get_bits(&s->gb, 16) - 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1078
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1079 while (len > 0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1080 if (len < 17)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1081 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1082 class = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1083 if (class >= 2)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1084 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1085 index = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1086 if (index >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1087 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1088 n = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1089 for(i=1;i<=16;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1090 bits_table[i] = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1091 n += bits_table[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1092 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1093 len -= 17;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1094 if (len < n || n > 256)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1095 return -1;
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 code_max = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1098 for(i=0;i<n;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1099 v = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1100 if (v > code_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1101 code_max = v;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1102 val_table[i] = v;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1103 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1104 len -= n;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1105
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1106 /* build VLC and flush previous vlc if present */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1107 free_vlc(&s->vlcs[class][index]);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1108 dprintf("class=%d index=%d nb_codes=%d\n",
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1109 class, index, code_max + 1);
3227
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
1110 if(build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1, 0, class > 0) < 0){
1351
0fc1a6f8ca94 few more error checks
michaelni
parents: 1325
diff changeset
1111 return -1;
0fc1a6f8ca94 few more error checks
michaelni
parents: 1325
diff changeset
1112 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1113 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1114 return 0;
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
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1117 static int mjpeg_decode_sof(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1118 {
3929
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1119 int len, nb_components, i, width, height, pix_fmt_id;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1120
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1121 /* XXX: verify len field validity */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1122 len = get_bits(&s->gb, 16);
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1123 s->bits= get_bits(&s->gb, 8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1124
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1125 if(s->pegasus_rct) s->bits=9;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1126 if(s->bits==9 && !s->pegasus_rct) s->rct=1; //FIXME ugly
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1127
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1128 if (s->bits != 8 && !s->lossless){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1560
diff changeset
1129 av_log(s->avctx, AV_LOG_ERROR, "only 8 bits/component accepted\n");
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1130 return -1;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1131 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1132
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1133 height = get_bits(&s->gb, 16);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1134 width = get_bits(&s->gb, 16);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1135
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1136 dprintf("sof0: picture: %dx%d\n", width, height);
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
1137 if(avcodec_check_dimensions(s->avctx, width, height))
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
1138 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1139
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1140 nb_components = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1141 if (nb_components <= 0 ||
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1142 nb_components > MAX_COMPONENTS)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1143 return -1;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 3947
diff changeset
1144 if (s->ls && !(s->bits <= 8 || nb_components == 1)){
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 3947
diff changeset
1145 av_log(s->avctx, AV_LOG_ERROR, "only <= 8 bits/component or 16-bit gray accepted for JPEG-LS\n");
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 3947
diff changeset
1146 return -1;
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 3947
diff changeset
1147 }
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1148 s->nb_components = nb_components;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1149 s->h_max = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1150 s->v_max = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1151 for(i=0;i<nb_components;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1152 /* component id */
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1153 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
1154 s->h_count[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1155 s->v_count[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1156 /* compute hmax and vmax (only used in interleaved case) */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1157 if (s->h_count[i] > s->h_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1158 s->h_max = s->h_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1159 if (s->v_count[i] > s->v_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1160 s->v_max = s->v_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1161 s->quant_index[i] = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1162 if (s->quant_index[i] >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1163 return -1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1164 dprintf("component %d %d:%d id: %d quant:%d\n", i, s->h_count[i],
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1165 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
1166 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1167
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1168 if(s->ls && (s->h_max > 1 || s->v_max > 1)) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1169 av_log(s->avctx, AV_LOG_ERROR, "Subsampling in JPEG-LS is not supported.\n");
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1170 return -1;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1171 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1172
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1173 if(s->v_max==1 && s->h_max==1 && s->lossless==1) s->rgb=1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1174
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1175 /* if different size, realloc/alloc picture */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1176 /* XXX: also check h_count and v_count */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1177 if (width != s->width || height != s->height) {
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1178 av_freep(&s->qscale_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1179
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1180 s->width = width;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1181 s->height = height;
1679
55c03fa692a9 set AVCodecContext.width/height before get_buffer()
michael
parents: 1619
diff changeset
1182
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1183 /* test interlaced mode */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1184 if (s->first_picture &&
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1185 s->org_height != 0 &&
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1186 s->height < ((s->org_height * 3) / 4)) {
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1187 s->interlaced = 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1188 // s->bottom_field = (s->interlace_polarity) ? 1 : 0;
1679
55c03fa692a9 set AVCodecContext.width/height before get_buffer()
michael
parents: 1619
diff changeset
1189 s->bottom_field = 0;
3062
8d05d4036b6a Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
banan
parents: 3036
diff changeset
1190 height *= 2;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1191 }
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1192
3062
8d05d4036b6a Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
banan
parents: 3036
diff changeset
1193 avcodec_set_dimensions(s->avctx, width, height);
8d05d4036b6a Mjpeg interlaced decoding fix, height was wrong while decoding (/2).
banan
parents: 3036
diff changeset
1194
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1195 s->qscale_table= av_mallocz((s->width+15)/16);
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
1196
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1197 s->first_picture = 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1198 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1199
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1200 if(s->interlaced && s->bottom_field)
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1201 return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1202
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1203 /* XXX: not complete test ! */
3929
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1204 pix_fmt_id = (s->h_count[0] << 20) | (s->v_count[0] << 16) |
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1205 (s->h_count[1] << 12) | (s->v_count[1] << 8) |
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1206 (s->h_count[2] << 4) | s->v_count[2];
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1207 dprintf("pix fmt id %x\n", pix_fmt_id);
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1208 switch(pix_fmt_id){
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1209 case 0x222222:
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1210 case 0x111111:
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1211 if(s->rgb){
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1212 s->avctx->pix_fmt = PIX_FMT_RGBA32;
1740
0c686b4cd576 grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
michael
parents: 1679
diff changeset
1213 }else if(s->nb_components==3)
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
1214 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV444P : PIX_FMT_YUVJ444P;
1740
0c686b4cd576 grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
michael
parents: 1679
diff changeset
1215 else
0c686b4cd576 grayscale mjpeg decoding support based upon a patch by (Leon Bottou (leonb))
michael
parents: 1679
diff changeset
1216 s->avctx->pix_fmt = PIX_FMT_GRAY8;
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1217 break;
3929
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1218 case 0x211111:
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1219 case 0x221212:
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
1220 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV422P : PIX_FMT_YUVJ422P;
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1221 break;
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1222 default:
3929
a31f865dd68d mjpeg 4:2:2 encoding support
bcoudurier
parents: 3776
diff changeset
1223 case 0x221111:
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
1224 s->avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420P;
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1225 break;
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1226 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1227 if(s->ls){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1228 if(s->nb_components > 1)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1229 s->avctx->pix_fmt = PIX_FMT_RGB24;
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 3947
diff changeset
1230 else if(s->bits <= 8)
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 3947
diff changeset
1231 s->avctx->pix_fmt = PIX_FMT_GRAY8;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1232 else
4069
0df780a93aa8 JPEG-LS 16-bit gray support
kostya
parents: 3947
diff changeset
1233 s->avctx->pix_fmt = PIX_FMT_GRAY16;
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1234 }
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1235
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1236 if(s->picture.data[0])
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1237 s->avctx->release_buffer(s->avctx, &s->picture);
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1238
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1239 s->picture.reference= 0;
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1240 if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1560
diff changeset
1241 av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1242 return -1;
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1243 }
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1244 s->picture.pict_type= I_TYPE;
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1245 s->picture.key_frame= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1246
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1247 for(i=0; i<3; i++){
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1248 s->linesize[i]= s->picture.linesize[i] << s->interlaced;
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1249 }
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1250
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1251 // printf("%d %d %d %d %d %d\n", s->width, s->height, s->linesize[0], s->linesize[1], s->interlaced, s->avctx->height);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1252
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1253 if (len != (8+(3*nb_components)))
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1254 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1255 dprintf("decode_sof0: error, len(%d) mismatch\n", len);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1256 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1257
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1258 /* totally blank picture as progressive JPEG will only add details to it */
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1259 if(s->progressive){
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1260 memset(s->picture.data[0], 0, s->picture.linesize[0] * s->height);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1261 memset(s->picture.data[1], 0, s->picture.linesize[1] * s->height >> (s->v_max - s->v_count[1]));
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1262 memset(s->picture.data[2], 0, s->picture.linesize[2] * s->height >> (s->v_max - s->v_count[2]));
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1263 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1264 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1265 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1266
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
1267 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
1268 {
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1269 int code;
780
a48bb8bc63dd get_vlc2()
michaelni
parents: 779
diff changeset
1270 code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1271 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
1272 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1273 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index,
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
1274 &s->vlcs[0][dc_index]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1275 return 0xffff;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1276 }
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1277
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1278 if(code)
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1279 return get_xbits(&s->gb, code);
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1280 else
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1281 return 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1282 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1283
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1284 /* decode block and dequantize */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1285 static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
3225
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1286 int component, int dc_index, int ac_index, int16_t *quant_matrix)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1287 {
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1288 int code, i, j, level, val;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1289
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1290 /* DC coef */
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
1291 val = mjpeg_decode_dc(s, dc_index);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1292 if (val == 0xffff) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1293 dprintf("error dc\n");
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1294 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1295 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1296 val = val * quant_matrix[0] + s->last_dc[component];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1297 s->last_dc[component] = val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1298 block[0] = val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1299 /* AC coefs */
3227
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
1300 i = 0;
3232
b9f906a0b0f8 fix gcc 2.95 compilation
michael
parents: 3228
diff changeset
1301 {OPEN_READER(re, &s->gb)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1302 for(;;) {
3225
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1303 UPDATE_CACHE(re, &s->gb);
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1304 GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2)
1275
61317ffc64d5 cleanup
michaelni
parents: 1266
diff changeset
1305
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1306 /* EOB */
3227
ea0ca798d389 avoid i++ in decode_block()
michael
parents: 3226
diff changeset
1307 if (code == 0x10)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1308 break;
3242
e22fc2d702b7 simplify loop a little
michael
parents: 3241
diff changeset
1309 i += ((unsigned)code) >> 4;
e22fc2d702b7 simplify loop a little
michael
parents: 3241
diff changeset
1310 if(code != 0x100){
3225
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1311 code &= 0xf;
3241
61d9f1418c02 do UPDATE_CACHE only when needed (which should be VERY rare)
michael
parents: 3240
diff changeset
1312 if(code > MIN_CACHE_BITS - 16){
61d9f1418c02 do UPDATE_CACHE only when needed (which should be VERY rare)
michael
parents: 3240
diff changeset
1313 UPDATE_CACHE(re, &s->gb)
61d9f1418c02 do UPDATE_CACHE only when needed (which should be VERY rare)
michael
parents: 3240
diff changeset
1314 }
3239
d92263225a77 avoid hard to predict branch (idea by arpi)
michael
parents: 3232
diff changeset
1315 {
3242
e22fc2d702b7 simplify loop a little
michael
parents: 3241
diff changeset
1316 int cache=GET_CACHE(re,&s->gb);
3239
d92263225a77 avoid hard to predict branch (idea by arpi)
michael
parents: 3232
diff changeset
1317 int sign=(~cache)>>31;
3240
5fab2409bf8d + (sign&1) -> -sign (1 instruction less)
michael
parents: 3239
diff changeset
1318 level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign;
3225
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1319 }
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1320
3226
e3ddc57c2d6e minor optimization of decode_block()
michael
parents: 3225
diff changeset
1321 LAST_SKIP_BITS(re, &s->gb, code)
3225
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1322
3228
ad50f9ef5c6b avoid if(i>=63) check at the end of decode_block()
michael
parents: 3227
diff changeset
1323 if (i >= 63) {
ad50f9ef5c6b avoid if(i>=63) check at the end of decode_block()
michael
parents: 3227
diff changeset
1324 if(i == 63){
ad50f9ef5c6b avoid if(i>=63) check at the end of decode_block()
michael
parents: 3227
diff changeset
1325 j = s->scantable.permutated[63];
ad50f9ef5c6b avoid if(i>=63) check at the end of decode_block()
michael
parents: 3227
diff changeset
1326 block[j] = level * quant_matrix[j];
ad50f9ef5c6b avoid if(i>=63) check at the end of decode_block()
michael
parents: 3227
diff changeset
1327 break;
ad50f9ef5c6b avoid if(i>=63) check at the end of decode_block()
michael
parents: 3227
diff changeset
1328 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1329 dprintf("error count: %d\n", i);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1330 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1331 }
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
1332 j = s->scantable.permutated[i];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1333 block[j] = level * quant_matrix[j];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1334 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1335 }
3232
b9f906a0b0f8 fix gcc 2.95 compilation
michael
parents: 3228
diff changeset
1336 CLOSE_READER(re, &s->gb)}
3225
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1337
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1338 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1339 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1340
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1341 /* decode block and dequantize - progressive JPEG version */
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1342 static int decode_block_progressive(MJpegDecodeContext *s, DCTELEM *block,
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1343 int component, int dc_index, int ac_index, int16_t *quant_matrix,
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1344 int ss, int se, int Ah, int Al, int *EOBRUN)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1345 {
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1346 int code, i, j, level, val, run;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1347
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1348 /* DC coef */
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1349 if(!ss){
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1350 val = mjpeg_decode_dc(s, dc_index);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1351 if (val == 0xffff) {
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1352 dprintf("error dc\n");
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1353 return -1;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1354 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1355 val = (val * quant_matrix[0] << Al) + s->last_dc[component];
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1356 }else
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1357 val = 0;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1358 s->last_dc[component] = val;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1359 block[0] = val;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1360 if(!se) return 0;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1361 /* AC coefs */
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1362 if(*EOBRUN){
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1363 (*EOBRUN)--;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1364 return 0;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1365 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1366 {OPEN_READER(re, &s->gb)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1367 for(i=ss;;i++) {
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1368 UPDATE_CACHE(re, &s->gb);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1369 GET_VLC(code, re, &s->gb, s->vlcs[1][ac_index].table, 9, 2)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1370 /* Progressive JPEG use AC coeffs from zero and this decoder sets offset 16 by default */
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1371 code -= 16;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1372 if(code & 0xF) {
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1373 i += ((unsigned) code) >> 4;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1374 code &= 0xf;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1375 if(code > MIN_CACHE_BITS - 16){
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1376 UPDATE_CACHE(re, &s->gb)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1377 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1378 {
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1379 int cache=GET_CACHE(re,&s->gb);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1380 int sign=(~cache)>>31;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1381 level = (NEG_USR32(sign ^ cache,code) ^ sign) - sign;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1382 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1383
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1384 LAST_SKIP_BITS(re, &s->gb, code)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1385
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1386 if (i >= se) {
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1387 if(i == se){
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1388 j = s->scantable.permutated[se];
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1389 block[j] = level * quant_matrix[j] << Al;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1390 break;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1391 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1392 dprintf("error count: %d\n", i);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1393 return -1;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1394 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1395 j = s->scantable.permutated[i];
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1396 block[j] = level * quant_matrix[j] << Al;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1397 }else{
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1398 run = ((unsigned) code) >> 4;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1399 if(run == 0xF){// ZRL - skip 15 coefficients
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1400 i += 15;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1401 }else{
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1402 val = run;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1403 run = (1 << run);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1404 UPDATE_CACHE(re, &s->gb);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1405 run += (GET_CACHE(re, &s->gb) >> (32 - val)) & (run - 1);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1406 if(val)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1407 LAST_SKIP_BITS(re, &s->gb, val);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1408 *EOBRUN = run - 1;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1409 break;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1410 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1411 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1412 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1413 CLOSE_READER(re, &s->gb)}
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1414
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1415 return 0;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1416 }
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1417
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1418 static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point_transform){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1419 int i, mb_x, mb_y;
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
1420 uint16_t buffer[32768][4];
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1421 int left[3], top[3], topleft[3];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1422 const int linesize= s->linesize[0];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1423 const int mask= (1<<s->bits)-1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1424
2422
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
1425 if((unsigned)s->mb_width > 32768) //dynamic alloc
18b8b2dcc037 various security fixes and precautionary checks
michael
parents: 2370
diff changeset
1426 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1427
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1428 for(i=0; i<3; i++){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1429 buffer[0][i]= 1 << (s->bits + point_transform - 1);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1430 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1431 for(mb_y = 0; mb_y < s->mb_height; mb_y++) {
1363
michaelni
parents: 1359
diff changeset
1432 const int modified_predictor= mb_y ? predictor : 1;
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1433 uint8_t *ptr = s->picture.data[0] + (linesize * mb_y);
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1434
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1435 if (s->interlaced && s->bottom_field)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1436 ptr += linesize >> 1;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1437
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1438 for(i=0; i<3; i++){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1439 top[i]= left[i]= topleft[i]= buffer[0][i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1440 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1441 for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1442 if (s->restart_interval && !s->restart_count)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1443 s->restart_count = s->restart_interval;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1444
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1445 for(i=0;i<3;i++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1446 int pred;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1447
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1448 topleft[i]= top[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1449 top[i]= buffer[mb_x][i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1450
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1451 PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1452
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1453 left[i]=
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1454 buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform));
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1455 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1456
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1457 if (s->restart_interval && !--s->restart_count) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1458 align_get_bits(&s->gb);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1459 skip_bits(&s->gb, 16); /* skip RSTn */
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1460 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1461 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1462
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1463 if(s->rct){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1464 for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1465 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2] - 0x200)>>2);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1466 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1467 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1468 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1469 }else if(s->pegasus_rct){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1470 for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1471 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2])>>2);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1472 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1473 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1474 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1475 }else{
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1476 for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1477 ptr[4*mb_x+0] = buffer[mb_x][0];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1478 ptr[4*mb_x+1] = buffer[mb_x][1];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1479 ptr[4*mb_x+2] = buffer[mb_x][2];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1480 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1481 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1482 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1483 return 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1484 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1485
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1486 static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point_transform){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1487 int i, mb_x, mb_y;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1488 const int nb_components=3;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1489
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1490 for(mb_y = 0; mb_y < s->mb_height; mb_y++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1491 for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1492 if (s->restart_interval && !s->restart_count)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1493 s->restart_count = s->restart_interval;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1494
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1495 if(mb_x==0 || mb_y==0 || s->interlaced){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1496 for(i=0;i<nb_components;i++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1497 uint8_t *ptr;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1498 int n, h, v, x, y, c, j, linesize;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1499 n = s->nb_blocks[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1500 c = s->comp_index[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1501 h = s->h_scount[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1502 v = s->v_scount[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1503 x = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1504 y = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1505 linesize= s->linesize[c];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1506
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1507 for(j=0; j<n; j++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1508 int pred;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1509
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1510 ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1511 if(y==0 && mb_y==0){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1512 if(x==0 && mb_x==0){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1513 pred= 128 << point_transform;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1514 }else{
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1515 pred= ptr[-1];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1516 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1517 }else{
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1518 if(x==0 && mb_x==0){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1519 pred= ptr[-linesize];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1520 }else{
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1521 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1522 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1523 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1524
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1525 if (s->interlaced && s->bottom_field)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1526 ptr += linesize >> 1;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1527 *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1528
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1529 if (++x == h) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1530 x = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1531 y++;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1532 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1533 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1534 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1535 }else{
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1536 for(i=0;i<nb_components;i++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1537 uint8_t *ptr;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1538 int n, h, v, x, y, c, j, linesize;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1539 n = s->nb_blocks[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1540 c = s->comp_index[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1541 h = s->h_scount[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1542 v = s->v_scount[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1543 x = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1544 y = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1545 linesize= s->linesize[c];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1546
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1547 for(j=0; j<n; j++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1548 int pred;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1549
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
1550 ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1551 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1552 *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1553 if (++x == h) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1554 x = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1555 y++;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1556 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1557 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1558 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1559 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1560 if (s->restart_interval && !--s->restart_count) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1561 align_get_bits(&s->gb);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1562 skip_bits(&s->gb, 16); /* skip RSTn */
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1563 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1564 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1565 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1566 return 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1567 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1568
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1569 static int mjpeg_decode_scan(MJpegDecodeContext *s, int nb_components, int ss, int se, int Ah, int Al){
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1570 int i, mb_x, mb_y;
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1571 int EOBRUN = 0;
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1572
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1573 if(Ah) return 0; /* TODO decode refinement planes too */
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1574 for(mb_y = 0; mb_y < s->mb_height; mb_y++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1575 for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1576 if (s->restart_interval && !s->restart_count)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1577 s->restart_count = s->restart_interval;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1578
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1579 for(i=0;i<nb_components;i++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1580 uint8_t *ptr;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1581 int n, h, v, x, y, c, j;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1582 n = s->nb_blocks[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1583 c = s->comp_index[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1584 h = s->h_scount[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1585 v = s->v_scount[i];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1586 x = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1587 y = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1588 for(j=0;j<n;j++) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1589 memset(s->block, 0, sizeof(s->block));
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1590 if (!s->progressive && decode_block(s, s->block, i,
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1591 s->dc_index[i], s->ac_index[i],
3225
a0d2d5053c9d optimizations by arpi
michael
parents: 3089
diff changeset
1592 s->quant_matrixes[ s->quant_index[c] ]) < 0) {
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1593 dprintf("error y=%d x=%d\n", mb_y, mb_x);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1594 return -1;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1595 }
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1596 if (s->progressive && decode_block_progressive(s, s->block, i,
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1597 s->dc_index[i], s->ac_index[i],
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1598 s->quant_matrixes[ s->quant_index[c] ], ss, se, Ah, Al, &EOBRUN) < 0) {
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1599 dprintf("error y=%d x=%d\n", mb_y, mb_x);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1600 return -1;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1601 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1602 // dprintf("mb: %d %d processed\n", mb_y, mb_x);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1603 ptr = s->picture.data[c] +
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1604 (((s->linesize[c] * (v * mb_y + y) * 8) +
2258
7096bf7c3434 low resolution decoding fix
michael
parents: 2181
diff changeset
1605 (h * mb_x + x) * 8) >> s->avctx->lowres);
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1606 if (s->interlaced && s->bottom_field)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1607 ptr += s->linesize[c] >> 1;
1994
8d3540dddd1b cleanup & memleak fix
michael
parents: 1911
diff changeset
1608 //av_log(NULL, AV_LOG_DEBUG, "%d %d %d %d %d %d %d %d \n", mb_x, mb_y, x, y, c, s->bottom_field, (v * mb_y + y) * 8, (h * mb_x + x) * 8);
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1609 if(!s->progressive)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1610 s->idct_put(ptr, s->linesize[c], s->block);
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1611 else
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1612 s->idct_add(ptr, s->linesize[c], s->block);
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1613 if (++x == h) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1614 x = 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1615 y++;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1616 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1617 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1618 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1619 /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1620 if (s->restart_interval && (s->restart_interval < 1350) &&
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1621 !--s->restart_count) {
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1622 align_get_bits(&s->gb);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1623 skip_bits(&s->gb, 16); /* skip RSTn */
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1624 for (i=0; i<nb_components; i++) /* reset dc */
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1625 s->last_dc[i] = 1024;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1626 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1627 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1628 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1629 return 0;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1630 }
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1631
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1632 static int mjpeg_decode_sos(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1633 {
1455
c4539ef4d8cb removed warnings
bellard
parents: 1363
diff changeset
1634 int len, nb_components, i, h, v, predictor, point_transform;
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1635 int vmax, hmax, index, id;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1636 const int block_size= s->lossless ? 1 : 8;
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1637 int ilv, prev_shift;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1638
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1639 /* XXX: verify len field validity */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1640 len = get_bits(&s->gb, 16);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1641 nb_components = get_bits(&s->gb, 8);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1642 if (len != 6+2*nb_components)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1643 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1644 dprintf("decode_sos: invalid len (%d)\n", len);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1645 return -1;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1646 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1647 vmax = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1648 hmax = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1649 for(i=0;i<nb_components;i++) {
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1650 id = get_bits(&s->gb, 8) - 1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1651 dprintf("component: %d\n", id);
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1652 /* find component index */
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1653 for(index=0;index<s->nb_components;index++)
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1654 if (id == s->component_id[index])
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1655 break;
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1656 if (index == s->nb_components)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1657 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1658 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
1659 return -1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1660 }
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1661
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1662 s->comp_index[i] = index;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1663
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1664 s->nb_blocks[i] = s->h_count[index] * s->v_count[index];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1665 s->h_scount[i] = s->h_count[index];
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1666 s->v_scount[i] = s->v_count[index];
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1667
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1668 s->dc_index[i] = get_bits(&s->gb, 4);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1669 s->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
1670
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1671 if (s->dc_index[i] < 0 || s->ac_index[i] < 0 ||
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1672 s->dc_index[i] >= 4 || s->ac_index[i] >= 4)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1673 goto out_of_range;
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1674 #if 0 //buggy
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1675 switch(s->start_code)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1676 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1677 case SOF0:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1678 if (dc_index[i] > 1 || ac_index[i] > 1)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1679 goto out_of_range;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1680 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1681 case SOF1:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1682 case SOF2:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1683 if (dc_index[i] > 3 || ac_index[i] > 3)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1684 goto out_of_range;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1685 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1686 case SOF3:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1687 if (dc_index[i] > 3 || ac_index[i] != 0)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1688 goto out_of_range;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1689 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1690 }
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1691 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1692 }
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1693
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1694 predictor= get_bits(&s->gb, 8); /* JPEG Ss / lossless JPEG predictor /JPEG-LS NEAR */
2976
b5e8b6821274 10l to michael for breaking gcc 2.95 compile :)
rfelker
parents: 2970
diff changeset
1695 ilv= get_bits(&s->gb, 8); /* JPEG Se / JPEG-LS ILV */
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1696 prev_shift = get_bits(&s->gb, 4); /* Ah */
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1697 point_transform= get_bits(&s->gb, 4); /* Al */
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1698
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1699 for(i=0;i<nb_components;i++)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1700 s->last_dc[i] = 1024;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1701
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1702 if (nb_components > 1) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1703 /* interleaved stream */
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1704 s->mb_width = (s->width + s->h_max * block_size - 1) / (s->h_max * block_size);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1705 s->mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size);
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1706 } else if(!s->ls) { /* skip this for JPEG-LS */
4222
fa816309076b Decode non-interleaved scans
kostya
parents: 4216
diff changeset
1707 h = s->h_max / s->h_scount[0];
fa816309076b Decode non-interleaved scans
kostya
parents: 4216
diff changeset
1708 v = s->v_max / s->v_scount[0];
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1709 s->mb_width = (s->width + h * block_size - 1) / (h * block_size);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1710 s->mb_height = (s->height + v * block_size - 1) / (v * block_size);
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1711 s->nb_blocks[0] = 1;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1712 s->h_scount[0] = 1;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1713 s->v_scount[0] = 1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1714 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1715
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1716 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1717 av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d ilv:%d bits:%d %s\n", s->lossless ? "lossless" : "sequencial DCT", s->rgb ? "RGB" : "",
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1718 predictor, point_transform, ilv, s->bits,
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1719 s->pegasus_rct ? "PRCT" : (s->rct ? "RCT" : ""));
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1720
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1721
2333
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
1722 /* mjpeg-b can have padding bytes between sos and image data, skip them */
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
1723 for (i = s->mjpb_skiptosod; i > 0; i--)
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
1724 skip_bits(&s->gb, 8);
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
1725
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1726 if(s->lossless){
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1727 if(s->ls){
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1728 // for(){
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1729 // reset_ls_coding_parameters(s, 0);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1730
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
1731 ls_decode_picture(s, predictor, point_transform, ilv);
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1732 }else{
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1733 if(s->rgb){
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1734 if(ljpeg_decode_rgb_scan(s, predictor, point_transform) < 0)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1735 return -1;
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1736 }else{
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1737 if(ljpeg_decode_yuv_scan(s, predictor, point_transform) < 0)
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1738 return -1;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1739 }
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
1740 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1741 }else{
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
1742 if(mjpeg_decode_scan(s, nb_components, predictor, ilv, prev_shift, point_transform) < 0)
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1743 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1744 }
44
92d51f683931 added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents: 37
diff changeset
1745 emms_c();
1359
4c2febfefd78 cleanup
michaelni
parents: 1358
diff changeset
1746 return 0;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1747 out_of_range:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1748 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
1749 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1750 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1751
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1752 static int mjpeg_decode_dri(MJpegDecodeContext *s)
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1753 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1754 if (get_bits(&s->gb, 16) != 4)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1755 return -1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1756 s->restart_interval = get_bits(&s->gb, 16);
2802
4db6127e20b8 reset restart_count when restart_interval is set and fill the
reimar
parents: 2799
diff changeset
1757 s->restart_count = 0;
507
b5b91e89b88c * turned into debug message - it's annoying when watching mjpeg files
kabi
parents: 477
diff changeset
1758 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
1759
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1760 return 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1761 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1762
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
1763 static int mjpeg_decode_app(MJpegDecodeContext *s)
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1764 {
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1765 int len, id;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1766
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1767 len = get_bits(&s->gb, 16);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1768 if (len < 5)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1769 return -1;
2789
587ed6630b5d check len (should fix #1165694)
michael
parents: 2522
diff changeset
1770 if(8*len + get_bits_count(&s->gb) > s->gb.size_in_bits)
587ed6630b5d check len (should fix #1165694)
michael
parents: 2522
diff changeset
1771 return -1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1772
811
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1773 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1774 id = be2me_32(id);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1775 len -= 6;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1776
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1777 if(s->avctx->debug & FF_DEBUG_STARTCODE){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1778 av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id);
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1779 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1780
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1781 /* 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
1782 /* 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
1783 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
1784 if (id == ff_get_fourcc("AVI1"))
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1785 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1786 /* structure:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1787 4bytes AVI1
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1788 1bytes polarity
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1789 1bytes always zero
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1790 4bytes field_size
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1791 4bytes field_size_less_padding
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1792 */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1793 s->buggy_avid = 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1794 // if (s->first_picture)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1795 // printf("mjpeg: workarounding buggy AVID\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1796 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
1797 #if 0
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1798 skip_bits(&s->gb, 8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1799 skip_bits(&s->gb, 32);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1800 skip_bits(&s->gb, 32);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1801 len -= 10;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1802 #endif
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1803 // if (s->interlace_polarity)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1804 // printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1805 goto out;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1806 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1807
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1808 // len -= 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1809
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
1810 if (id == ff_get_fourcc("JFIF"))
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1811 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1812 int t_w, t_h, v1, v2;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1813 skip_bits(&s->gb, 8); /* the trailing zero-byte */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1814 v1= get_bits(&s->gb, 8);
1911
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1815 v2= get_bits(&s->gb, 8);
1548
dd544554ed42 AVRational
michael
parents: 1530
diff changeset
1816 skip_bits(&s->gb, 8);
903
22ee74da2cd3 cleanup
michaelni
parents: 901
diff changeset
1817
1548
dd544554ed42 AVRational
michael
parents: 1530
diff changeset
1818 s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 16);
dd544554ed42 AVRational
michael
parents: 1530
diff changeset
1819 s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 16);
935
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1820
1911
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1821 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1822 av_log(s->avctx, AV_LOG_INFO, "mjpeg: JFIF header found (version: %x.%x) SAR=%d/%d\n",
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1823 v1, v2,
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1824 s->avctx->sample_aspect_ratio.num,
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1825 s->avctx->sample_aspect_ratio.den
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1826 );
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1827
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1828 t_w = get_bits(&s->gb, 8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1829 t_h = get_bits(&s->gb, 8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1830 if (t_w && t_h)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1831 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1832 /* skip thumbnail */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1833 if (len-10-(t_w*t_h*3) > 0)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1834 len -= t_w*t_h*3;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1835 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1836 len -= 10;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1837 goto out;
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1838 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1839
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1840 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
1841 {
1906
caee9c21b0b1 always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents: 1892
diff changeset
1842 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
caee9c21b0b1 always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents: 1892
diff changeset
1843 av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1844 skip_bits(&s->gb, 16); /* version */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1845 skip_bits(&s->gb, 16); /* flags0 */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1846 skip_bits(&s->gb, 16); /* flags1 */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1847 skip_bits(&s->gb, 8); /* transform */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1848 len -= 7;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1849 goto out;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1850 }
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1851
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1852 if (id == ff_get_fourcc("LJIF")){
1906
caee9c21b0b1 always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents: 1892
diff changeset
1853 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
caee9c21b0b1 always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents: 1892
diff changeset
1854 av_log(s->avctx, AV_LOG_INFO, "Pegasus lossless jpeg header found\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1855 skip_bits(&s->gb, 16); /* version ? */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1856 skip_bits(&s->gb, 16); /* unknwon always 0? */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1857 skip_bits(&s->gb, 16); /* unknwon always 0? */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1858 skip_bits(&s->gb, 16); /* unknwon always 0? */
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1859 switch( get_bits(&s->gb, 8)){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1860 case 1:
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1861 s->rgb= 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1862 s->pegasus_rct=0;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1863 break;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1864 case 2:
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1865 s->rgb= 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1866 s->pegasus_rct=1;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1867 break;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1868 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1560
diff changeset
1869 av_log(s->avctx, AV_LOG_ERROR, "unknown colorspace\n");
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1870 }
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1871 len -= 9;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1872 goto out;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1873 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1874
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1875 /* 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
1876 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
1877 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1878 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1879 id = be2me_32(id);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1880 len -= 4;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1881 if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1882 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1883 #if 0
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1884 skip_bits(&s->gb, 32); /* field size */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1885 skip_bits(&s->gb, 32); /* pad field size */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1886 skip_bits(&s->gb, 32); /* next off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1887 skip_bits(&s->gb, 32); /* quant off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1888 skip_bits(&s->gb, 32); /* huff off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1889 skip_bits(&s->gb, 32); /* image off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1890 skip_bits(&s->gb, 32); /* scan off */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1891 skip_bits(&s->gb, 32); /* data off */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1892 #endif
1906
caee9c21b0b1 always parse APP* as it sometimes contains startcodes which confuse the decoder otherwise
michael
parents: 1892
diff changeset
1893 if (s->avctx->debug & FF_DEBUG_PICT_INFO)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1894 av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1895 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1896 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1897
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1898 out:
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1899 /* 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
1900 if (len < 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1901 av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error, decode_app parser read over the end\n");
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1902 while(--len > 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1903 skip_bits(&s->gb, 8);
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1904
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1905 return 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1906 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1907
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1908 static int mjpeg_decode_com(MJpegDecodeContext *s)
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1909 {
1322
f78341ab5fba some warning fixes
al3x
parents: 1315
diff changeset
1910 int len = get_bits(&s->gb, 16);
2798
eb488002ab4a verify len field validity in mjpeg_decode_com()
michael
parents: 2789
diff changeset
1911 if (len >= 2 && 8*len - 16 + get_bits_count(&s->gb) <= s->gb.size_in_bits) {
3776
1843a85123b7 fix some signedness warnings
mru
parents: 3742
diff changeset
1912 char *cbuf = av_malloc(len - 1);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1913 if (cbuf) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1914 int i;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1915 for (i = 0; i < len - 2; i++)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1916 cbuf[i] = get_bits(&s->gb, 8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1917 if (i > 0 && cbuf[i-1] == '\n')
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1918 cbuf[i-1] = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1919 else
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1920 cbuf[i] = 0;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1921
1911
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1922 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
5b379ba0a577 hmm av_log(..., get_bits());
michael
parents: 1906
diff changeset
1923 av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1924
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1925 /* buggy avid, it puts EOI only at every 10th frame */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1926 if (!strcmp(cbuf, "AVID"))
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1927 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1928 s->buggy_avid = 1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1929 // if (s->first_picture)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1930 // printf("mjpeg: workarounding buggy AVID\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1931 }
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
1932 else if(!strcmp(cbuf, "CS=ITU601")){
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
1933 s->cs_itu601= 1;
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
1934 }
1061
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1935
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1936 av_free(cbuf);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1937 }
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1938 }
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1939
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1940 return 0;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1941 }
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1942
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1943 #if 0
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1944 static int valid_marker_list[] =
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1945 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1946 /* 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
1947 /* 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
1948 /* 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
1949 /* 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
1950 /* 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
1951 /* 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
1952 /* 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
1953 /* 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
1954 /* 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
1955 /* 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
1956 /* 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
1957 /* 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
1958 /* 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
1959 /* 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
1960 /* 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
1961 /* 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
1962 /* 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
1963 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1964 #endif
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1965
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1966 /* 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
1967 state. Return -1 if no start code found */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1968 static int find_marker(uint8_t **pbuf_ptr, uint8_t *buf_end)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1969 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1970 uint8_t *buf_ptr;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1971 unsigned int v, v2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1972 int val;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1973 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1974 int skipped=0;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1975 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1976
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1977 buf_ptr = *pbuf_ptr;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1978 while (buf_ptr < buf_end) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1979 v = *buf_ptr++;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1980 v2 = *buf_ptr;
1619
12530597714c better fix
michael
parents: 1618
diff changeset
1981 if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe) && buf_ptr < buf_end) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1982 val = *buf_ptr++;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1983 goto found;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1984 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1985 #ifdef DEBUG
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
1986 skipped++;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1987 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1988 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1989 val = -1;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1990 found:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1991 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1992 dprintf("find_marker skipped %d bytes\n", skipped);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1993 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1994 *pbuf_ptr = buf_ptr;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1995 return val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1996 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1997
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
1998 static int mjpeg_decode_frame(AVCodecContext *avctx,
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1999 void *data, int *data_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
2000 uint8_t *buf, int buf_size)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2001 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2002 MJpegDecodeContext *s = avctx->priv_data;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
2003 uint8_t *buf_end, *buf_ptr;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2004 int start_code;
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2005 AVFrame *picture = data;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2006
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2007 buf_ptr = buf;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2008 buf_end = buf + buf_size;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2009 while (buf_ptr < buf_end) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2010 /* find start next marker */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2011 start_code = find_marker(&buf_ptr, buf_end);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2012 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2013 /* EOF */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2014 if (start_code < 0) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2015 goto the_end;
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
2016 } else {
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2017 dprintf("marker=%x avail_size_in_buf=%d\n", start_code, buf_end - buf_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2018
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2019 if ((buf_end - buf_ptr) > s->buffer_size)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2020 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2021 av_free(s->buffer);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2022 s->buffer_size = buf_end-buf_ptr;
2799
924c7e66ced8 dont pre allocate uselessly large buffer and dont ignore FF_INPUT_BUFFER_PADDING_SIZE
michael
parents: 2798
diff changeset
2023 s->buffer = av_malloc(s->buffer_size + FF_INPUT_BUFFER_PADDING_SIZE);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2024 dprintf("buffer too small, expanding to %d bytes\n",
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2025 s->buffer_size);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2026 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2027
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2028 /* unescape buffer of SOS, use special treatment for JPEG-LS */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2029 if (start_code == SOS && !s->ls)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2030 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2031 uint8_t *src = buf_ptr;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2032 uint8_t *dst = s->buffer;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2033
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2034 while (src<buf_end)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2035 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2036 uint8_t x = *(src++);
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
2037
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2038 *(dst++) = x;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2039 if (x == 0xff)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2040 {
2360
0fcb4d572719 workaround apps which dont provided correctly padded streams
michael
parents: 2333
diff changeset
2041 while(src<buf_end && x == 0xff)
0fcb4d572719 workaround apps which dont provided correctly padded streams
michael
parents: 2333
diff changeset
2042 x = *(src++);
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
2043
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2044 if (x >= 0xd0 && x <= 0xd7)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2045 *(dst++) = x;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2046 else if (x)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2047 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2048 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2049 }
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2050 init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2051
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2052 dprintf("escaping removed %d bytes\n",
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2053 (buf_end - buf_ptr) - (dst - s->buffer));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2054 }
3078
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2055 else if(start_code == SOS && s->ls){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2056 uint8_t *src = buf_ptr;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2057 uint8_t *dst = s->buffer;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2058 int bit_count = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2059 int t = 0, b = 0;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2060 PutBitContext pb;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2061
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2062 s->cur_scan++;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2063
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2064 /* find marker */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2065 while (src + t < buf_end){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2066 uint8_t x = src[t++];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2067 if (x == 0xff){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2068 while((src + t < buf_end) && x == 0xff)
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2069 x = src[t++];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2070 if (x & 0x80) {
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2071 t -= 2;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2072 break;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2073 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2074 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2075 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2076 bit_count = t * 8;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2077
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2078 init_put_bits(&pb, dst, t);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2079
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2080 /* unescape bitstream */
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2081 while(b < t){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2082 uint8_t x = src[b++];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2083 put_bits(&pb, 8, x);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2084 if(x == 0xFF){
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2085 x = src[b++];
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2086 put_bits(&pb, 7, x);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2087 bit_count--;
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2088 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2089 }
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2090 flush_put_bits(&pb);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2091
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2092 init_get_bits(&s->gb, dst, bit_count);
1e63c12c2c71 JPEG-LS codec by (Kostya | kostya.forjunk gmail com)
michael
parents: 3062
diff changeset
2093 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2094 else
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2095 init_get_bits(&s->gb, buf_ptr, (buf_end - buf_ptr)*8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2096
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2097 s->start_code = start_code;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
2098 if(s->avctx->debug & FF_DEBUG_STARTCODE){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1560
diff changeset
2099 av_log(s->avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
2100 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2101
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2102 /* process markers */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2103 if (start_code >= 0xd0 && start_code <= 0xd7) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2104 dprintf("restart marker: %d\n", start_code&0x0f);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2105 /* APP fields */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2106 } else if (start_code >= APP0 && start_code <= APP15) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2107 mjpeg_decode_app(s);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2108 /* Comment */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2109 } else if (start_code == COM){
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2110 mjpeg_decode_com(s);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2111 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2112
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2113 switch(start_code) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2114 case SOI:
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2115 s->restart_interval = 0;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2116
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2117 s->restart_count = 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2118 /* nothing to do on SOI */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2119 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2120 case DQT:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2121 mjpeg_decode_dqt(s);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2122 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2123 case DHT:
1351
0fc1a6f8ca94 few more error checks
michaelni
parents: 1325
diff changeset
2124 if(mjpeg_decode_dht(s) < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1560
diff changeset
2125 av_log(s->avctx, AV_LOG_ERROR, "huffman table decode error\n");
1351
0fc1a6f8ca94 few more error checks
michaelni
parents: 1325
diff changeset
2126 return -1;
0fc1a6f8ca94 few more error checks
michaelni
parents: 1325
diff changeset
2127 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2128 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2129 case SOF0:
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
2130 s->lossless=0;
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2131 s->progressive=0;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2132 if (mjpeg_decode_sof(s) < 0)
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2133 return -1;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2134 break;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2135 case SOF2:
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2136 s->lossless=0;
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2137 s->progressive=1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2138 if (mjpeg_decode_sof(s) < 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2139 return -1;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
2140 break;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
2141 case SOF3:
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
2142 s->lossless=1;
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2143 s->progressive=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2144 if (mjpeg_decode_sof(s) < 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2145 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2146 break;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2147 case SOF48:
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2148 s->lossless=1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2149 s->ls=1;
4216
49c08d9b9646 Some progressive JPEG support
kostya
parents: 4069
diff changeset
2150 s->progressive=0;
2970
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2151 if (mjpeg_decode_sof(s) < 0)
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2152 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2153 break;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2154 case LSE:
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2155 if (decode_lse(s) < 0)
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2156 return -1;
583b6ac45c07 unfinished jpeg-ls codec (feel free to finish it ...)
michael
parents: 2967
diff changeset
2157 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2158 case EOI:
3742
9a6bbda8cf7e Zero number of current scan after decoding one picture.
kostya
parents: 3243
diff changeset
2159 s->cur_scan = 0;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2160 if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2161 break;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2162 eoi_parser:
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2163 {
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
2164 if (s->interlaced) {
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
2165 s->bottom_field ^= 1;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
2166 /* if not bottom field, do not output image yet */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
2167 if (s->bottom_field)
540
4cee7ce37e10 don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents: 527
diff changeset
2168 goto not_the_end;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
2169 }
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
2170 *picture = s->picture;
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2171 *data_size = sizeof(AVFrame);
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2172
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2173 if(!s->lossless){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2174 picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]);
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2175 picture->qstride= 0;
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2176 picture->qscale_table= s->qscale_table;
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2177 memset(picture->qscale_table, picture->quality, (s->width+15)/16);
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2178 if(avctx->debug & FF_DEBUG_QP)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1560
diff changeset
2179 av_log(s->avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1455
diff changeset
2180 picture->quality*= FF_QP2LAMBDA;
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2181 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2182
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2183 goto the_end;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2184 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2185 break;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2186 case SOS:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2187 mjpeg_decode_sos(s);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2188 /* buggy avid puts EOI every 10-20th frame */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2189 /* if restart period is over process EOI */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2190 if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2191 goto eoi_parser;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2192 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2193 case DRI:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2194 mjpeg_decode_dri(s);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2195 break;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2196 case SOF1:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2197 case SOF5:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2198 case SOF6:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2199 case SOF7:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2200 case SOF9:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2201 case SOF10:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2202 case SOF11:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2203 case SOF13:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2204 case SOF14:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2205 case SOF15:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2206 case JPG:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2207 av_log(s->avctx, AV_LOG_ERROR, "mjpeg: unsupported coding type (%x)\n", start_code);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2208 break;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2209 // default:
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2210 // printf("mjpeg: unsupported marker (%x)\n", start_code);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2211 // break;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2212 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2213
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2214 not_the_end:
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2215 /* eof process start code */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2216 buf_ptr += (get_bits_count(&s->gb)+7)/8;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2217 dprintf("marker parser used %d bytes (%d bits)\n",
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2218 (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
2219 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2220 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2221 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2222 the_end:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2223 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
2224 // return buf_end - buf_ptr;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2225 return buf_ptr - buf;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2226 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2227
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2228 static int mjpegb_decode_frame(AVCodecContext *avctx,
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2229 void *data, int *data_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
2230 uint8_t *buf, int buf_size)
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2231 {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2232 MJpegDecodeContext *s = avctx->priv_data;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
2233 uint8_t *buf_end, *buf_ptr;
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2234 AVFrame *picture = data;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2235 GetBitContext hgb; /* for the header */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2236 uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
2333
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
2237 uint32_t field_size, sod_offs;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2238
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2239 buf_ptr = buf;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2240 buf_end = buf + buf_size;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2241
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2242 read_header:
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2243 /* reset on every SOI */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2244 s->restart_interval = 0;
2802
4db6127e20b8 reset restart_count when restart_interval is set and fill the
reimar
parents: 2799
diff changeset
2245 s->restart_count = 0;
2333
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
2246 s->mjpb_skiptosod = 0;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2247
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 949
diff changeset
2248 init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2249
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2250 skip_bits(&hgb, 32); /* reserved zeros */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2251
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2028
diff changeset
2252 if (get_bits_long(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2253 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2254 dprintf("not mjpeg-b (bad fourcc)\n");
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2255 return 0;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2256 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2257
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2028
diff changeset
2258 field_size = get_bits_long(&hgb, 32); /* field size */
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2259 dprintf("field size: 0x%x\n", field_size);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2260 skip_bits(&hgb, 32); /* padded field size */
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2028
diff changeset
2261 second_field_offs = get_bits_long(&hgb, 32);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2262 dprintf("second field offs: 0x%x\n", second_field_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2263 if (second_field_offs)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2264 s->interlaced = 1;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2265
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2028
diff changeset
2266 dqt_offs = get_bits_long(&hgb, 32);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2267 dprintf("dqt offs: 0x%x\n", dqt_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2268 if (dqt_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2269 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2270 init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2271 s->start_code = DQT;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2272 mjpeg_decode_dqt(s);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2273 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2274
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2028
diff changeset
2275 dht_offs = get_bits_long(&hgb, 32);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2276 dprintf("dht offs: 0x%x\n", dht_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2277 if (dht_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2278 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2279 init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2280 s->start_code = DHT;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2281 mjpeg_decode_dht(s);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2282 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2283
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2028
diff changeset
2284 sof_offs = get_bits_long(&hgb, 32);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2285 dprintf("sof offs: 0x%x\n", sof_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2286 if (sof_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2287 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2288 init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2289 s->start_code = SOF0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2290 if (mjpeg_decode_sof(s) < 0)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2291 return -1;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2292 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2293
2173
380c40efd6bb get_bits(32) fix
michael
parents: 2028
diff changeset
2294 sos_offs = get_bits_long(&hgb, 32);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2295 dprintf("sos offs: 0x%x\n", sos_offs);
2333
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
2296 sod_offs = get_bits_long(&hgb, 32);
816185a9594a Fix mjpeg-b (padding bytes can exist between end of sos and image data)
rtognimp
parents: 2319
diff changeset
2297 dprintf("sod offs: 0x%x\n", sod_offs);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2298 if (sos_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2299 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2300 // init_get_bits(&s->gb, buf+sos_offs, (buf_end - (buf+sos_offs))*8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2301 init_get_bits(&s->gb, buf+sos_offs, field_size*8);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2302 s->mjpb_skiptosod = (sod_offs - sos_offs - show_bits(&s->gb, 16));
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2303 s->start_code = SOS;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2304 mjpeg_decode_sos(s);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2305 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2306
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2307 if (s->interlaced) {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2308 s->bottom_field ^= 1;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2309 /* if not bottom field, do not output image yet */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2310 if (s->bottom_field && second_field_offs)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2311 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2312 buf_ptr = buf + second_field_offs;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2313 second_field_offs = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2314 goto read_header;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2315 }
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2316 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2317
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2318 //XXX FIXME factorize, this looks very similar to the EOI code
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
2319
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
2320 *picture= s->picture;
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2321 *data_size = sizeof(AVFrame);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2322
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2323 if(!s->lossless){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2324 picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]);
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2325 picture->qstride= 0;
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2326 picture->qscale_table= s->qscale_table;
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2327 memset(picture->qscale_table, picture->quality, (s->width+15)/16);
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2328 if(avctx->debug & FF_DEBUG_QP)
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1560
diff changeset
2329 av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
1505
010f76d07a27 use lagrange multipler instead of qp for ratecontrol, this may break some things, tell me ASAP if u notice anything broken
michaelni
parents: 1455
diff changeset
2330 picture->quality*= FF_QP2LAMBDA;
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2331 }
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2332
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2333 return buf_ptr - buf;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2334 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2335
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2336 #include "sp5x.h"
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2337
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2338 static int sp5x_decode_frame(AVCodecContext *avctx,
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2339 void *data, int *data_size,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2340 uint8_t *buf, int buf_size)
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2341 {
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2342 #if 0
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2343 MJpegDecodeContext *s = avctx->priv_data;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2344 #endif
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2345 const int qscale = 5;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2346 uint8_t *buf_ptr, *buf_end, *recoded;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2347 int i = 0, j = 0;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2348
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2349 if (!avctx->width || !avctx->height)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2350 return -1;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2351
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2352 buf_ptr = buf;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2353 buf_end = buf + buf_size;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2354
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2355 #if 1
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2356 recoded = av_mallocz(buf_size + 1024);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2357 if (!recoded)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2358 return -1;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2359
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2360 /* SOI */
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2361 recoded[j++] = 0xFF;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2362 recoded[j++] = 0xD8;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2363
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2364 memcpy(recoded+j, &sp5x_data_dqt[0], sizeof(sp5x_data_dqt));
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2365 memcpy(recoded+j+5, &sp5x_quant_table[qscale * 2], 64);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2366 memcpy(recoded+j+70, &sp5x_quant_table[(qscale * 2) + 1], 64);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2367 j += sizeof(sp5x_data_dqt);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2368
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2369 memcpy(recoded+j, &sp5x_data_dht[0], sizeof(sp5x_data_dht));
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2370 j += sizeof(sp5x_data_dht);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2371
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2372 memcpy(recoded+j, &sp5x_data_sof[0], sizeof(sp5x_data_sof));
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2267
diff changeset
2373 recoded[j+5] = (avctx->coded_height >> 8) & 0xFF;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2267
diff changeset
2374 recoded[j+6] = avctx->coded_height & 0xFF;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2267
diff changeset
2375 recoded[j+7] = (avctx->coded_width >> 8) & 0xFF;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2267
diff changeset
2376 recoded[j+8] = avctx->coded_width & 0xFF;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2377 j += sizeof(sp5x_data_sof);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2378
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2379 memcpy(recoded+j, &sp5x_data_sos[0], sizeof(sp5x_data_sos));
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2380 j += sizeof(sp5x_data_sos);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2381
1548
dd544554ed42 AVRational
michael
parents: 1530
diff changeset
2382 for (i = 14; i < buf_size && j < buf_size+1024-2; i++)
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2383 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2384 recoded[j++] = buf[i];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2385 if (buf[i] == 0xff)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2386 recoded[j++] = 0;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2387 }
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2388
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2389 /* EOI */
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2390 recoded[j++] = 0xFF;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2391 recoded[j++] = 0xD9;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2392
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2393 i = mjpeg_decode_frame(avctx, data, data_size, recoded, j);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2394
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2395 av_free(recoded);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2396
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2397 #else
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2398 /* SOF */
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2399 s->bits = 8;
2270
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2267
diff changeset
2400 s->width = avctx->coded_width;
21f450be6cb5 lowres width/height cleanup 3rd try
michael
parents: 2267
diff changeset
2401 s->height = avctx->coded_height;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2402 s->nb_components = 3;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2403 s->component_id[0] = 0;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2404 s->h_count[0] = 2;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2405 s->v_count[0] = 2;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2406 s->quant_index[0] = 0;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2407 s->component_id[1] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2408 s->h_count[1] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2409 s->v_count[1] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2410 s->quant_index[1] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2411 s->component_id[2] = 2;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2412 s->h_count[2] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2413 s->v_count[2] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2414 s->quant_index[2] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2415 s->h_max = 2;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2416 s->v_max = 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2417
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2418 s->qscale_table = av_mallocz((s->width+15)/16);
2442
ba01b8552bd4 jpeg style yuv fixes
michael
parents: 2422
diff changeset
2419 avctx->pix_fmt = s->cs_itu601 ? PIX_FMT_YUV420P : PIX_FMT_YUVJ420;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2420 s->interlaced = 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2421
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2422 s->picture.reference = 0;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2423 if (avctx->get_buffer(avctx, &s->picture) < 0)
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2424 {
2846
40765c51a7a9 Compilation fixes part 1 patch by (Arvind R. and Burkhard Plaum, plaum, ipf uni-stuttgart de)
michael
parents: 2802
diff changeset
2425 av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2426 return -1;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2427 }
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2428
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2429 s->picture.pict_type = I_TYPE;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2430 s->picture.key_frame = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2431
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2432 for (i = 0; i < 3; i++)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2433 s->linesize[i] = s->picture.linesize[i] << s->interlaced;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2434
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2435 /* DQT */
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2436 for (i = 0; i < 64; i++)
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2437 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2438 j = s->scantable.permutated[i];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2439 s->quant_matrixes[0][j] = sp5x_quant_table[(qscale * 2) + i];
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2440 }
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2441 s->qscale[0] = FFMAX(
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2442 s->quant_matrixes[0][s->scantable.permutated[1]],
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2443 s->quant_matrixes[0][s->scantable.permutated[8]]) >> 1;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2444
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2445 for (i = 0; i < 64; i++)
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2446 {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2447 j = s->scantable.permutated[i];
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2448 s->quant_matrixes[1][j] = sp5x_quant_table[(qscale * 2) + 1 + i];
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2449 }
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2450 s->qscale[1] = FFMAX(
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2451 s->quant_matrixes[1][s->scantable.permutated[1]],
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2452 s->quant_matrixes[1][s->scantable.permutated[8]]) >> 1;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2453
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2454 /* DHT */
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2455
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2456 /* SOS */
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2457 s->comp_index[0] = 0;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2458 s->nb_blocks[0] = s->h_count[0] * s->v_count[0];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2459 s->h_scount[0] = s->h_count[0];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2460 s->v_scount[0] = s->v_count[0];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2461 s->dc_index[0] = 0;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2462 s->ac_index[0] = 0;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2463
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2464 s->comp_index[1] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2465 s->nb_blocks[1] = s->h_count[1] * s->v_count[1];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2466 s->h_scount[1] = s->h_count[1];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2467 s->v_scount[1] = s->v_count[1];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2468 s->dc_index[1] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2469 s->ac_index[1] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2470
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2471 s->comp_index[2] = 2;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2472 s->nb_blocks[2] = s->h_count[2] * s->v_count[2];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2473 s->h_scount[2] = s->h_count[2];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2474 s->v_scount[2] = s->v_count[2];
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2475 s->dc_index[2] = 1;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2476 s->ac_index[2] = 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2477
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2478 for (i = 0; i < 3; i++)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2976
diff changeset
2479 s->last_dc[i] = 1024;
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2480
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2481 s->mb_width = (s->width * s->h_max * 8 -1) / (s->h_max * 8);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2482 s->mb_height = (s->height * s->v_max * 8 -1) / (s->v_max * 8);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2483
1560
alex
parents: 1548
diff changeset
2484 init_get_bits(&s->gb, buf+14, (buf_size-14)*8);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2485
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2486 return mjpeg_decode_scan(s);
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2487 #endif
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2488
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2489 return i;
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2490 }
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2491
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2492 static int mjpeg_decode_end(AVCodecContext *avctx)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2493 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2494 MJpegDecodeContext *s = avctx->priv_data;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2495 int i, j;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2496
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2497 av_free(s->buffer);
1358
a6b92de6a9fc postprocessing support
michaelni
parents: 1351
diff changeset
2498 av_free(s->qscale_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2885
diff changeset
2499
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2500 for(i=0;i<2;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2501 for(j=0;j<4;j++)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2502 free_vlc(&s->vlcs[i][j]);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2503 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2504 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2505 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2506
4252
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2507 static int mjpega_dump_header(AVBitStreamFilterContext *bsfc, AVCodecContext *avctx, const char *args,
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2508 uint8_t **poutbuf, int *poutbuf_size,
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2509 const uint8_t *buf, int buf_size, int keyframe)
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2510 {
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2511 uint8_t *poutbufp;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2512 int i;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2513
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2514 if (avctx->codec_id != CODEC_ID_MJPEG) {
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2515 av_log(avctx, AV_LOG_ERROR, "mjpega bitstream filter only applies to mjpeg codec\n");
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2516 return 0;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2517 }
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2518
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2519 *poutbuf_size = 0;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2520 *poutbuf = av_malloc(buf_size + 44 + FF_INPUT_BUFFER_PADDING_SIZE);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2521 poutbufp = *poutbuf;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2522 bytestream_put_byte(&poutbufp, 0xff);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2523 bytestream_put_byte(&poutbufp, SOI);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2524 bytestream_put_byte(&poutbufp, 0xff);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2525 bytestream_put_byte(&poutbufp, APP1);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2526 bytestream_put_be16(&poutbufp, 42); /* size */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2527 bytestream_put_be32(&poutbufp, 0);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2528 bytestream_put_buffer(&poutbufp, "mjpg", 4);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2529 bytestream_put_be32(&poutbufp, buf_size + 44); /* field size */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2530 bytestream_put_be32(&poutbufp, buf_size + 44); /* pad field size */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2531 bytestream_put_be32(&poutbufp, 0); /* next ptr */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2532
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2533 for (i = 0; i < buf_size - 1; i++) {
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2534 if (buf[i] == 0xff) {
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2535 switch (buf[i + 1]) {
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2536 case DQT: /* quant off */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2537 case DHT: /* huff off */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2538 case SOF0: /* image off */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2539 bytestream_put_be32(&poutbufp, i + 46);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2540 break;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2541 case SOS:
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2542 bytestream_put_be32(&poutbufp, i + 46); /* scan off */
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4252
diff changeset
2543 bytestream_put_be32(&poutbufp, i + 46 + AV_RB16(buf + i + 2)); /* data off */
4252
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2544 bytestream_put_buffer(&poutbufp, buf + 2, buf_size - 2); /* skip already written SOI */
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2545 *poutbuf_size = poutbufp - *poutbuf;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2546 return 1;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2547 case APP1:
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4252
diff changeset
2548 if (i + 8 < buf_size && AV_RL32(buf + i + 8) == ff_get_fourcc("mjpg")) {
4252
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2549 av_log(avctx, AV_LOG_ERROR, "bitstream already formatted\n");
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2550 memcpy(*poutbuf, buf, buf_size);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2551 *poutbuf_size = buf_size;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2552 return 1;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2553 }
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2554 }
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2555 }
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2556 }
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2557 av_freep(poutbuf);
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2558 av_log(avctx, AV_LOG_ERROR, "could not find SOS marker in bitstream\n");
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2559 return 0;
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2560 }
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2561
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2562 AVCodec mjpeg_decoder = {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2563 "mjpeg",
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2564 CODEC_TYPE_VIDEO,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2565 CODEC_ID_MJPEG,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2566 sizeof(MJpegDecodeContext),
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2567 mjpeg_decode_init,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2568 NULL,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2569 mjpeg_decode_end,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2570 mjpeg_decode_frame,
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
2571 CODEC_CAP_DR1,
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
2572 NULL
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2573 };
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2574
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2575 AVCodec mjpegb_decoder = {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2576 "mjpegb",
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2577 CODEC_TYPE_VIDEO,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2578 CODEC_ID_MJPEGB,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2579 sizeof(MJpegDecodeContext),
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2580 mjpeg_decode_init,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2581 NULL,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2582 mjpeg_decode_end,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2583 mjpegb_decode_frame,
1513
67069cb78a39 recommit of
michael
parents: 1505
diff changeset
2584 CODEC_CAP_DR1,
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2585 NULL
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2586 };
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2587
1519
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2588 AVCodec sp5x_decoder = {
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2589 "sp5x",
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2590 CODEC_TYPE_VIDEO,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2591 CODEC_ID_SP5X,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2592 sizeof(MJpegDecodeContext),
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2593 mjpeg_decode_init,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2594 NULL,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2595 mjpeg_decode_end,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2596 sp5x_decode_frame,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2597 CODEC_CAP_DR1,
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2598 NULL
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2599 };
b44267fc5ec4 Sunplus JPEG codec (SP5X) support
alex
parents: 1513
diff changeset
2600
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1322
diff changeset
2601 #ifdef CONFIG_ENCODERS
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2602 AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2603 "ljpeg",
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2604 CODEC_TYPE_VIDEO,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2605 CODEC_ID_LJPEG,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2606 sizeof(MpegEncContext),
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2607 MPV_encode_init,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2608 encode_picture_lossless,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2609 MPV_encode_end,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2610 };
1325
1cbc2380d172 CONFIG_ENCODERS cleanup
michaelni
parents: 1322
diff changeset
2611 #endif
2319
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2612
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2613 AVCodecParser mjpeg_parser = {
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2614 { CODEC_ID_MJPEG },
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2615 sizeof(ParseContext),
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2616 NULL,
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2617 jpeg_parse,
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2618 ff_parse_close,
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2619 };
f9f257b41ec2 mjpeg parser
michael
parents: 2270
diff changeset
2620
4252
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2621 AVBitStreamFilter mjpega_dump_header_bsf = {
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2622 "mjpegadump",
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2623 0,
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2624 mjpega_dump_header,
daaebca81d86 mjpeg a dump header bitstream filter, modifies bitstream to be decoded by quicktime
bcoudurier
parents: 4222
diff changeset
2625 };