annotate mjpeg.c @ 1321:2365b4dfc450 libavcodec

don't step on the context
author tmmm
date Fri, 20 Jun 2003 02:38:29 +0000
parents 6696d3bf4ff2
children f78341ab5fba
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2 * MJPEG encoder and decoder
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
3 * Copyright (c) 2000, 2001 Fabrice Bellard.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
5 * This library is free software; you can redistribute it and/or
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
6 * modify it under the terms of the GNU Lesser General Public
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
7 * License as published by the Free Software Foundation; either
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
8 * version 2 of the License, or (at your option) any later version.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
10 * This library is distributed in the hope that it will be useful,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
13 * Lesser General Public License for more details.
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
15 * You should have received a copy of the GNU Lesser General Public
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
16 * License along with this library; if not, write to the Free Software
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
18 *
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
19 * Support for external huffman table, various fixes (AVID workaround),
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
20 * aspecting, new decode_frame mechanism and apple mjpeg-b support
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
21 * by Alex Beregszaszi <alex@naxine.org>
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
22 */
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
23
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
24 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
25 * @file mjpeg.c
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
26 * MJPEG encoder and decoder.
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
27 */
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
28
776
al3x
parents: 775
diff changeset
29 //#define DEBUG
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
30 #include <assert.h>
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
31
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
32 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
33 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
35
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
36 /* 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
37 /* not yet working */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
38 #undef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
39
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 typedef struct MJpegContext {
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
41 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
42 uint16_t huff_code_dc_luminance[12];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
43 uint8_t huff_size_dc_chrominance[12];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
44 uint16_t huff_code_dc_chrominance[12];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
45
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
46 uint8_t huff_size_ac_luminance[256];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
47 uint16_t huff_code_ac_luminance[256];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
48 uint8_t huff_size_ac_chrominance[256];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
49 uint16_t huff_code_ac_chrominance[256];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
50 } MJpegContext;
986e461dc072 Initial revision
glantau
parents:
diff changeset
51
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
52 /* JPEG marker codes */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
53 typedef enum {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
54 /* start of frame */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
55 SOF0 = 0xc0, /* baseline */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
56 SOF1 = 0xc1, /* extended sequential, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
57 SOF2 = 0xc2, /* progressive, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
58 SOF3 = 0xc3, /* lossless, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
59
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
60 SOF5 = 0xc5, /* differential sequential, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
61 SOF6 = 0xc6, /* differential progressive, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
62 SOF7 = 0xc7, /* differential lossless, huffman */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
63 JPG = 0xc8, /* reserved for JPEG extension */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
64 SOF9 = 0xc9, /* extended sequential, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
65 SOF10 = 0xca, /* progressive, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
66 SOF11 = 0xcb, /* lossless, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
67
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
68 SOF13 = 0xcd, /* differential sequential, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
69 SOF14 = 0xce, /* differential progressive, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
70 SOF15 = 0xcf, /* differential lossless, arithmetic */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
71
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
72 DHT = 0xc4, /* define huffman tables */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
73
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
74 DAC = 0xcc, /* define arithmetic-coding conditioning */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
75
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
76 /* restart with modulo 8 count "m" */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
77 RST0 = 0xd0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
78 RST1 = 0xd1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
79 RST2 = 0xd2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
80 RST3 = 0xd3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
81 RST4 = 0xd4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
82 RST5 = 0xd5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
83 RST6 = 0xd6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
84 RST7 = 0xd7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
85
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
86 SOI = 0xd8, /* start of image */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
87 EOI = 0xd9, /* end of image */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
88 SOS = 0xda, /* start of scan */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
89 DQT = 0xdb, /* define quantization tables */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
90 DNL = 0xdc, /* define number of lines */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
91 DRI = 0xdd, /* define restart interval */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
92 DHP = 0xde, /* define hierarchical progression */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
93 EXP = 0xdf, /* expand reference components */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
94
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
95 APP0 = 0xe0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
96 APP1 = 0xe1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
97 APP2 = 0xe2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
98 APP3 = 0xe3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
99 APP4 = 0xe4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
100 APP5 = 0xe5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
101 APP6 = 0xe6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
102 APP7 = 0xe7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
103 APP8 = 0xe8,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
104 APP9 = 0xe9,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
105 APP10 = 0xea,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
106 APP11 = 0xeb,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
107 APP12 = 0xec,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
108 APP13 = 0xed,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
109 APP14 = 0xee,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
110 APP15 = 0xef,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
111
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
112 JPG0 = 0xf0,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
113 JPG1 = 0xf1,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
114 JPG2 = 0xf2,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
115 JPG3 = 0xf3,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
116 JPG4 = 0xf4,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
117 JPG5 = 0xf5,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
118 JPG6 = 0xf6,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
119 JPG7 = 0xf7,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
120 JPG8 = 0xf8,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
121 JPG9 = 0xf9,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
122 JPG10 = 0xfa,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
123 JPG11 = 0xfb,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
124 JPG12 = 0xfc,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
125 JPG13 = 0xfd,
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
126
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
127 COM = 0xfe, /* comment */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
128
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
129 TEM = 0x01, /* temporary private use for arithmetic coding */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
130
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
131 /* 0x02 -> 0xbf reserved */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
132 } JPEG_MARKER;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
133
986e461dc072 Initial revision
glantau
parents:
diff changeset
134 #if 0
986e461dc072 Initial revision
glantau
parents:
diff changeset
135 /* These are the sample quantization tables given in JPEG spec section K.1.
986e461dc072 Initial revision
glantau
parents:
diff changeset
136 * The spec says that the values given produce "good" quality, and
986e461dc072 Initial revision
glantau
parents:
diff changeset
137 * when divided by 2, "very good" quality.
986e461dc072 Initial revision
glantau
parents:
diff changeset
138 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
139 static const unsigned char std_luminance_quant_tbl[64] = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 16, 11, 10, 16, 24, 40, 51, 61,
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 12, 12, 14, 19, 26, 58, 60, 55,
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 14, 13, 16, 24, 40, 57, 69, 56,
986e461dc072 Initial revision
glantau
parents:
diff changeset
143 14, 17, 22, 29, 51, 87, 80, 62,
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 18, 22, 37, 56, 68, 109, 103, 77,
986e461dc072 Initial revision
glantau
parents:
diff changeset
145 24, 35, 55, 64, 81, 104, 113, 92,
986e461dc072 Initial revision
glantau
parents:
diff changeset
146 49, 64, 78, 87, 103, 121, 120, 101,
986e461dc072 Initial revision
glantau
parents:
diff changeset
147 72, 92, 95, 98, 112, 100, 103, 99
986e461dc072 Initial revision
glantau
parents:
diff changeset
148 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
149 static const unsigned char std_chrominance_quant_tbl[64] = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
150 17, 18, 24, 47, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 18, 21, 26, 66, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
152 24, 26, 56, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
153 47, 66, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
155 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 99, 99, 99, 99, 99, 99, 99, 99,
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 99, 99, 99, 99, 99, 99, 99, 99
986e461dc072 Initial revision
glantau
parents:
diff changeset
158 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
160
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 /* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 /* IMPORTANT: these are only valid for 8-bit data precision! */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
163 static const uint8_t bits_dc_luminance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
164 { /* 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
165 static const uint8_t val_dc_luminance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
166 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
167
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
168 static const uint8_t bits_dc_chrominance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
169 { /* 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
170 static const uint8_t val_dc_chrominance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
172
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
173 static const uint8_t bits_ac_luminance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
174 { /* 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
175 static const uint8_t val_ac_luminance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
176 { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
986e461dc072 Initial revision
glantau
parents:
diff changeset
178 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
986e461dc072 Initial revision
glantau
parents:
diff changeset
185 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
986e461dc072 Initial revision
glantau
parents:
diff changeset
186 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
986e461dc072 Initial revision
glantau
parents:
diff changeset
187 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
986e461dc072 Initial revision
glantau
parents:
diff changeset
188 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
986e461dc072 Initial revision
glantau
parents:
diff changeset
189 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
986e461dc072 Initial revision
glantau
parents:
diff changeset
190 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
986e461dc072 Initial revision
glantau
parents:
diff changeset
191 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
986e461dc072 Initial revision
glantau
parents:
diff changeset
192 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
986e461dc072 Initial revision
glantau
parents:
diff changeset
193 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
986e461dc072 Initial revision
glantau
parents:
diff changeset
196 0xf9, 0xfa
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
198
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
199 static const uint8_t bits_ac_chrominance[17] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 { /* 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
201
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
202 static const uint8_t val_ac_chrominance[] =
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
986e461dc072 Initial revision
glantau
parents:
diff changeset
213 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
986e461dc072 Initial revision
glantau
parents:
diff changeset
215 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
986e461dc072 Initial revision
glantau
parents:
diff changeset
216 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
986e461dc072 Initial revision
glantau
parents:
diff changeset
217 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
986e461dc072 Initial revision
glantau
parents:
diff changeset
218 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
986e461dc072 Initial revision
glantau
parents:
diff changeset
220 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
986e461dc072 Initial revision
glantau
parents:
diff changeset
222 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 0xf9, 0xfa
986e461dc072 Initial revision
glantau
parents:
diff changeset
224 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
225
986e461dc072 Initial revision
glantau
parents:
diff changeset
226 /* isn't this function nicer than the one in the libjpeg ? */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
227 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
228 const uint8_t *bits_table, const uint8_t *val_table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
229 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
230 int i, j, k,nb, code, sym;
986e461dc072 Initial revision
glantau
parents:
diff changeset
231
986e461dc072 Initial revision
glantau
parents:
diff changeset
232 code = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
233 k = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
234 for(i=1;i<=16;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
235 nb = bits_table[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 for(j=0;j<nb;j++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
237 sym = val_table[k++];
986e461dc072 Initial revision
glantau
parents:
diff changeset
238 huff_size[sym] = i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
239 huff_code[sym] = code;
986e461dc072 Initial revision
glantau
parents:
diff changeset
240 code++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
242 code <<= 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
243 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
244 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
245
986e461dc072 Initial revision
glantau
parents:
diff changeset
246 int mjpeg_init(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
247 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
248 MJpegContext *m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
249
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
250 m = av_malloc(sizeof(MJpegContext));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
251 if (!m)
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 return -1;
344
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
253
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
254 s->min_qcoeff=-1023;
9f6071a87e17 fixed msmpeg4 infinite loop if buggy stream
michaelni
parents: 234
diff changeset
255 s->max_qcoeff= 1023;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
256
986e461dc072 Initial revision
glantau
parents:
diff changeset
257 /* build all the huffman tables */
986e461dc072 Initial revision
glantau
parents:
diff changeset
258 build_huffman_codes(m->huff_size_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
259 m->huff_code_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 bits_dc_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
261 val_dc_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 build_huffman_codes(m->huff_size_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 m->huff_code_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 bits_dc_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
265 val_dc_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
266 build_huffman_codes(m->huff_size_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
267 m->huff_code_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 bits_ac_luminance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
269 val_ac_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
270 build_huffman_codes(m->huff_size_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
271 m->huff_code_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 bits_ac_chrominance,
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 val_ac_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
274
986e461dc072 Initial revision
glantau
parents:
diff changeset
275 s->mjpeg_ctx = m;
986e461dc072 Initial revision
glantau
parents:
diff changeset
276 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
277 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
278
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 void mjpeg_close(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
280 {
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
281 av_free(s->mjpeg_ctx);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
282 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
283
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
284 #define PREDICT(ret, topleft, top, left, predictor)\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
285 switch(predictor){\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
286 case 1: ret= left; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
287 case 2: ret= top; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
288 case 3: ret= topleft; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
289 case 4: ret= left + top - topleft; break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
290 case 5: ret= left + ((top - topleft)>>1); break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
291 case 6: ret= top + ((left - topleft)>>1); break;\
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
292 case 7: ret= (left + top)>>1; break;\
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
293 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
294
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
295 static inline void put_marker(PutBitContext *p, int code)
986e461dc072 Initial revision
glantau
parents:
diff changeset
296 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
297 put_bits(p, 8, 0xff);
986e461dc072 Initial revision
glantau
parents:
diff changeset
298 put_bits(p, 8, code);
986e461dc072 Initial revision
glantau
parents:
diff changeset
299 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
300
986e461dc072 Initial revision
glantau
parents:
diff changeset
301 /* table_class: 0 = DC coef, 1 = AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
302 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
303 const uint8_t *bits_table, const uint8_t *value_table)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
304 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 PutBitContext *p = &s->pb;
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 int n, i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
307
986e461dc072 Initial revision
glantau
parents:
diff changeset
308 put_bits(p, 4, table_class);
986e461dc072 Initial revision
glantau
parents:
diff changeset
309 put_bits(p, 4, table_id);
986e461dc072 Initial revision
glantau
parents:
diff changeset
310
986e461dc072 Initial revision
glantau
parents:
diff changeset
311 n = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
312 for(i=1;i<=16;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
313 n += bits_table[i];
986e461dc072 Initial revision
glantau
parents:
diff changeset
314 put_bits(p, 8, bits_table[i]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
315 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
316
986e461dc072 Initial revision
glantau
parents:
diff changeset
317 for(i=0;i<n;i++)
986e461dc072 Initial revision
glantau
parents:
diff changeset
318 put_bits(p, 8, value_table[i]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
319
986e461dc072 Initial revision
glantau
parents:
diff changeset
320 return n + 17;
986e461dc072 Initial revision
glantau
parents:
diff changeset
321 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
322
986e461dc072 Initial revision
glantau
parents:
diff changeset
323 static void jpeg_table_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
324 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
325 PutBitContext *p = &s->pb;
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
326 int i, j, size;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
327 uint8_t *ptr;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
328
986e461dc072 Initial revision
glantau
parents:
diff changeset
329 /* quant matrixes */
986e461dc072 Initial revision
glantau
parents:
diff changeset
330 put_marker(p, DQT);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
331 #ifdef TWOMATRIXES
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
332 put_bits(p, 16, 2 + 2 * (1 + 64));
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
333 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 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
335 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
336 put_bits(p, 4, 0); /* 8 bit precision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
337 put_bits(p, 4, 0); /* table 0 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
338 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
339 j = s->intra_scantable.permutated[i];
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
340 put_bits(p, 8, s->intra_matrix[j]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
341 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
342 #ifdef TWOMATRIXES
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 put_bits(p, 4, 0); /* 8 bit precision */
986e461dc072 Initial revision
glantau
parents:
diff changeset
344 put_bits(p, 4, 1); /* table 1 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
345 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
346 j = s->intra_scantable.permutated[i];
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
347 put_bits(p, 8, s->chroma_intra_matrix[j]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
348 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
349 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
350
986e461dc072 Initial revision
glantau
parents:
diff changeset
351 /* huffman table */
986e461dc072 Initial revision
glantau
parents:
diff changeset
352 put_marker(p, DHT);
986e461dc072 Initial revision
glantau
parents:
diff changeset
353 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
354 ptr = pbBufPtr(p);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
355 put_bits(p, 16, 0); /* patched later */
986e461dc072 Initial revision
glantau
parents:
diff changeset
356 size = 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
359
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance);
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 ptr[0] = size >> 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
363 ptr[1] = size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
365
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
366 static void jpeg_put_comments(MpegEncContext *s)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
367 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
368 PutBitContext *p = &s->pb;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
369 int size;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
370 uint8_t *ptr;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
371
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
372 if (s->aspect_ratio_info /* && !lossless */)
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
373 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
374 /* JFIF header */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
375 put_marker(p, APP0);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
376 put_bits(p, 16, 16);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
377 put_string(p, "JFIF"); /* this puts the trailing zero-byte too */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
378 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
379 put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
380 switch(s->aspect_ratio_info)
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
381 {
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
382 case FF_ASPECT_4_3_625:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
383 case FF_ASPECT_4_3_525:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
384 put_bits(p, 16, 4);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
385 put_bits(p, 16, 3);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
386 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
387 case FF_ASPECT_16_9_625:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
388 case FF_ASPECT_16_9_525:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
389 put_bits(p, 16, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
390 put_bits(p, 16, 9);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
391 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
392 case FF_ASPECT_EXTENDED:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
393 put_bits(p, 16, s->aspected_width);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
394 put_bits(p, 16, s->aspected_height);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
395 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
396 case FF_ASPECT_SQUARE:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
397 default:
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
398 put_bits(p, 16, 1); /* aspect: 1:1 */
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
399 put_bits(p, 16, 1);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
400 break;
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
401 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
402 put_bits(p, 8, 0); /* thumbnail width */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
403 put_bits(p, 8, 0); /* thumbnail height */
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
404 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
405
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
406 /* comment */
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1064
diff changeset
407 if(!(s->flags & CODEC_FLAG_BITEXACT)){
676
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
408 put_marker(p, COM);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
409 flush_put_bits(p);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
410 ptr = pbBufPtr(p);
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
411 put_bits(p, 16, 0); /* patched later */
1118
8248e652d64e simplified
al3x
parents: 1106
diff changeset
412 put_string(p, LIBAVCODEC_IDENT);
8248e652d64e simplified
al3x
parents: 1106
diff changeset
413 size = strlen(LIBAVCODEC_IDENT)+3;
676
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
414 ptr[0] = size >> 8;
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
415 ptr[1] = size;
c3bdb00a98a9 dont store version for bit-exact tests
michaelni
parents: 672
diff changeset
416 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
417 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
418
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
419 void mjpeg_picture_header(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
420 {
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
421 const int lossless= s->avctx->codec_id == CODEC_ID_LJPEG;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
422
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
423 put_marker(&s->pb, SOI);
986e461dc072 Initial revision
glantau
parents:
diff changeset
424
370
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
425 if (!s->mjpeg_data_only_frames)
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
426 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
427 jpeg_put_comments(s);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
428
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
429 if (s->mjpeg_write_tables) jpeg_table_header(s);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
430
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
431 put_marker(&s->pb, lossless ? SOF3 : SOF0);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
432
986e461dc072 Initial revision
glantau
parents:
diff changeset
433 put_bits(&s->pb, 16, 17);
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
434 if(lossless && s->avctx->pix_fmt == PIX_FMT_RGBA32)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
435 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
436 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
437 put_bits(&s->pb, 8, 8); /* 8 bits/component */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
438 put_bits(&s->pb, 16, s->height);
986e461dc072 Initial revision
glantau
parents:
diff changeset
439 put_bits(&s->pb, 16, s->width);
986e461dc072 Initial revision
glantau
parents:
diff changeset
440 put_bits(&s->pb, 8, 3); /* 3 components */
986e461dc072 Initial revision
glantau
parents:
diff changeset
441
986e461dc072 Initial revision
glantau
parents:
diff changeset
442 /* Y component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
443 put_bits(&s->pb, 8, 1); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
444 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
445 put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
446 put_bits(&s->pb, 8, 0); /* select matrix */
986e461dc072 Initial revision
glantau
parents:
diff changeset
447
986e461dc072 Initial revision
glantau
parents:
diff changeset
448 /* Cb component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
449 put_bits(&s->pb, 8, 2); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
450 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
451 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
452 #ifdef TWOMATRIXES
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
453 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
454 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
455 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
456 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
457
986e461dc072 Initial revision
glantau
parents:
diff changeset
458 /* Cr component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
459 put_bits(&s->pb, 8, 3); /* component number */
229
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
460 put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */
f418b5c5ff67 PATCH by Rik Snel <rsnel@cube.dyndns.org>
arpi_esp
parents: 226
diff changeset
461 put_bits(&s->pb, 4, s->mjpeg_vsample[2]); /* V factor */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
462 #ifdef TWOMATRIXES
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
463 put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
464 #else
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
465 put_bits(&s->pb, 8, 0); /* select matrix */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
466 #endif
370
0eca28d16cbd clamp intra matrix to 8bit for mjpeg (workaround for qscale>=25)
al3x
parents: 369
diff changeset
467 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
468
986e461dc072 Initial revision
glantau
parents:
diff changeset
469 /* scan header */
986e461dc072 Initial revision
glantau
parents:
diff changeset
470 put_marker(&s->pb, SOS);
986e461dc072 Initial revision
glantau
parents:
diff changeset
471 put_bits(&s->pb, 16, 12); /* length */
986e461dc072 Initial revision
glantau
parents:
diff changeset
472 put_bits(&s->pb, 8, 3); /* 3 components */
986e461dc072 Initial revision
glantau
parents:
diff changeset
473
986e461dc072 Initial revision
glantau
parents:
diff changeset
474 /* Y component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
475 put_bits(&s->pb, 8, 1); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
476 put_bits(&s->pb, 4, 0); /* DC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
477 put_bits(&s->pb, 4, 0); /* AC huffman table index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
478
986e461dc072 Initial revision
glantau
parents:
diff changeset
479 /* Cb component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
480 put_bits(&s->pb, 8, 2); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
481 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
482 put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
483
986e461dc072 Initial revision
glantau
parents:
diff changeset
484 /* Cr component */
986e461dc072 Initial revision
glantau
parents:
diff changeset
485 put_bits(&s->pb, 8, 3); /* index */
986e461dc072 Initial revision
glantau
parents:
diff changeset
486 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
487 put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
488
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
489 put_bits(&s->pb, 8, lossless ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
490 put_bits(&s->pb, 8, lossless ? 0 : 63); /* Se (not used) */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
491 put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
492 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
493
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
494 static void escape_FF(MpegEncContext *s, int start)
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
495 {
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
496 int size= get_bit_count(&s->pb) - start*8;
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
497 int i, ff_count;
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
498 uint8_t *buf= s->pb.buf + start;
1266
ec946cb74397 Warning fixes.
mellum
parents: 1150
diff changeset
499 int align= (-(size_t)(buf))&3;
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
500
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
501 assert((size&7) == 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
502 size >>= 3;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
503
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
504 ff_count=0;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
505 for(i=0; i<size && i<align; i++){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
506 if(buf[i]==0xFF) ff_count++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
507 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
508 for(; i<size-15; i+=16){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
509 int acc, v;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
510
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
511 v= *(uint32_t*)(&buf[i]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
512 acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
513 v= *(uint32_t*)(&buf[i+4]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
514 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
515 v= *(uint32_t*)(&buf[i+8]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
516 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
517 v= *(uint32_t*)(&buf[i+12]);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
518 acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
519
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
520 acc>>=4;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
521 acc+= (acc>>16);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
522 acc+= (acc>>8);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
523 ff_count+= acc&0xFF;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
524 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
525 for(; i<size; i++){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
526 if(buf[i]==0xFF) ff_count++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
527 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
528
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
529 if(ff_count==0) return;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
530
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
531 /* skip put bits */
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
532 for(i=0; i<ff_count-3; i+=4)
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
533 put_bits(&s->pb, 32, 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
534 put_bits(&s->pb, (ff_count-i)*8, 0);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
535 flush_put_bits(&s->pb);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
536
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
537 for(i=size-1; ff_count; i--){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
538 int v= buf[i];
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
539
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
540 if(v==0xFF){
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
541 //printf("%d %d\n", i, ff_count);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
542 buf[i+ff_count]= 0;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
543 ff_count--;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
544 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
545
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
546 buf[i+ff_count]= v;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
547 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
548 }
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
549
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
550 void mjpeg_picture_trailer(MpegEncContext *s)
986e461dc072 Initial revision
glantau
parents:
diff changeset
551 {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
552 int pad= (-get_bit_count(&s->pb))&7;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
553
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
554 put_bits(&s->pb, pad,0xFF>>(8-pad));
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
555 flush_put_bits(&s->pb);
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
556
841
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
557 assert((s->header_bits&7)==0);
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
558
4033915880d9 cleanup
michaelni
parents: 840
diff changeset
559 escape_FF(s, s->header_bits>>3);
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
560
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
561 put_marker(&s->pb, EOI);
986e461dc072 Initial revision
glantau
parents:
diff changeset
562 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
563
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
564 static inline void mjpeg_encode_dc(MpegEncContext *s, int val,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
565 uint8_t *huff_size, uint16_t *huff_code)
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
566 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
567 int mant, nbits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
568
986e461dc072 Initial revision
glantau
parents:
diff changeset
569 if (val == 0) {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
570 put_bits(&s->pb, huff_size[0], huff_code[0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
571 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
572 mant = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
573 if (val < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
574 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
575 mant--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
576 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
577
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
578 nbits= av_log2(val) + 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
579
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
580 put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
581
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
582 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
583 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
584 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
585
986e461dc072 Initial revision
glantau
parents:
diff changeset
586 static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
986e461dc072 Initial revision
glantau
parents:
diff changeset
587 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
588 int mant, nbits, code, i, j;
986e461dc072 Initial revision
glantau
parents:
diff changeset
589 int component, dc, run, last_index, val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
590 MJpegContext *m = s->mjpeg_ctx;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
591 uint8_t *huff_size_ac;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
592 uint16_t *huff_code_ac;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
593
986e461dc072 Initial revision
glantau
parents:
diff changeset
594 /* DC coef */
986e461dc072 Initial revision
glantau
parents:
diff changeset
595 component = (n <= 3 ? 0 : n - 4 + 1);
986e461dc072 Initial revision
glantau
parents:
diff changeset
596 dc = block[0]; /* overflow is impossible */
986e461dc072 Initial revision
glantau
parents:
diff changeset
597 val = dc - s->last_dc[component];
986e461dc072 Initial revision
glantau
parents:
diff changeset
598 if (n < 4) {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
599 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
600 huff_size_ac = m->huff_size_ac_luminance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
601 huff_code_ac = m->huff_code_ac_luminance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
602 } else {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
603 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
604 huff_size_ac = m->huff_size_ac_chrominance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
605 huff_code_ac = m->huff_code_ac_chrominance;
986e461dc072 Initial revision
glantau
parents:
diff changeset
606 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
607 s->last_dc[component] = dc;
986e461dc072 Initial revision
glantau
parents:
diff changeset
608
986e461dc072 Initial revision
glantau
parents:
diff changeset
609 /* AC coefs */
986e461dc072 Initial revision
glantau
parents:
diff changeset
610
986e461dc072 Initial revision
glantau
parents:
diff changeset
611 run = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
612 last_index = s->block_last_index[n];
986e461dc072 Initial revision
glantau
parents:
diff changeset
613 for(i=1;i<=last_index;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
614 j = s->intra_scantable.permutated[i];
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
615 val = block[j];
986e461dc072 Initial revision
glantau
parents:
diff changeset
616 if (val == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
617 run++;
986e461dc072 Initial revision
glantau
parents:
diff changeset
618 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
619 while (run >= 16) {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
620 put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
621 run -= 16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
622 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
623 mant = val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
624 if (val < 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
625 val = -val;
986e461dc072 Initial revision
glantau
parents:
diff changeset
626 mant--;
986e461dc072 Initial revision
glantau
parents:
diff changeset
627 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
628
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
629 nbits= av_log2(val) + 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
630 code = (run << 4) | nbits;
986e461dc072 Initial revision
glantau
parents:
diff changeset
631
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
632 put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
633
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
634 put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
635 run = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
636 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
637 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
638
986e461dc072 Initial revision
glantau
parents:
diff changeset
639 /* output EOB only if not already 64 values */
986e461dc072 Initial revision
glantau
parents:
diff changeset
640 if (last_index < 63 || run != 0)
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
641 put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
642 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
643
986e461dc072 Initial revision
glantau
parents:
diff changeset
644 void mjpeg_encode_mb(MpegEncContext *s,
986e461dc072 Initial revision
glantau
parents:
diff changeset
645 DCTELEM block[6][64])
986e461dc072 Initial revision
glantau
parents:
diff changeset
646 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
647 int i;
986e461dc072 Initial revision
glantau
parents:
diff changeset
648 for(i=0;i<6;i++) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
649 encode_block(s, block[i], i);
986e461dc072 Initial revision
glantau
parents:
diff changeset
650 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
651 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
652
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
653 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
654 MpegEncContext * const s = avctx->priv_data;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
655 MJpegContext * const m = s->mjpeg_ctx;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
656 AVFrame *pict = data;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
657 const int width= s->width;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
658 const int height= s->height;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
659 AVFrame * const p= (AVFrame*)&s->current_picture;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
660 const int predictor= avctx->prediction_method+1;
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 init_put_bits(&s->pb, buf, buf_size, NULL, NULL);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
663
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
664 *p = *pict;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
665 p->pict_type= FF_I_TYPE;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
666 p->key_frame= 1;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
667
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
668 mjpeg_picture_header(s);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
669
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
670 s->header_bits= get_bit_count(&s->pb);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
671
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
672 if(avctx->pix_fmt == PIX_FMT_RGBA32){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
673 int x, y, i;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
674 const int linesize= p->linesize[0];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
675 uint16_t buffer[2048][4];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
676 int left[3], top[3], topleft[3];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
677
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
678 for(i=0; i<3; i++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
679 buffer[0][i]= 1 << (9 - 1);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
680 }
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 < height; y++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
683 const int modified_predictor= y ? 1 : predictor;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
684 uint8_t *ptr = p->data[0] + (linesize * y);
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 for(i=0; i<3; i++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
687 top[i]= left[i]= topleft[i]= buffer[0][i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
688 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
689 for(x = 0; x < width; x++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
690 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
691 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
692 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
693
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
694 for(i=0;i<3;i++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
695 int pred, diff;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
696
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
697 PREDICT(pred, topleft[i], top[i], left[i], modified_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 topleft[i]= top[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
700 top[i]= buffer[x+1][i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
701
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
702 left[i]= buffer[x][i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
703
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
704 diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100;
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 if(i==0)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
707 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
708 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
709 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
710 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
711 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
712 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
713 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
714 int mb_x, mb_y, i;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
715 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
716 const int mb_height = (height + s->mjpeg_vsample[0] - 1) / s->mjpeg_vsample[0];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
717
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
718 for(mb_y = 0; mb_y < mb_height; mb_y++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
719 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
720 if(mb_x==0 || mb_y==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
721 for(i=0;i<3;i++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
722 uint8_t *ptr;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
723 int x, y, h, v, linesize;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
724 h = s->mjpeg_hsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
725 v = s->mjpeg_vsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
726 linesize= p->linesize[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
727
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
728 for(y=0; y<v; y++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
729 for(x=0; x<h; x++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
730 int pred;
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 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
733 if(y==0 && mb_y==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
734 if(x==0 && mb_x==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
735 pred= 128;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
736 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
737 pred= ptr[-1];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
738 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
739 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
740 if(x==0 && mb_x==0){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
741 pred= ptr[-linesize];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
742 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
743 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
744 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
745 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
746
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
747 if(i==0)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
748 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
749 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
750 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
751 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
752 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
753 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
754 }else{
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
755 for(i=0;i<3;i++) {
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
756 uint8_t *ptr;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
757 int x, y, h, v, linesize;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
758 h = s->mjpeg_hsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
759 v = s->mjpeg_vsample[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
760 linesize= p->linesize[i];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
761
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
762 for(y=0; y<v; y++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
763 for(x=0; x<h; x++){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
764 int pred;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
765
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
766 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
767 //printf("%d %d %d %d %8X\n", mb_x, mb_y, x, y, ptr);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
768 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
769
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
770 if(i==0)
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
771 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
772 else
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
773 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
774 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
775 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
776 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
777 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
778 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
779 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
780 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
781
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
782 emms_c();
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
783
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
784 mjpeg_picture_trailer(s);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
785 s->picture_number++;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
786
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
787 flush_put_bits(&s->pb);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
788 return pbBufPtr(&s->pb) - s->pb.buf;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
789 // return (get_bit_count(&f->pb)+7)/8;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
790 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
791
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
792
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
793 /******************************************/
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
794 /* decoding */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
795
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
796 #define MAX_COMPONENTS 4
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
797
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
798 typedef struct MJpegDecodeContext {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
799 AVCodecContext *avctx;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
800 GetBitContext gb;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
801 int mpeg_enc_ctx_allocated; /* true if decoding context allocated */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
802
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
803 int start_code; /* current start code */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
804 int buffer_size;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
805 uint8_t *buffer;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
806
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
807 int16_t quant_matrixes[4][64];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
808 VLC vlcs[2][4];
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
809
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
810 int org_width, org_height; /* size given at codec init */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
811 int first_picture; /* true if decoding first picture */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
812 int interlaced; /* true if interlaced */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
813 int bottom_field; /* true if bottom field */
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
814 int lossless;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
815 int rgb;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
816 int rct; /* standard rct */
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
817 int pegasus_rct; /* pegasus reversible colorspace transform */
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
818 int bits; /* bits per component */
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
819
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
820 int width, height;
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
821 int nb_components;
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
822 int component_id[MAX_COMPONENTS];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
823 int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
824 int v_count[MAX_COMPONENTS];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
825 int h_max, v_max; /* maximum h and v counts */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
826 int quant_index[4]; /* quant table index for each component */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
827 int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
828 uint8_t *current_picture[MAX_COMPONENTS]; /* picture structure */
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
829 int linesize[MAX_COMPONENTS];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
830 DCTELEM block[64] __align8;
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
831 ScanTable scantable;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
832 void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
833
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
834 int restart_interval;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
835 int restart_count;
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
836
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
837 int buggy_avid;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
838 int interlace_polarity;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
839 } MJpegDecodeContext;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
840
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
841 static int mjpeg_decode_dht(MJpegDecodeContext *s);
375
749b5c16c0f7 - Warning fix.
pulento
parents: 370
diff changeset
842
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
843 static void build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table,
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
844 int nb_codes)
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
845 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
846 uint8_t huff_size[256];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
847 uint16_t huff_code[256];
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
848
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
849 memset(huff_size, 0, sizeof(huff_size));
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
850 build_huffman_codes(huff_size, huff_code, bits_table, val_table);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
851
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
852 init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
853 }
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
854
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
855 static int mjpeg_decode_init(AVCodecContext *avctx)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
856 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
857 MJpegDecodeContext *s = avctx->priv_data;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
858 MpegEncContext s2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
859
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
860 s->avctx = avctx;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
861
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1064
diff changeset
862 /* ugly way to get the idct & scantable FIXME */
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
863 memset(&s2, 0, sizeof(MpegEncContext));
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
864 s2.flags= avctx->flags;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
865 s2.avctx= avctx;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
866 // s2->out_format = FMT_MJPEG;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
867 s2.width = 8;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
868 s2.height = 8;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
869 if (MPV_common_init(&s2) < 0)
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
870 return -1;
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
871 s->scantable= s2.intra_scantable;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1064
diff changeset
872 s->idct_put= s2.dsp.idct_put;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
873 MPV_common_end(&s2);
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
874
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
875 s->mpeg_enc_ctx_allocated = 0;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
876 s->buffer_size = 102400; /* smaller buffer should be enough,
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
877 but photojpg files could ahive bigger sizes */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
878 s->buffer = av_malloc(s->buffer_size);
935
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
879 if (!s->buffer)
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
880 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
881 s->start_code = -1;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
882 s->first_picture = 1;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
883 s->org_width = avctx->width;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
884 s->org_height = avctx->height;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
885
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
886 build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
887 build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
888 build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251);
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
889 build_vlc(&s->vlcs[1][1], bits_ac_chrominance, val_ac_chrominance, 251);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
890
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
891 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
892 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
893 printf("mjpeg: using external huffman table\n");
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
894 init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
895 mjpeg_decode_dht(s);
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
896 /* should check for error - but dunno */
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
897 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
898
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
899 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
900 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
901
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
902 /* quantize tables */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
903 static int mjpeg_decode_dqt(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
904 {
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
905 int len, index, i, j;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
906
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
907 len = get_bits(&s->gb, 16) - 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
908
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
909 while (len >= 65) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
910 /* only 8 bit precision handled */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
911 if (get_bits(&s->gb, 4) != 0)
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
912 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
913 dprintf("dqt: 16bit precision\n");
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
914 return -1;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
915 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
916 index = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
917 if (index >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
918 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
919 dprintf("index=%d\n", index);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
920 /* read quant table */
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
921 for(i=0;i<64;i++) {
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
922 j = s->scantable.permutated[i];
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
923 s->quant_matrixes[index][j] = get_bits(&s->gb, 8);
37
eb898f29e49f fixed mjpeg matrix quant encoding and decoding
glantau
parents: 29
diff changeset
924 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
925 len -= 65;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
926 }
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
927
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
928 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
929 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
930
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
931 /* decode huffman tables and build VLC decoders */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
932 static int mjpeg_decode_dht(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
933 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
934 int len, index, i, class, n, v, code_max;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
935 uint8_t bits_table[17];
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
936 uint8_t val_table[256];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
937
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
938 len = get_bits(&s->gb, 16) - 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
939
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
940 while (len > 0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
941 if (len < 17)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
942 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
943 class = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
944 if (class >= 2)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
945 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
946 index = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
947 if (index >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
948 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
949 n = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
950 for(i=1;i<=16;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
951 bits_table[i] = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
952 n += bits_table[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
953 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
954 len -= 17;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
955 if (len < n || n > 256)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
956 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
957
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
958 code_max = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
959 for(i=0;i<n;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
960 v = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
961 if (v > code_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
962 code_max = v;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
963 val_table[i] = v;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
964 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
965 len -= n;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
966
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
967 /* build VLC and flush previous vlc if present */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
968 free_vlc(&s->vlcs[class][index]);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
969 dprintf("class=%d index=%d nb_codes=%d\n",
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
970 class, index, code_max + 1);
29
e04aea3bbf51 use default huffman tables if none given
glantau
parents: 28
diff changeset
971 build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
972 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
973 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
974 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
975
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
976 static int mjpeg_decode_sof(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
977 {
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
978 int len, nb_components, i, width, height;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
979
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
980 /* XXX: verify len field validity */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
981 len = get_bits(&s->gb, 16);
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
982 s->bits= get_bits(&s->gb, 8);
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
983
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
984 if(s->pegasus_rct) s->bits=9;
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
985 if(s->bits==9 && !s->pegasus_rct) s->rct=1; //FIXME ugly
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
986
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
987 if (s->bits != 8 && !s->lossless){
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
988 printf("only 8 bits/component accepted\n");
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
989 return -1;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
990 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
991 height = get_bits(&s->gb, 16);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
992 width = get_bits(&s->gb, 16);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
993 dprintf("sof0: picture: %dx%d\n", width, height);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
994
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
995 nb_components = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
996 if (nb_components <= 0 ||
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
997 nb_components > MAX_COMPONENTS)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
998 return -1;
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
999 s->nb_components = nb_components;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1000 s->h_max = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1001 s->v_max = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1002 for(i=0;i<nb_components;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1003 /* component id */
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1004 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
1005 s->h_count[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1006 s->v_count[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1007 /* compute hmax and vmax (only used in interleaved case) */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1008 if (s->h_count[i] > s->h_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1009 s->h_max = s->h_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1010 if (s->v_count[i] > s->v_max)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1011 s->v_max = s->v_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1012 s->quant_index[i] = get_bits(&s->gb, 8);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1013 if (s->quant_index[i] >= 4)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1014 return -1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1015 dprintf("component %d %d:%d id: %d quant:%d\n", i, s->h_count[i],
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1016 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
1017 }
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1018
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1019 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
1020
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1021 /* if different size, realloc/alloc picture */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1022 /* XXX: also check h_count and v_count */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1023 if (width != s->width || height != s->height) {
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
1024 for(i=0;i<MAX_COMPONENTS;i++)
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
1025 av_freep(&s->current_picture[i]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1026 s->width = width;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1027 s->height = height;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1028 /* test interlaced mode */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1029 if (s->first_picture &&
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1030 s->org_height != 0 &&
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1031 s->height < ((s->org_height * 3) / 4)) {
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1032 s->interlaced = 1;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1033 // s->bottom_field = (s->interlace_polarity) ? 1 : 0;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1034 s->bottom_field = 0;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1035 }
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1036
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1037 if(s->rgb){
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1038 int w, h;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1039 w = s->width;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1040 h = s->height;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1041 if (s->interlaced)
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1042 w *= 2;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1043 s->linesize[0] = 4*w;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1044 s->current_picture[0] = av_mallocz(4*w * h);
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1045 s->current_picture[1] = s->current_picture[2] = NULL;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1046 }else{
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1047 for(i=0;i<nb_components;i++) {
226
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
1048 int w, h;
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
1049 w = (s->width + 8 * s->h_max - 1) / (8 * s->h_max);
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
1050 h = (s->height + 8 * s->v_max - 1) / (8 * s->v_max);
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
1051 w = w * 8 * s->h_count[i];
5784987c3940 width or height %16 != 0 bugfix
michaelni
parents: 76
diff changeset
1052 h = h * 8 * s->v_count[i];
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1053 if (s->interlaced)
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1054 w *= 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1055 s->linesize[i] = w;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1056 s->current_picture[i] = av_mallocz(w * h);
901
07a677389920 10l fix
al3x
parents: 881
diff changeset
1057 if (!s->current_picture[i])
07a677389920 10l fix
al3x
parents: 881
diff changeset
1058 {
07a677389920 10l fix
al3x
parents: 881
diff changeset
1059 dprintf("error: no picture buffers allocated\n");
07a677389920 10l fix
al3x
parents: 881
diff changeset
1060 return -1;
07a677389920 10l fix
al3x
parents: 881
diff changeset
1061 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1062 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1063 }
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1064 s->first_picture = 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1065 }
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1066
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1067 if (len != (8+(3*nb_components)))
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1068 {
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1069 dprintf("decode_sof0: error, len(%d) mismatch\n", len);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1070 }
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1071
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1072 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1073 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1074
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
1075 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
1076 {
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1077 int code;
780
a48bb8bc63dd get_vlc2()
michaelni
parents: 779
diff changeset
1078 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
1079 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
1080 {
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
1081 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index,
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
1082 &s->vlcs[0][dc_index]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1083 return 0xffff;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1084 }
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1085
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1086 if(code)
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1087 return get_xbits(&s->gb, code);
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1088 else
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1089 return 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1090 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1091
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1092 /* decode block and dequantize */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1093 static int decode_block(MJpegDecodeContext *s, DCTELEM *block,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1094 int component, int dc_index, int ac_index, int quant_index)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1095 {
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1096 int code, i, j, level, val;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1097 VLC *ac_vlc;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1098 int16_t *quant_matrix;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1099
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1100 /* DC coef */
440
000aeeac27a2 * started to cleanup name clashes for onetime compilation
kabi
parents: 427
diff changeset
1101 val = mjpeg_decode_dc(s, dc_index);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1102 if (val == 0xffff) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1103 dprintf("error dc\n");
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1104 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1105 }
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1106 quant_matrix = s->quant_matrixes[quant_index];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1107 val = val * quant_matrix[0] + s->last_dc[component];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1108 s->last_dc[component] = val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1109 block[0] = val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1110 /* AC coefs */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1111 ac_vlc = &s->vlcs[1][ac_index];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1112 i = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1113 for(;;) {
780
a48bb8bc63dd get_vlc2()
michaelni
parents: 779
diff changeset
1114 code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table, 9, 2);
1275
61317ffc64d5 cleanup
michaelni
parents: 1266
diff changeset
1115
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1116 if (code < 0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1117 dprintf("error ac\n");
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1118 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1119 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1120 /* EOB */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1121 if (code == 0)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1122 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1123 if (code == 0xf0) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1124 i += 16;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1125 } else {
1280
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1126 level = get_xbits(&s->gb, code & 0xf);
8623c2e29555 optimize
michaelni
parents: 1275
diff changeset
1127 i += code >> 4;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1128 if (i >= 64) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1129 dprintf("error count: %d\n", i);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1130 return -1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1131 }
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
1132 j = s->scantable.permutated[i];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1133 block[j] = level * quant_matrix[j];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1134 i++;
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1135 if (i >= 64)
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1136 break;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1137 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1138 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1139 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1140 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1141
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1142 static int mjpeg_decode_sos(MJpegDecodeContext *s)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1143 {
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1144 int len, nb_components, i, j, n, h, v, ret, point_transform, predictor;
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1145 int mb_width, mb_height, mb_x, mb_y, vmax, hmax, index, id;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1146 int comp_index[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1147 int dc_index[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1148 int ac_index[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1149 int nb_blocks[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1150 int h_count[4];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1151 int v_count[4];
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1152 const int block_size= s->lossless ? 1 : 8;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1153
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1154 /* XXX: verify len field validity */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1155 len = get_bits(&s->gb, 16);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1156 nb_components = get_bits(&s->gb, 8);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1157 if (len != 6+2*nb_components)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1158 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1159 dprintf("decode_sos: invalid len (%d)\n", len);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1160 return -1;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1161 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1162 /* XXX: only interleaved scan accepted */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1163 if (nb_components != 3)
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1164 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1165 dprintf("decode_sos: components(%d) mismatch\n", nb_components);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1166 return -1;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1167 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1168 vmax = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1169 hmax = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1170 for(i=0;i<nb_components;i++) {
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1171 id = get_bits(&s->gb, 8) - 1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1172 dprintf("component: %d\n", id);
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1173 /* find component index */
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1174 for(index=0;index<s->nb_components;index++)
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1175 if (id == s->component_id[index])
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1176 break;
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1177 if (index == s->nb_components)
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1178 {
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1179 dprintf("decode_sos: index(%d) out of components\n", index);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1180 return -1;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1181 }
26
ce751dfbcace added correct component id handling
glantau
parents: 23
diff changeset
1182
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1183 comp_index[i] = index;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1184
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1185 nb_blocks[i] = s->h_count[index] * s->v_count[index];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1186 h_count[i] = s->h_count[index];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1187 v_count[i] = s->v_count[index];
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1188
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1189 dc_index[i] = get_bits(&s->gb, 4);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1190 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
1191
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1192 if (dc_index[i] < 0 || ac_index[i] < 0 ||
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1193 dc_index[i] >= 4 || ac_index[i] >= 4)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1194 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1195 switch(s->start_code)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1196 {
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1197 case SOF0:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1198 if (dc_index[i] > 1 || ac_index[i] > 1)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1199 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1200 break;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1201 case SOF1:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1202 case SOF2:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1203 if (dc_index[i] > 3 || ac_index[i] > 3)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1204 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1205 break;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1206 case SOF3:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1207 if (dc_index[i] > 3 || ac_index[i] != 0)
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1208 goto out_of_range;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1209 break;
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1210 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1211 }
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1212
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1213 predictor= get_bits(&s->gb, 8); /* lossless predictor or start of spectral (Ss) */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1214 skip_bits(&s->gb, 8); /* Se */
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1215 skip_bits(&s->gb, 4); /* Ah */
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1216 point_transform= get_bits(&s->gb, 4); /* Al */
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1217
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1218 for(i=0;i<nb_components;i++)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1219 s->last_dc[i] = 1024;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1220
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1221 if (nb_components > 1) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1222 /* interleaved stream */
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1223 mb_width = (s->width + s->h_max * block_size - 1) / (s->h_max * block_size);
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1224 mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1225 } else {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1226 h = s->h_max / s->h_count[comp_index[0]];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1227 v = s->v_max / s->v_count[comp_index[0]];
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1228 mb_width = (s->width + h * block_size - 1) / (h * block_size);
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1229 mb_height = (s->height + v * block_size - 1) / (v * block_size);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1230 nb_blocks[0] = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1231 h_count[0] = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1232 v_count[0] = 1;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1233 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1234
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1235 if(s->avctx->debug & FF_DEBUG_PICT_INFO)
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1236 printf("%s %s p:%d >>:%d\n", s->lossless ? "lossless" : "sequencial DCT", s->rgb ? "RGB" : "", predictor, point_transform);
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1237
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1238 if(s->lossless){
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1239 if(s->rgb){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1240 uint16_t buffer[2048][4];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1241 int left[3], top[3], topleft[3];
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1242 const int linesize= s->linesize[0];
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1243 const int mask= (1<<s->bits)-1;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1244
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1245 for(i=0; i<3; i++){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1246 buffer[0][i]= 1 << (s->bits + point_transform - 1);
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1247 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1248 for(mb_y = 0; mb_y < mb_height; mb_y++) {
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1249 const int modified_predictor= mb_y ? 1 : predictor;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1250 uint8_t *ptr = s->current_picture[0] + (linesize * mb_y);
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1251
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1252 if (s->interlaced && s->bottom_field)
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1253 ptr += linesize >> 1;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1254
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1255 for(i=0; i<3; i++){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1256 top[i]= left[i]= topleft[i]= buffer[0][i];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1257 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1258 for(mb_x = 0; mb_x < mb_width; mb_x++) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1259 if (s->restart_interval && !s->restart_count)
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1260 s->restart_count = s->restart_interval;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1261
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1262 for(i=0;i<3;i++) {
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1263 int pred;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1264
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1265 topleft[i]= top[i];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1266 top[i]= buffer[mb_x][i];
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1267
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1268 PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1269
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1270 left[i]=
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1271 buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, dc_index[i]) << point_transform));
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1272 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1273
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1274 if (s->restart_interval && !--s->restart_count) {
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1275 align_get_bits(&s->gb);
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1276 skip_bits(&s->gb, 16); /* skip RSTn */
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1277 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1278 }
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1279
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1280 if(s->rct){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1281 for(mb_x = 0; mb_x < mb_width; mb_x++) {
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1282 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2] - 0x200)>>2);
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1283 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1284 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1];
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1285 }
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1286 }else if(s->pegasus_rct){
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1287 for(mb_x = 0; mb_x < mb_width; mb_x++) {
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1288 ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2])>>2);
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1289 ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1290 ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1291 }
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1292 }else{
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1293 for(mb_x = 0; mb_x < mb_width; mb_x++) {
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1294 ptr[4*mb_x+0] = buffer[mb_x][0];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1295 ptr[4*mb_x+1] = buffer[mb_x][1];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1296 ptr[4*mb_x+2] = buffer[mb_x][2];
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1297 }
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1298 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1299 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1300 }else{
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1301 for(mb_y = 0; mb_y < mb_height; mb_y++) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1302 for(mb_x = 0; mb_x < mb_width; mb_x++) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1303 if (s->restart_interval && !s->restart_count)
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1304 s->restart_count = s->restart_interval;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1305
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1306 if(mb_x==0 || mb_y==0 || s->interlaced){
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1307 for(i=0;i<nb_components;i++) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1308 uint8_t *ptr;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1309 int x, y, c, linesize;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1310 n = nb_blocks[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1311 c = comp_index[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1312 h = h_count[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1313 v = v_count[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1314 x = 0;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1315 y = 0;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1316 linesize= s->linesize[c];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1317
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1318 for(j=0; j<n; j++) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1319 int pred;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1320
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1321 ptr = s->current_picture[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1322 if(y==0 && mb_y==0){
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1323 if(x==0 && mb_x==0){
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1324 pred= 128 << point_transform;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1325 }else{
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1326 pred= ptr[-1];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1327 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1328 }else{
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1329 if(x==0 && mb_x==0){
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1330 pred= ptr[-linesize];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1331 }else{
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1332 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1333 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1334 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1335
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1336 if (s->interlaced && s->bottom_field)
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1337 ptr += linesize >> 1;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1338 *ptr= pred + (mjpeg_decode_dc(s, dc_index[i]) << point_transform);
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1339
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1340 if (++x == h) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1341 x = 0;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1342 y++;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1343 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1344 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1345 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1346 }else{
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1347 for(i=0;i<nb_components;i++) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1348 uint8_t *ptr;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1349 int x, y, c, linesize;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1350 n = nb_blocks[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1351 c = comp_index[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1352 h = h_count[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1353 v = v_count[i];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1354 x = 0;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1355 y = 0;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1356 linesize= s->linesize[c];
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1357
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1358 for(j=0; j<n; j++) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1359 int pred;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1360
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1361 ptr = s->current_picture[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1362 PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1363 *ptr= pred + (mjpeg_decode_dc(s, dc_index[i]) << point_transform);
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1364 if (++x == h) {
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1365 x = 0;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1366 y++;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1367 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1368 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1369 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1370 }
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1371 if (s->restart_interval && !--s->restart_count) {
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1372 align_get_bits(&s->gb);
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1373 skip_bits(&s->gb, 16); /* skip RSTn */
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1374 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1375 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1376 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1377 }
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1378 }else{
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1379 for(mb_y = 0; mb_y < mb_height; mb_y++) {
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1380 for(mb_x = 0; mb_x < mb_width; mb_x++) {
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1381 if (s->restart_interval && !s->restart_count)
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1382 s->restart_count = s->restart_interval;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1383
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1384 for(i=0;i<nb_components;i++) {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1385 uint8_t *ptr;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1386 int x, y, c;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1387 n = nb_blocks[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1388 c = comp_index[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1389 h = h_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1390 v = v_count[i];
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1391 x = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1392 y = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1393 for(j=0;j<n;j++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1394 memset(s->block, 0, sizeof(s->block));
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1395 if (decode_block(s, s->block, i,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1396 dc_index[i], ac_index[i],
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1397 s->quant_index[c]) < 0) {
427
c058624083e1 fixed incorrect buffer handling
glantau
parents: 396
diff changeset
1398 dprintf("error y=%d x=%d\n", mb_y, mb_x);
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1399 ret = -1;
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1400 goto the_end;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1401 }
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1402 // dprintf("mb: %d %d processed\n", mb_y, mb_x);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1403 ptr = s->current_picture[c] +
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1404 (s->linesize[c] * (v * mb_y + y) * 8) +
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1405 (h * mb_x + x) * 8;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1406 if (s->interlaced && s->bottom_field)
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1407 ptr += s->linesize[c] >> 1;
706
e65798d228ea idct permutation cleanup, idct can be selected per context now
michaelni
parents: 676
diff changeset
1408 s->idct_put(ptr, s->linesize[c], s->block);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1409 if (++x == h) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1410 x = 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1411 y++;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1412 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1413 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1414 }
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1415 /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1416 if (s->restart_interval && (s->restart_interval < 1350) &&
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1417 !--s->restart_count) {
584
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1418 align_get_bits(&s->gb);
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1419 skip_bits(&s->gb, 16); /* skip RSTn */
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1420 for (j=0; j<nb_components; j++) /* reset dc */
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1421 s->last_dc[j] = 1024;
03e395b31197 handle DRI/RST markers patch by Leon van Stuivenberg <leonvs at iae dot nl>
michaelni
parents: 541
diff changeset
1422 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1423 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1424 }
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1425 }
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1426 ret = 0;
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1427 the_end:
44
92d51f683931 added forgotten emms() - fix various segmentation faults when using mjpeg
glantau
parents: 37
diff changeset
1428 emms_c();
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1429 return ret;
349
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1430 out_of_range:
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1431 dprintf("decode_sos: ac/dc index out of range\n");
34f6c77ff01a Support for external huffman table and various fixes by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 344
diff changeset
1432 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1433 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1434
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1435 static int mjpeg_decode_dri(MJpegDecodeContext *s)
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1436 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1437 if (get_bits(&s->gb, 16) != 4)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1438 return -1;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1439 s->restart_interval = get_bits(&s->gb, 16);
507
b5b91e89b88c * turned into debug message - it's annoying when watching mjpeg files
kabi
parents: 477
diff changeset
1440 dprintf("restart interval: %d\n", s->restart_interval);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1441
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1442 return 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1443 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1444
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
1445 static int mjpeg_decode_app(MJpegDecodeContext *s)
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1446 {
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1447 int len, id;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1448
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1449 /* XXX: verify len field validity */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1450 len = get_bits(&s->gb, 16);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1451 if (len < 5)
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1452 return -1;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1453
811
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1454 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1455 id = be2me_32(id);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1456 len -= 6;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1457
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1458 if(s->avctx->debug & FF_DEBUG_STARTCODE){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1459 printf("APPx %8X\n", id);
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1460 }
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1461
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1462 /* 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
1463 /* 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
1464 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
1465 if (id == ff_get_fourcc("AVI1"))
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1466 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1467 /* structure:
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1468 4bytes AVI1
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1469 1bytes polarity
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1470 1bytes always zero
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1471 4bytes field_size
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1472 4bytes field_size_less_padding
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1473 */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1474 s->buggy_avid = 1;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1475 // if (s->first_picture)
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1476 // printf("mjpeg: workarounding buggy AVID\n");
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1477 s->interlace_polarity = get_bits(&s->gb, 8);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1478 #if 0
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1479 skip_bits(&s->gb, 8);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1480 skip_bits(&s->gb, 32);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1481 skip_bits(&s->gb, 32);
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1482 len -= 10;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1483 #endif
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1484 // if (s->interlace_polarity)
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1485 // printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1486 goto out;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1487 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1488
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1489 // len -= 2;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1490
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
1491 if (id == ff_get_fourcc("JFIF"))
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1492 {
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1493 int t_w, t_h;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1494 skip_bits(&s->gb, 8); /* the trailing zero-byte */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1495 printf("mjpeg: JFIF header found (version: %x.%x)\n",
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1496 get_bits(&s->gb, 8), get_bits(&s->gb, 8));
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1497 if (get_bits(&s->gb, 8) == 0)
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1498 {
949
693a0797398f warnings patch by (bubu <bubu at bubu dot net>)
michaelni
parents: 935
diff changeset
1499 int x_density, y_density;
693a0797398f warnings patch by (bubu <bubu at bubu dot net>)
michaelni
parents: 935
diff changeset
1500 x_density = get_bits(&s->gb, 16);
693a0797398f warnings patch by (bubu <bubu at bubu dot net>)
michaelni
parents: 935
diff changeset
1501 y_density = get_bits(&s->gb, 16);
903
22ee74da2cd3 cleanup
michaelni
parents: 901
diff changeset
1502
935
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1503 dprintf("x/y density: %d (%f), %d (%f)\n", x_density,
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1504 (float)x_density, y_density, (float)y_density);
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1505 #if 0
903
22ee74da2cd3 cleanup
michaelni
parents: 901
diff changeset
1506 //MN: needs to be checked
916
259f3efebef5 fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents: 903
diff changeset
1507 if(x_density)
935
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1508 // s->avctx->aspect_ratio= s->width*y_density/((float)s->height*x_density);
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1509 s->avctx->aspect_ratio = (float)x_density/y_density;
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1510 /* it's better, but every JFIF I have seen stores 1:1 */
916
259f3efebef5 fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents: 903
diff changeset
1511 else
259f3efebef5 fixing aspect (hopefully, i couldnt reproduce the bug)
michaelni
parents: 903
diff changeset
1512 s->avctx->aspect_ratio= 0.0;
935
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1513 #endif
672
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1514 }
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1515 else
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1516 {
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1517 skip_bits(&s->gb, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1518 skip_bits(&s->gb, 16);
8c9edc20599a complete aspect support
al3x
parents: 584
diff changeset
1519 }
935
c9bbd35064b6 disabled aspect code due to it is extra buggy
al3x
parents: 916
diff changeset
1520
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1521 t_w = get_bits(&s->gb, 8);
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1522 t_h = get_bits(&s->gb, 8);
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1523 if (t_w && t_h)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1524 {
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1525 /* skip thumbnail */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1526 if (len-10-(t_w*t_h*3) > 0)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1527 len -= t_w*t_h*3;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1528 }
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1529 len -= 10;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1530 goto out;
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1531 }
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1532
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1533 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
1534 {
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1535 printf("mjpeg: Adobe header found\n");
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1536 skip_bits(&s->gb, 16); /* version */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1537 skip_bits(&s->gb, 16); /* flags0 */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1538 skip_bits(&s->gb, 16); /* flags1 */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1539 skip_bits(&s->gb, 8); /* transform */
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1540 len -= 7;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1541 goto out;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1542 }
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1543
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1544 if (id == ff_get_fourcc("LJIF")){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1545 printf("Pegasus lossless jpeg header found\n");
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1546 skip_bits(&s->gb, 16); /* version ? */
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1547 skip_bits(&s->gb, 16); /* unknwon always 0? */
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1548 skip_bits(&s->gb, 16); /* unknwon always 0? */
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1549 skip_bits(&s->gb, 16); /* unknwon always 0? */
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1550 switch( get_bits(&s->gb, 8)){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1551 case 1:
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1552 s->rgb= 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1553 s->pegasus_rct=0;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1554 break;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1555 case 2:
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1556 s->rgb= 1;
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
1557 s->pegasus_rct=1;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1558 break;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1559 default:
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1560 printf("unknown colorspace\n");
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1561 }
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1562 len -= 9;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1563 goto out;
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1564 }
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1565
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1566 /* 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
1567 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
1568 {
811
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1569 id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
972c8ee102d6 fixed 10l
al3x
parents: 786
diff changeset
1570 id = be2me_32(id);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1571 len -= 4;
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1572 if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1573 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1574 #if 0
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1575 skip_bits(&s->gb, 32); /* field size */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1576 skip_bits(&s->gb, 32); /* pad field size */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1577 skip_bits(&s->gb, 32); /* next off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1578 skip_bits(&s->gb, 32); /* quant off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1579 skip_bits(&s->gb, 32); /* huff off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1580 skip_bits(&s->gb, 32); /* image off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1581 skip_bits(&s->gb, 32); /* scan off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1582 skip_bits(&s->gb, 32); /* data off */
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1583 #endif
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1584 if (s->first_picture)
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1585 printf("mjpeg: Apple MJPEG-A header found\n");
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1586 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1587 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1588
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1589 out:
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1590 /* 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
1591 if (len < 0)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1592 printf("mjpeg: error, decode_app parser read over the end\n");
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1593 while(--len > 0)
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1594 skip_bits(&s->gb, 8);
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1595
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1596 return 0;
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1597 }
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1598
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1599 static int mjpeg_decode_com(MJpegDecodeContext *s)
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1600 {
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1601 /* XXX: verify len field validity */
1061
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1602 unsigned int len = get_bits(&s->gb, 16);
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1603 if (len >= 2 && len < 32768) {
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1604 /* XXX: any better upper bound */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1605 uint8_t *cbuf = av_malloc(len - 1);
1061
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1606 if (cbuf) {
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1607 int i;
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1608 for (i = 0; i < len - 2; i++)
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1609 cbuf[i] = get_bits(&s->gb, 8);
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1610 if (i > 0 && cbuf[i-1] == '\n')
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1611 cbuf[i-1] = 0;
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1612 else
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1613 cbuf[i] = 0;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1614
1061
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1615 printf("mjpeg comment: '%s'\n", cbuf);
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1616
1061
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1617 /* buggy avid, it puts EOI only at every 10th frame */
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1618 if (!strcmp(cbuf, "AVID"))
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1619 {
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1620 s->buggy_avid = 1;
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1621 // if (s->first_picture)
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1622 // printf("mjpeg: workarounding buggy AVID\n");
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1623 }
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1624
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1625 av_free(cbuf);
081b1f28c1ae * check for potentialy problematic field len
kabi
parents: 1057
diff changeset
1626 }
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1627 }
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1628
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1629 return 0;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1630 }
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1631
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1632 #if 0
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1633 static int valid_marker_list[] =
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1634 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1635 /* 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
1636 /* 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
1637 /* 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
1638 /* 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
1639 /* 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
1640 /* 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
1641 /* 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
1642 /* 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
1643 /* 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
1644 /* 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
1645 /* 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
1646 /* 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
1647 /* 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
1648 /* 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
1649 /* 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
1650 /* 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
1651 /* 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
1652 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1653 #endif
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1654
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1655 /* 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
1656 state. Return -1 if no start code found */
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1657 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
1658 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1659 uint8_t *buf_ptr;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1660 unsigned int v, v2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1661 int val;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1662 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1663 int skipped=0;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1664 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1665
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1666 buf_ptr = *pbuf_ptr;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1667 while (buf_ptr < buf_end) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1668 v = *buf_ptr++;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1669 v2 = *buf_ptr;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1670 if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe)) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1671 val = *buf_ptr++;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1672 goto found;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1673 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1674 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1675 skipped++;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1676 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1677 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1678 val = -1;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1679 found:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1680 #ifdef DEBUG
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1681 dprintf("find_marker skipped %d bytes\n", skipped);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1682 #endif
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1683 *pbuf_ptr = buf_ptr;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1684 return val;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1685 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1686
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1687 static int mjpeg_decode_frame(AVCodecContext *avctx,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1688 void *data, int *data_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1689 uint8_t *buf, int buf_size)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1690 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1691 MJpegDecodeContext *s = avctx->priv_data;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1692 uint8_t *buf_end, *buf_ptr;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1693 int i, start_code;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1694 AVPicture *picture = data;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1695
68
99cc25b48e24 fix got_picture output
glantau
parents: 64
diff changeset
1696 *data_size = 0;
99cc25b48e24 fix got_picture output
glantau
parents: 64
diff changeset
1697
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1698 /* no supplementary picture */
68
99cc25b48e24 fix got_picture output
glantau
parents: 64
diff changeset
1699 if (buf_size == 0)
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1700 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1701
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1702 buf_ptr = buf;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1703 buf_end = buf + buf_size;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1704 while (buf_ptr < buf_end) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1705 /* find start next marker */
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1706 start_code = find_marker(&buf_ptr, buf_end);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1707 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1708 /* EOF */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1709 if (start_code < 0) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1710 goto the_end;
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1711 } else {
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1712 dprintf("marker=%x avail_size_in_buf=%d\n", start_code, buf_end - buf_ptr);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1713
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1714 if ((buf_end - buf_ptr) > s->buffer_size)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1715 {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1716 av_free(s->buffer);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1717 s->buffer_size = buf_end-buf_ptr;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1718 s->buffer = av_malloc(s->buffer_size);
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1719 dprintf("buffer too small, expanding to %d bytes\n",
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1720 s->buffer_size);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1721 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1722
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1723 /* unescape buffer of SOS */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1724 if (start_code == SOS)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1725 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1726 uint8_t *src = buf_ptr;
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1727 uint8_t *dst = s->buffer;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1728
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1729 while (src<buf_end)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1730 {
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1731 uint8_t x = *(src++);
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1732
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1733 *(dst++) = x;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1734 if (x == 0xff)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1735 {
840
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
1736 while(*src == 0xff) src++;
4c22dcf3ba65 cleanup
michaelni
parents: 832
diff changeset
1737
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1738 x = *(src++);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1739 if (x >= 0xd0 && x <= 0xd7)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1740 *(dst++) = x;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1741 else if (x)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1742 break;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1743 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1744 }
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
1745 init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8);
832
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1746
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1747 dprintf("escaping removed %d bytes\n",
ff66fdb1d092 fixed some bugs in app parser - some jfif and adobe jpgs fixed
al3x
parents: 811
diff changeset
1748 (buf_end - buf_ptr) - (dst - s->buffer));
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1749 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1750 else
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
1751 init_get_bits(&s->gb, buf_ptr, (buf_end - buf_ptr)*8);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1752
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1753 s->start_code = start_code;
1310
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1754 if(s->avctx->debug & FF_DEBUG_STARTCODE){
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1755 printf("startcode: %X\n", start_code);
b76927543aaf cleanup
michaelni
parents: 1307
diff changeset
1756 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1757
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1758 /* process markers */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1759 if (start_code >= 0xd0 && start_code <= 0xd7) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1760 dprintf("restart marker: %d\n", start_code&0x0f);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1761 } else if (s->first_picture) {
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1762 /* APP fields */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1763 if (start_code >= 0xe0 && start_code <= 0xef)
786
62faac9a4c3d FOURCC removed, using ff_get_fourcc instead (should be big-endian safe), workarounded a restart interval bug (Spectralfan.mov) (rst support should be rewritten and moved from decode_sos)
al3x
parents: 780
diff changeset
1764 mjpeg_decode_app(s);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1765 /* Comment */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1766 else if (start_code == COM)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1767 mjpeg_decode_com(s);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1768 }
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1769
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1770 switch(start_code) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1771 case SOI:
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1772 s->restart_interval = 0;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1773 /* nothing to do on SOI */
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1774 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1775 case DQT:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1776 mjpeg_decode_dqt(s);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1777 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1778 case DHT:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1779 mjpeg_decode_dht(s);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1780 break;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1781 case SOF0:
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1782 s->lossless=0;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1783 if (mjpeg_decode_sof(s) < 0)
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1784 return -1;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1785 break;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1786 case SOF3:
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1787 s->lossless=1;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1788 if (mjpeg_decode_sof(s) < 0)
901
07a677389920 10l fix
al3x
parents: 881
diff changeset
1789 return -1;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1790 break;
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1791 case EOI:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1792 eoi_parser:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1793 {
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1794 if (s->interlaced) {
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1795 s->bottom_field ^= 1;
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1796 /* if not bottom field, do not output image yet */
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1797 if (s->bottom_field)
540
4cee7ce37e10 don't exit decoder after decoding first field -> fixes angels.avi interlacing
arpi_esp
parents: 527
diff changeset
1798 goto not_the_end;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1799 }
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1800 for(i=0;i<3;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1801 picture->data[i] = s->current_picture[i];
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1802 picture->linesize[i] = (s->interlaced) ?
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1803 s->linesize[i] >> 1 : s->linesize[i];
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1804 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1805 *data_size = sizeof(AVPicture);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1806 avctx->height = s->height;
53
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1807 if (s->interlaced)
adf7cea364ca added interlaced MJPEG support
glantau
parents: 47
diff changeset
1808 avctx->height *= 2;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1809 avctx->width = s->width;
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1810 /* XXX: not complete test ! */
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1811 switch((s->h_count[0] << 4) | s->v_count[0]) {
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1812 case 0x11:
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1813 if(s->rgb){
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1814 avctx->pix_fmt = PIX_FMT_RGBA32;
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1815 }else
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1816 avctx->pix_fmt = PIX_FMT_YUV444P;
28
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1817 break;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1818 case 0x21:
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1819 avctx->pix_fmt = PIX_FMT_YUV422P;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1820 break;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1821 default:
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1822 case 0x22:
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1823 avctx->pix_fmt = PIX_FMT_YUV420P;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1824 break;
b611fafddf9e added 422P and 444P support - fixed block parsing error
glantau
parents: 26
diff changeset
1825 }
47
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1826 /* dummy quality */
bd0dd8d0b759 return dummy quality to avoid bug in -sameq case - forgot emms in error case
glantau
parents: 44
diff changeset
1827 /* XXX: infer it with matrix */
903
22ee74da2cd3 cleanup
michaelni
parents: 901
diff changeset
1828 // avctx->quality = 3;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1829 goto the_end;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1830 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1831 break;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1832 case SOS:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1833 mjpeg_decode_sos(s);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1834 /* buggy avid puts EOI every 10-20th frame */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1835 /* if restart period is over process EOI */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1836 if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1837 goto eoi_parser;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1838 break;
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
1839 case DRI:
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1840 mjpeg_decode_dri(s);
354
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1841 break;
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1842 case SOF1:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1843 case SOF2:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1844 case SOF5:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1845 case SOF6:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1846 case SOF7:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1847 case SOF9:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1848 case SOF10:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1849 case SOF11:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1850 case SOF13:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1851 case SOF14:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1852 case SOF15:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1853 case JPG:
167aa21aa250 patch by Alex Beregszaszi <alex@naxine.org>
arpi_esp
parents: 349
diff changeset
1854 printf("mjpeg: unsupported coding type (%x)\n", start_code);
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1855 break;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1856 // default:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1857 // printf("mjpeg: unsupported marker (%x)\n", start_code);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1858 // break;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1859 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1860
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1861 not_the_end:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1862 /* eof process start code */
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1863 buf_ptr += (get_bits_count(&s->gb)+7)/8;
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1864 dprintf("marker parser used %d bytes (%d bits)\n",
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1865 (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
1866 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1867 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1868 }
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1869 the_end:
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1870 dprintf("mjpeg decode frame unused %d bytes\n", buf_end - buf_ptr);
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
1871 // return buf_end - buf_ptr;
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1872 return buf_ptr - buf;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1873 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
1874
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1875 static int mjpegb_decode_frame(AVCodecContext *avctx,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1876 void *data, int *data_size,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1877 uint8_t *buf, int buf_size)
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1878 {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1879 MJpegDecodeContext *s = avctx->priv_data;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1061
diff changeset
1880 uint8_t *buf_end, *buf_ptr;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1881 int i;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1882 AVPicture *picture = data;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1883 GetBitContext hgb; /* for the header */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1884 uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1885 uint32_t field_size;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1886
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1887 *data_size = 0;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1888
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1889 /* no supplementary picture */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1890 if (buf_size == 0)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1891 return 0;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1892
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1893 buf_ptr = buf;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1894 buf_end = buf + buf_size;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1895
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1896 read_header:
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1897 /* reset on every SOI */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1898 s->restart_interval = 0;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1899
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
1900 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
1901
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1902 skip_bits(&hgb, 32); /* reserved zeros */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1903
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1904 if (get_bits(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1905 {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1906 dprintf("not mjpeg-b (bad fourcc)\n");
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1907 return 0;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1908 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1909
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1910 field_size = get_bits(&hgb, 32); /* field size */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1911 dprintf("field size: 0x%x\n", field_size);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1912 skip_bits(&hgb, 32); /* padded field size */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1913 second_field_offs = get_bits(&hgb, 32);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1914 dprintf("second field offs: 0x%x\n", second_field_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1915 if (second_field_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1916 s->interlaced = 1;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1917
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1918 dqt_offs = get_bits(&hgb, 32);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1919 dprintf("dqt offs: 0x%x\n", dqt_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1920 if (dqt_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1921 {
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
1922 init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1923 s->start_code = DQT;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1924 mjpeg_decode_dqt(s);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1925 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1926
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1927 dht_offs = get_bits(&hgb, 32);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1928 dprintf("dht offs: 0x%x\n", dht_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1929 if (dht_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1930 {
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
1931 init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1932 s->start_code = DHT;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1933 mjpeg_decode_dht(s);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1934 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1935
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1936 sof_offs = get_bits(&hgb, 32);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1937 dprintf("sof offs: 0x%x\n", sof_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1938 if (sof_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1939 {
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
1940 init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1941 s->start_code = SOF0;
1307
26bed13dd48d lossless jpeg decoding support
michaelni
parents: 1280
diff changeset
1942 if (mjpeg_decode_sof(s) < 0)
901
07a677389920 10l fix
al3x
parents: 881
diff changeset
1943 return -1;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1944 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1945
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1946 sos_offs = get_bits(&hgb, 32);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1947 dprintf("sos offs: 0x%x\n", sos_offs);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1948 if (sos_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1949 {
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
1950 // init_get_bits(&s->gb, buf+sos_offs, (buf_end - (buf+sos_offs))*8);
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
1951 init_get_bits(&s->gb, buf+sos_offs, field_size*8);
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1952 s->start_code = SOS;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1953 mjpeg_decode_sos(s);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1954 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1955
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1956 skip_bits(&hgb, 32); /* start of data offset */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1957
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1958 if (s->interlaced) {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1959 s->bottom_field ^= 1;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1960 /* if not bottom field, do not output image yet */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1961 if (s->bottom_field && second_field_offs)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1962 {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1963 buf_ptr = buf + second_field_offs;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1964 second_field_offs = 0;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1965 goto read_header;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1966 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1967 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1968
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1969 for(i=0;i<3;i++) {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1970 picture->data[i] = s->current_picture[i];
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1971 picture->linesize[i] = (s->interlaced) ?
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1972 s->linesize[i] >> 1 : s->linesize[i];
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1973 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1974 *data_size = sizeof(AVPicture);
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1975 avctx->height = s->height;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1976 if (s->interlaced)
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1977 avctx->height *= 2;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1978 avctx->width = s->width;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1979 /* XXX: not complete test ! */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1980 switch((s->h_count[0] << 4) | s->v_count[0]) {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1981 case 0x11:
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1982 avctx->pix_fmt = PIX_FMT_YUV444P;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1983 break;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1984 case 0x21:
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1985 avctx->pix_fmt = PIX_FMT_YUV422P;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1986 break;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1987 default:
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1988 case 0x22:
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1989 avctx->pix_fmt = PIX_FMT_YUV420P;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1990 break;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1991 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1992 /* dummy quality */
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1993 /* XXX: infer it with matrix */
903
22ee74da2cd3 cleanup
michaelni
parents: 901
diff changeset
1994 // avctx->quality = 3;
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1995
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1996 return buf_ptr - buf;
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1997 }
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1998
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
1999
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2000 static int mjpeg_decode_end(AVCodecContext *avctx)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2001 {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2002 MJpegDecodeContext *s = avctx->priv_data;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2003 int i, j;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2004
775
e96776e1d2ae reworked decode_frame marker searching, fixes many non-working samples
al3x
parents: 706
diff changeset
2005 av_free(s->buffer);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2006 for(i=0;i<MAX_COMPONENTS;i++)
396
fce0a2520551 removed useless header includes - use av memory functions
glantau
parents: 375
diff changeset
2007 av_free(s->current_picture[i]);
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2008 for(i=0;i<2;i++) {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2009 for(j=0;j<4;j++)
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2010 free_vlc(&s->vlcs[i][j]);
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2011 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2012 return 0;
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2013 }
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2014
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2015 AVCodec mjpeg_decoder = {
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2016 "mjpeg",
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2017 CODEC_TYPE_VIDEO,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2018 CODEC_ID_MJPEG,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2019 sizeof(MJpegDecodeContext),
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2020 mjpeg_decode_init,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2021 NULL,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2022 mjpeg_decode_end,
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2023 mjpeg_decode_frame,
369
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
2024 0,
c60869851bb4 added support for various app headers, and writin FFmpeg comment
al3x
parents: 357
diff changeset
2025 NULL
23
1e131bc21101 added MJPEG decoder, renamed mjpegenc.c to mjpeg.c
glantau
parents: 0
diff changeset
2026 };
881
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2027
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2028 AVCodec mjpegb_decoder = {
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2029 "mjpegb",
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2030 CODEC_TYPE_VIDEO,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2031 CODEC_ID_MJPEGB,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2032 sizeof(MJpegDecodeContext),
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2033 mjpeg_decode_init,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2034 NULL,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2035 mjpeg_decode_end,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2036 mjpegb_decode_frame,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2037 0,
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2038 NULL
d326091dae9f mjpegb support (need more samples)
al3x
parents: 841
diff changeset
2039 };
1315
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2040
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2041 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
2042 "ljpeg",
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2043 CODEC_TYPE_VIDEO,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2044 CODEC_ID_LJPEG,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2045 sizeof(MpegEncContext),
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2046 MPV_encode_init,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2047 encode_picture_lossless,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2048 MPV_encode_end,
6696d3bf4ff2 lossless mjpeg encoding (planar yuv & RGB) and somerelated bugfixes
michaelni
parents: 1312
diff changeset
2049 };