annotate mjpeg.c @ 5003:ddb28de352bb libavcodec

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