mjpeg.c 65.7 KB
Newer Older
1 2
/*
 * MJPEG encoder and decoder
3
 * Copyright (c) 2000, 2001 Fabrice Bellard.
4
 *
5 6 7 8
 * This library is free software; you can redistribute it and/or
 * modify it under the terms of the GNU Lesser General Public
 * License as published by the Free Software Foundation; either
 * version 2 of the License, or (at your option) any later version.
9
 *
10
 * This library is distributed in the hope that it will be useful,
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * Lesser General Public License for more details.
14
 *
15 16 17
 * You should have received a copy of the GNU Lesser General Public
 * License along with this library; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
 *
A
Alex Beregszaszi 已提交
19
 * Support for external huffman table, various fixes (AVID workaround),
20
 * aspecting, new decode_frame mechanism and apple mjpeg-b support
A
Alex Beregszaszi 已提交
21
 *                                  by Alex Beregszaszi <alex@naxine.org>
22
 */
M
Michael Niedermayer 已提交
23 24 25 26 27 28

/**
 * @file mjpeg.c
 * MJPEG encoder and decoder.
 */
 
A
10l  
Alex Beregszaszi 已提交
29
//#define DEBUG
30 31
#include <assert.h>

32 33 34 35
#include "avcodec.h"
#include "dsputil.h"
#include "mpegvideo.h"

36
/* use two quantizer tables (one for luminance and one for chrominance) */
37 38 39
/* not yet working */
#undef TWOMATRIXES

40
typedef struct MJpegContext {
41
    uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing 
42 43 44 45 46 47 48 49
    uint16_t huff_code_dc_luminance[12];
    uint8_t huff_size_dc_chrominance[12];
    uint16_t huff_code_dc_chrominance[12];

    uint8_t huff_size_ac_luminance[256];
    uint16_t huff_code_ac_luminance[256];
    uint8_t huff_size_ac_chrominance[256];
    uint16_t huff_code_ac_chrominance[256];
50 51
} MJpegContext;

52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
/* JPEG marker codes */
typedef enum {
    /* start of frame */
    SOF0  = 0xc0,	/* baseline */
    SOF1  = 0xc1,	/* extended sequential, huffman */
    SOF2  = 0xc2,	/* progressive, huffman */
    SOF3  = 0xc3,	/* lossless, huffman */

    SOF5  = 0xc5,	/* differential sequential, huffman */
    SOF6  = 0xc6,	/* differential progressive, huffman */
    SOF7  = 0xc7,	/* differential lossless, huffman */
    JPG   = 0xc8,	/* reserved for JPEG extension */
    SOF9  = 0xc9,	/* extended sequential, arithmetic */
    SOF10 = 0xca,	/* progressive, arithmetic */
    SOF11 = 0xcb,	/* lossless, arithmetic */

    SOF13 = 0xcd,	/* differential sequential, arithmetic */
    SOF14 = 0xce,	/* differential progressive, arithmetic */
    SOF15 = 0xcf,	/* differential lossless, arithmetic */

    DHT   = 0xc4,	/* define huffman tables */

    DAC   = 0xcc,	/* define arithmetic-coding conditioning */

    /* restart with modulo 8 count "m" */
    RST0  = 0xd0,
    RST1  = 0xd1,
    RST2  = 0xd2,
    RST3  = 0xd3,
    RST4  = 0xd4,
    RST5  = 0xd5,
    RST6  = 0xd6,
    RST7  = 0xd7,

    SOI   = 0xd8,	/* start of image */
    EOI   = 0xd9,	/* end of image */
    SOS   = 0xda,	/* start of scan */
    DQT   = 0xdb,	/* define quantization tables */
    DNL   = 0xdc,	/* define number of lines */
    DRI   = 0xdd,	/* define restart interval */
    DHP   = 0xde,	/* define hierarchical progression */
    EXP   = 0xdf,	/* expand reference components */

    APP0  = 0xe0,
    APP1  = 0xe1,
    APP2  = 0xe2,
    APP3  = 0xe3,
    APP4  = 0xe4,
    APP5  = 0xe5,
    APP6  = 0xe6,
    APP7  = 0xe7,
    APP8  = 0xe8,
    APP9  = 0xe9,
    APP10 = 0xea,
    APP11 = 0xeb,
    APP12 = 0xec,
    APP13 = 0xed,
    APP14 = 0xee,
    APP15 = 0xef,

    JPG0  = 0xf0,
    JPG1  = 0xf1,
    JPG2  = 0xf2,
    JPG3  = 0xf3,
    JPG4  = 0xf4,
    JPG5  = 0xf5,
    JPG6  = 0xf6,
    JPG7  = 0xf7,
    JPG8  = 0xf8,
    JPG9  = 0xf9,
    JPG10 = 0xfa,
    JPG11 = 0xfb,
    JPG12 = 0xfc,
    JPG13 = 0xfd,

    COM   = 0xfe,	/* comment */

    TEM   = 0x01,	/* temporary private use for arithmetic coding */

    /* 0x02 -> 0xbf reserved */
} JPEG_MARKER;
133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162

#if 0
/* These are the sample quantization tables given in JPEG spec section K.1.
 * The spec says that the values given produce "good" quality, and
 * when divided by 2, "very good" quality.
 */
static const unsigned char std_luminance_quant_tbl[64] = {
    16,  11,  10,  16,  24,  40,  51,  61,
    12,  12,  14,  19,  26,  58,  60,  55,
    14,  13,  16,  24,  40,  57,  69,  56,
    14,  17,  22,  29,  51,  87,  80,  62,
    18,  22,  37,  56,  68, 109, 103,  77,
    24,  35,  55,  64,  81, 104, 113,  92,
    49,  64,  78,  87, 103, 121, 120, 101,
    72,  92,  95,  98, 112, 100, 103,  99
};
static const unsigned char std_chrominance_quant_tbl[64] = {
    17,  18,  24,  47,  99,  99,  99,  99,
    18,  21,  26,  66,  99,  99,  99,  99,
    24,  26,  56,  99,  99,  99,  99,  99,
    47,  66,  99,  99,  99,  99,  99,  99,
    99,  99,  99,  99,  99,  99,  99,  99,
    99,  99,  99,  99,  99,  99,  99,  99,
    99,  99,  99,  99,  99,  99,  99,  99,
    99,  99,  99,  99,  99,  99,  99,  99
};
#endif

/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */
/* IMPORTANT: these are only valid for 8-bit data precision! */
163
static const uint8_t bits_dc_luminance[17] =
164
{ /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 };
165
static const uint8_t val_dc_luminance[] =
166 167
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };

168
static const uint8_t bits_dc_chrominance[17] =
169
{ /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 };
170
static const uint8_t val_dc_chrominance[] =
171 172
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 };

173
static const uint8_t bits_ac_luminance[17] =
174
{ /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d };
175
static const uint8_t val_ac_luminance[] =
176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198
{ 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
  0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
  0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
  0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
  0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
  0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
  0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
  0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
  0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
  0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
  0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
  0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
  0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
  0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
  0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
  0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
  0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
  0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
  0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
  0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
  0xf9, 0xfa 
};

199
static const uint8_t bits_ac_chrominance[17] =
200 201
{ /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 };

202
static const uint8_t val_ac_chrominance[] =
203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226
{ 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
  0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
  0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
  0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
  0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
  0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
  0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
  0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
  0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
  0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
  0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
  0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
  0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
  0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
  0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
  0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
  0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
  0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
  0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
  0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
  0xf9, 0xfa 
};

/* isn't this function nicer than the one in the libjpeg ? */
227 228
static void build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code,
                                const uint8_t *bits_table, const uint8_t *val_table)
229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245
{
    int i, j, k,nb, code, sym;

    code = 0;
    k = 0;
    for(i=1;i<=16;i++) {
        nb = bits_table[i];
        for(j=0;j<nb;j++) {
            sym = val_table[k++];
            huff_size[sym] = i;
            huff_code[sym] = code;
            code++;
        }
        code <<= 1;
    }
}

246
#ifdef CONFIG_ENCODERS
247 248 249 250
int mjpeg_init(MpegEncContext *s)
{
    MJpegContext *m;
    
251
    m = av_malloc(sizeof(MJpegContext));
252 253
    if (!m)
        return -1;
254 255 256
    
    s->min_qcoeff=-1023;
    s->max_qcoeff= 1023;
257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281

    /* build all the huffman tables */
    build_huffman_codes(m->huff_size_dc_luminance,
                        m->huff_code_dc_luminance,
                        bits_dc_luminance,
                        val_dc_luminance);
    build_huffman_codes(m->huff_size_dc_chrominance,
                        m->huff_code_dc_chrominance,
                        bits_dc_chrominance,
                        val_dc_chrominance);
    build_huffman_codes(m->huff_size_ac_luminance,
                        m->huff_code_ac_luminance,
                        bits_ac_luminance,
                        val_ac_luminance);
    build_huffman_codes(m->huff_size_ac_chrominance,
                        m->huff_code_ac_chrominance,
                        bits_ac_chrominance,
                        val_ac_chrominance);
    
    s->mjpeg_ctx = m;
    return 0;
}

void mjpeg_close(MpegEncContext *s)
{
282
    av_free(s->mjpeg_ctx);
283
}
284
#endif //CONFIG_ENCODERS
285

M
cleanup  
Michael Niedermayer 已提交
286 287 288 289 290 291 292 293
#define PREDICT(ret, topleft, top, left, predictor)\
    switch(predictor){\
        case 1: ret= left; break;\
        case 2: ret= top; break;\
        case 3: ret= topleft; break;\
        case 4: ret= left   +   top - topleft; break;\
        case 5: ret= left   + ((top - topleft)>>1); break;\
        case 6: ret= top + ((left   - topleft)>>1); break;\
F
Fabrice Bellard 已提交
294
        default:\
M
cleanup  
Michael Niedermayer 已提交
295
        case 7: ret= (left + top)>>1; break;\
296 297
    }

M
Michael Niedermayer 已提交
298
#ifdef CONFIG_ENCODERS
299 300 301 302 303 304 305 306
static inline void put_marker(PutBitContext *p, int code)
{
    put_bits(p, 8, 0xff);
    put_bits(p, 8, code);
}

/* table_class: 0 = DC coef, 1 = AC coefs */
static int put_huffman_table(MpegEncContext *s, int table_class, int table_id,
307
                             const uint8_t *bits_table, const uint8_t *value_table)
308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329
{
    PutBitContext *p = &s->pb;
    int n, i;

    put_bits(p, 4, table_class);
    put_bits(p, 4, table_id);

    n = 0;
    for(i=1;i<=16;i++) {
        n += bits_table[i];
        put_bits(p, 8, bits_table[i]);
    }

    for(i=0;i<n;i++)
        put_bits(p, 8, value_table[i]);

    return n + 17;
}

static void jpeg_table_header(MpegEncContext *s)
{
    PutBitContext *p = &s->pb;
330
    int i, j, size;
331
    uint8_t *ptr;
332 333 334

    /* quant matrixes */
    put_marker(p, DQT);
335 336 337
#ifdef TWOMATRIXES
    put_bits(p, 16, 2 + 2 * (1 + 64));
#else
338
    put_bits(p, 16, 2 + 1 * (1 + 64));
339
#endif
340 341 342
    put_bits(p, 4, 0); /* 8 bit precision */
    put_bits(p, 4, 0); /* table 0 */
    for(i=0;i<64;i++) {
343
        j = s->intra_scantable.permutated[i];
344
        put_bits(p, 8, s->intra_matrix[j]);
345
    }
346
#ifdef TWOMATRIXES
347 348 349
    put_bits(p, 4, 0); /* 8 bit precision */
    put_bits(p, 4, 1); /* table 1 */
    for(i=0;i<64;i++) {
350
        j = s->intra_scantable.permutated[i];
351
        put_bits(p, 8, s->chroma_intra_matrix[j]);
352 353 354 355 356 357
    }
#endif

    /* huffman table */
    put_marker(p, DHT);
    flush_put_bits(p);
358
    ptr = pbBufPtr(p);
359 360 361 362 363 364 365 366 367 368 369
    put_bits(p, 16, 0); /* patched later */
    size = 2;
    size += put_huffman_table(s, 0, 0, bits_dc_luminance, val_dc_luminance);
    size += put_huffman_table(s, 0, 1, bits_dc_chrominance, val_dc_chrominance);
    
    size += put_huffman_table(s, 1, 0, bits_ac_luminance, val_ac_luminance);
    size += put_huffman_table(s, 1, 1, bits_ac_chrominance, val_ac_chrominance);
    ptr[0] = size >> 8;
    ptr[1] = size;
}

370 371 372 373
static void jpeg_put_comments(MpegEncContext *s)
{
    PutBitContext *p = &s->pb;
    int size;
374
    uint8_t *ptr;
375

376
    if (s->aspect_ratio_info /* && !lossless */)
A
Alex Beregszaszi 已提交
377
    {
378 379 380
    /* JFIF header */
    put_marker(p, APP0);
    put_bits(p, 16, 16);
381
    put_string(p, "JFIF", 1); /* this puts the trailing zero-byte too */
A
Alex Beregszaszi 已提交
382
    put_bits(p, 16, 0x0201); /* v 1.02 */
383
    put_bits(p, 8, 0); /* units type: 0 - aspect ratio */
M
Michael Niedermayer 已提交
384 385
    put_bits(p, 16, s->avctx->sample_aspect_ratio.num);
    put_bits(p, 16, s->avctx->sample_aspect_ratio.den);
386 387
    put_bits(p, 8, 0); /* thumbnail width */
    put_bits(p, 8, 0); /* thumbnail height */
A
Alex Beregszaszi 已提交
388
    }
389 390

    /* comment */
391
    if(!(s->flags & CODEC_FLAG_BITEXACT)){
392 393 394 395
        put_marker(p, COM);
        flush_put_bits(p);
        ptr = pbBufPtr(p);
        put_bits(p, 16, 0); /* patched later */
396
        put_string(p, LIBAVCODEC_IDENT, 1);
A
Alex Beregszaszi 已提交
397
        size = strlen(LIBAVCODEC_IDENT)+3;
398 399 400
        ptr[0] = size >> 8;
        ptr[1] = size;
    }
401 402
}

403 404
void mjpeg_picture_header(MpegEncContext *s)
{
405 406
    const int lossless= s->avctx->codec_id == CODEC_ID_LJPEG;

407 408
    put_marker(&s->pb, SOI);

409 410
    if (!s->mjpeg_data_only_frames)
    {
411 412
    jpeg_put_comments(s);    

A
Arpi 已提交
413
    if (s->mjpeg_write_tables) jpeg_table_header(s);
414

415
    put_marker(&s->pb, lossless ? SOF3 : SOF0);
416 417

    put_bits(&s->pb, 16, 17);
418 419 420 421
    if(lossless && s->avctx->pix_fmt == PIX_FMT_RGBA32)
        put_bits(&s->pb, 8, 9); /* 9 bits/component RCT */
    else
        put_bits(&s->pb, 8, 8); /* 8 bits/component */
422 423 424 425 426 427
    put_bits(&s->pb, 16, s->height);
    put_bits(&s->pb, 16, s->width);
    put_bits(&s->pb, 8, 3); /* 3 components */
    
    /* Y component */
    put_bits(&s->pb, 8, 1); /* component number */
A
Arpi 已提交
428 429
    put_bits(&s->pb, 4, s->mjpeg_hsample[0]); /* H factor */
    put_bits(&s->pb, 4, s->mjpeg_vsample[0]); /* V factor */
430 431 432 433
    put_bits(&s->pb, 8, 0); /* select matrix */
    
    /* Cb component */
    put_bits(&s->pb, 8, 2); /* component number */
A
Arpi 已提交
434 435
    put_bits(&s->pb, 4, s->mjpeg_hsample[1]); /* H factor */
    put_bits(&s->pb, 4, s->mjpeg_vsample[1]); /* V factor */
436
#ifdef TWOMATRIXES
437
    put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
438
#else
439
    put_bits(&s->pb, 8, 0); /* select matrix */
440
#endif
441 442 443

    /* Cr component */
    put_bits(&s->pb, 8, 3); /* component number */
A
Arpi 已提交
444 445
    put_bits(&s->pb, 4, s->mjpeg_hsample[2]); /* H factor */
    put_bits(&s->pb, 4, s->mjpeg_vsample[2]); /* V factor */
446
#ifdef TWOMATRIXES
447
    put_bits(&s->pb, 8, lossless ? 0 : 1); /* select matrix */
448
#else
449
    put_bits(&s->pb, 8, 0); /* select matrix */
450
#endif
451
    }
452 453 454 455 456 457 458 459 460 461 462 463 464 465

    /* scan header */
    put_marker(&s->pb, SOS);
    put_bits(&s->pb, 16, 12); /* length */
    put_bits(&s->pb, 8, 3); /* 3 components */
    
    /* Y component */
    put_bits(&s->pb, 8, 1); /* index */
    put_bits(&s->pb, 4, 0); /* DC huffman table index */
    put_bits(&s->pb, 4, 0); /* AC huffman table index */
    
    /* Cb component */
    put_bits(&s->pb, 8, 2); /* index */
    put_bits(&s->pb, 4, 1); /* DC huffman table index */
466
    put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
467 468 469 470
    
    /* Cr component */
    put_bits(&s->pb, 8, 3); /* index */
    put_bits(&s->pb, 4, 1); /* DC huffman table index */
471
    put_bits(&s->pb, 4, lossless ? 0 : 1); /* AC huffman table index */
472

473 474
    put_bits(&s->pb, 8, lossless ? s->avctx->prediction_method+1 : 0); /* Ss (not used) */
    put_bits(&s->pb, 8, lossless ? 0 : 63); /* Se (not used) */
475
    put_bits(&s->pb, 8, 0); /* Ah/Al (not used) */
476 477
}

M
cleanup  
Michael Niedermayer 已提交
478
static void escape_FF(MpegEncContext *s, int start)
M
cleanup  
Michael Niedermayer 已提交
479
{
480
    int size= put_bits_count(&s->pb) - start*8;
M
cleanup  
Michael Niedermayer 已提交
481
    int i, ff_count;
M
cleanup  
Michael Niedermayer 已提交
482
    uint8_t *buf= s->pb.buf + start;
F
Falk Hüffner 已提交
483
    int align= (-(size_t)(buf))&3;
M
cleanup  
Michael Niedermayer 已提交
484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533
    
    assert((size&7) == 0);
    size >>= 3;
    
    ff_count=0;
    for(i=0; i<size && i<align; i++){
        if(buf[i]==0xFF) ff_count++;
    }
    for(; i<size-15; i+=16){
        int acc, v;

        v= *(uint32_t*)(&buf[i]);
        acc= (((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
        v= *(uint32_t*)(&buf[i+4]);
        acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
        v= *(uint32_t*)(&buf[i+8]);
        acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;
        v= *(uint32_t*)(&buf[i+12]);
        acc+=(((v & (v>>4))&0x0F0F0F0F)+0x01010101)&0x10101010;

        acc>>=4;
        acc+= (acc>>16);
        acc+= (acc>>8);
        ff_count+= acc&0xFF;
    }
    for(; i<size; i++){
        if(buf[i]==0xFF) ff_count++;
    }

    if(ff_count==0) return;
    
    /* skip put bits */
    for(i=0; i<ff_count-3; i+=4)
        put_bits(&s->pb, 32, 0);
    put_bits(&s->pb, (ff_count-i)*8, 0);
    flush_put_bits(&s->pb); 

    for(i=size-1; ff_count; i--){
        int v= buf[i];

        if(v==0xFF){
//printf("%d %d\n", i, ff_count);
            buf[i+ff_count]= 0;
            ff_count--;
        }

        buf[i+ff_count]= v;
    }
}

534 535 536 537 538 539 540
void ff_mjpeg_stuffing(PutBitContext * pbc)
{
    int length;
    length= (-put_bits_count(pbc))&7;
    if(length) put_bits(pbc, length, (1<<length)-1);
}

541 542
void mjpeg_picture_trailer(MpegEncContext *s)
{
543
    ff_mjpeg_stuffing(&s->pb);
M
cleanup  
Michael Niedermayer 已提交
544 545
    flush_put_bits(&s->pb);

M
cleanup  
Michael Niedermayer 已提交
546 547 548
    assert((s->header_bits&7)==0);
    
    escape_FF(s, s->header_bits>>3);
M
cleanup  
Michael Niedermayer 已提交
549

550 551 552
    put_marker(&s->pb, EOI);
}

553
static inline void mjpeg_encode_dc(MpegEncContext *s, int val,
554
				   uint8_t *huff_size, uint16_t *huff_code)
555 556 557 558
{
    int mant, nbits;

    if (val == 0) {
M
cleanup  
Michael Niedermayer 已提交
559
        put_bits(&s->pb, huff_size[0], huff_code[0]);
560 561 562 563 564 565 566
    } else {
        mant = val;
        if (val < 0) {
            val = -val;
            mant--;
        }
        
M
Michael Niedermayer 已提交
567
        nbits= av_log2_16bit(val) + 1;
568
            
M
cleanup  
Michael Niedermayer 已提交
569
        put_bits(&s->pb, huff_size[nbits], huff_code[nbits]);
570
        
M
cleanup  
Michael Niedermayer 已提交
571
        put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
572 573 574 575 576 577 578 579
    }
}

static void encode_block(MpegEncContext *s, DCTELEM *block, int n)
{
    int mant, nbits, code, i, j;
    int component, dc, run, last_index, val;
    MJpegContext *m = s->mjpeg_ctx;
580 581
    uint8_t *huff_size_ac;
    uint16_t *huff_code_ac;
582 583 584 585 586 587
    
    /* DC coef */
    component = (n <= 3 ? 0 : n - 4 + 1);
    dc = block[0]; /* overflow is impossible */
    val = dc - s->last_dc[component];
    if (n < 4) {
588
        mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
589 590 591
        huff_size_ac = m->huff_size_ac_luminance;
        huff_code_ac = m->huff_code_ac_luminance;
    } else {
592
        mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
593 594 595 596 597 598 599 600 601 602
        huff_size_ac = m->huff_size_ac_chrominance;
        huff_code_ac = m->huff_code_ac_chrominance;
    }
    s->last_dc[component] = dc;
    
    /* AC coefs */
    
    run = 0;
    last_index = s->block_last_index[n];
    for(i=1;i<=last_index;i++) {
603
        j = s->intra_scantable.permutated[i];
604 605 606 607 608
        val = block[j];
        if (val == 0) {
            run++;
        } else {
            while (run >= 16) {
M
cleanup  
Michael Niedermayer 已提交
609
                put_bits(&s->pb, huff_size_ac[0xf0], huff_code_ac[0xf0]);
610 611 612 613 614 615 616 617
                run -= 16;
            }
            mant = val;
            if (val < 0) {
                val = -val;
                mant--;
            }
            
M
Michael Niedermayer 已提交
618
            nbits= av_log2(val) + 1;
619 620
            code = (run << 4) | nbits;

M
cleanup  
Michael Niedermayer 已提交
621
            put_bits(&s->pb, huff_size_ac[code], huff_code_ac[code]);
622
        
M
cleanup  
Michael Niedermayer 已提交
623
            put_bits(&s->pb, nbits, mant & ((1 << nbits) - 1));
624 625 626 627 628 629
            run = 0;
        }
    }

    /* output EOB only if not already 64 values */
    if (last_index < 63 || run != 0)
M
cleanup  
Michael Niedermayer 已提交
630
        put_bits(&s->pb, huff_size_ac[0], huff_code_ac[0]);
631 632 633 634 635 636 637 638 639 640 641
}

void mjpeg_encode_mb(MpegEncContext *s, 
                     DCTELEM block[6][64])
{
    int i;
    for(i=0;i<6;i++) {
        encode_block(s, block[i], i);
    }
}

642 643 644 645 646 647 648 649 650
static int encode_picture_lossless(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
    MpegEncContext * const s = avctx->priv_data;
    MJpegContext * const m = s->mjpeg_ctx;
    AVFrame *pict = data;
    const int width= s->width;
    const int height= s->height;
    AVFrame * const p= (AVFrame*)&s->current_picture;
    const int predictor= avctx->prediction_method+1;

651
    init_put_bits(&s->pb, buf, buf_size);
652 653 654 655 656 657 658

    *p = *pict;
    p->pict_type= FF_I_TYPE;
    p->key_frame= 1;
    
    mjpeg_picture_header(s);

659
    s->header_bits= put_bits_count(&s->pb);
660 661 662 663 664 665 666 667 668 669 670 671

    if(avctx->pix_fmt == PIX_FMT_RGBA32){
        int x, y, i;
        const int linesize= p->linesize[0];
        uint16_t buffer[2048][4];
        int left[3], top[3], topleft[3];

        for(i=0; i<3; i++){
            buffer[0][i]= 1 << (9 - 1);
        }

        for(y = 0; y < height; y++) {
M
10l  
Michael Niedermayer 已提交
672
            const int modified_predictor= y ? predictor : 1;
673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777
            uint8_t *ptr = p->data[0] + (linesize * y);

            for(i=0; i<3; i++){
                top[i]= left[i]= topleft[i]= buffer[0][i];
            }
            for(x = 0; x < width; x++) {
                buffer[x][1] = ptr[4*x+0] - ptr[4*x+1] + 0x100;
                buffer[x][2] = ptr[4*x+2] - ptr[4*x+1] + 0x100;
                buffer[x][0] = (ptr[4*x+0] + 2*ptr[4*x+1] + ptr[4*x+2])>>2;

                for(i=0;i<3;i++) {
                    int pred, diff;

                    PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
                        
                    topleft[i]= top[i];
                    top[i]= buffer[x+1][i];
                    
                    left[i]= buffer[x][i];

                    diff= ((left[i] - pred + 0x100)&0x1FF) - 0x100;
                    
                    if(i==0)
                        mjpeg_encode_dc(s, diff, m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
                    else
                        mjpeg_encode_dc(s, diff, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
                }
            }
        }
    }else{
        int mb_x, mb_y, i;
        const int mb_width  = (width  + s->mjpeg_hsample[0] - 1) / s->mjpeg_hsample[0];
        const int mb_height = (height + s->mjpeg_vsample[0] - 1) / s->mjpeg_vsample[0];
        
        for(mb_y = 0; mb_y < mb_height; mb_y++) {
            for(mb_x = 0; mb_x < mb_width; mb_x++) {
                if(mb_x==0 || mb_y==0){
                    for(i=0;i<3;i++) {
                        uint8_t *ptr;
                        int x, y, h, v, linesize;
                        h = s->mjpeg_hsample[i];
                        v = s->mjpeg_vsample[i];
                        linesize= p->linesize[i];

                        for(y=0; y<v; y++){
                            for(x=0; x<h; x++){
                                int pred;

                                ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
                                if(y==0 && mb_y==0){
                                    if(x==0 && mb_x==0){
                                        pred= 128;
                                    }else{
                                        pred= ptr[-1];
                                    }
                                }else{
                                    if(x==0 && mb_x==0){
                                        pred= ptr[-linesize];
                                    }else{
                                        PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
                                    }
                                }
                                
                                if(i==0)
                                    mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
                                else
                                    mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
                            }
                        }
                    }
                }else{
                    for(i=0;i<3;i++) {
                        uint8_t *ptr;
                        int x, y, h, v, linesize;
                        h = s->mjpeg_hsample[i];
                        v = s->mjpeg_vsample[i];
                        linesize= p->linesize[i];
                             
                        for(y=0; y<v; y++){
                            for(x=0; x<h; x++){
                                int pred;

                                ptr = p->data[i] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
//printf("%d %d %d %d %8X\n", mb_x, mb_y, x, y, ptr); 
                                PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);

                                if(i==0)
                                    mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_luminance, m->huff_code_dc_luminance); //FIXME ugly
                                else
                                    mjpeg_encode_dc(s, (int8_t)(*ptr - pred), m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
                            }
                        }
                    }
                }
            }
        }
    }

    emms_c();
    
    mjpeg_picture_trailer(s);
    s->picture_number++;

    flush_put_bits(&s->pb);
    return pbBufPtr(&s->pb) - s->pb.buf;
778
//    return (put_bits_count(&f->pb)+7)/8;
779 780
}

M
Michael Niedermayer 已提交
781
#endif //CONFIG_ENCODERS
782

783 784 785 786 787 788
/******************************************/
/* decoding */

#define MAX_COMPONENTS 4

typedef struct MJpegDecodeContext {
789
    AVCodecContext *avctx;
790
    GetBitContext gb;
791 792
    int mpeg_enc_ctx_allocated; /* true if decoding context allocated */

793 794
    int start_code; /* current start code */
    int buffer_size;
795
    uint8_t *buffer;
796

797
    int16_t quant_matrixes[4][64];
798
    VLC vlcs[2][4];
M
Michael Niedermayer 已提交
799
    int qscale[4];      ///< quantizer scale calculated from quant_matrixes
F
Fabrice Bellard 已提交
800

801
    int org_height;  /* size given at codec init */
F
Fabrice Bellard 已提交
802 803 804
    int first_picture;    /* true if decoding first picture */
    int interlaced;     /* true if interlaced */
    int bottom_field;   /* true if bottom field */
805 806
    int lossless;
    int rgb;
807 808
    int rct;            /* standard rct */  
    int pegasus_rct;    /* pegasus reversible colorspace transform */  
M
cleanup  
Michael Niedermayer 已提交
809
    int bits;           /* bits per component */
F
Fabrice Bellard 已提交
810

811
    int width, height;
M
cleanup  
Michael Niedermayer 已提交
812
    int mb_width, mb_height;
813 814
    int nb_components;
    int component_id[MAX_COMPONENTS];
815 816
    int h_count[MAX_COMPONENTS]; /* horizontal and vertical count for each component */
    int v_count[MAX_COMPONENTS];
M
cleanup  
Michael Niedermayer 已提交
817 818 819 820 821 822
    int comp_index[MAX_COMPONENTS];
    int dc_index[MAX_COMPONENTS];
    int ac_index[MAX_COMPONENTS];
    int nb_blocks[MAX_COMPONENTS];
    int h_scount[MAX_COMPONENTS];
    int v_scount[MAX_COMPONENTS];
823 824 825
    int h_max, v_max; /* maximum h and v counts */
    int quant_index[4];   /* quant table index for each component */
    int last_dc[MAX_COMPONENTS]; /* last DEQUANTIZED dc (XXX: am I right to do that ?) */
M
Michael Niedermayer 已提交
826 827
    AVFrame picture; /* picture structure */
    int linesize[MAX_COMPONENTS];                   ///< linesize << interlaced
M
Michael Niedermayer 已提交
828
    uint8_t *qscale_table;
829
    DCTELEM block[64] __align8;
830
    ScanTable scantable;
831
    void (*idct_put)(uint8_t *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
832

833 834
    int restart_interval;
    int restart_count;
835 836

    int buggy_avid;
837
    int interlace_polarity;
838 839
} MJpegDecodeContext;

840
static int mjpeg_decode_dht(MJpegDecodeContext *s);
J
Juanjo 已提交
841

M
Michael Niedermayer 已提交
842
static int build_vlc(VLC *vlc, const uint8_t *bits_table, const uint8_t *val_table, 
843 844
                      int nb_codes)
{
845 846
    uint8_t huff_size[256];
    uint16_t huff_code[256];
847 848 849 850

    memset(huff_size, 0, sizeof(huff_size));
    build_huffman_codes(huff_size, huff_code, bits_table, val_table);
    
M
Michael Niedermayer 已提交
851
    return init_vlc(vlc, 9, nb_codes, huff_size, 1, 1, huff_code, 2, 2);
852 853
}

854 855 856
static int mjpeg_decode_init(AVCodecContext *avctx)
{
    MJpegDecodeContext *s = avctx->priv_data;
857
    MpegEncContext s2;
858

859 860
    s->avctx = avctx;

861
    /* ugly way to get the idct & scantable FIXME */
862 863 864
    memset(&s2, 0, sizeof(MpegEncContext));
    s2.avctx= avctx;
//    s2->out_format = FMT_MJPEG;
M
Michael Niedermayer 已提交
865 866 867
    dsputil_init(&s2.dsp, avctx);
    DCT_common_init(&s2);

868
    s->scantable= s2.intra_scantable;
869
    s->idct_put= s2.dsp.idct_put;
870

871
    s->mpeg_enc_ctx_allocated = 0;
872 873
    s->buffer_size = 102400; /* smaller buffer should be enough,
				but photojpg files could ahive bigger sizes */
874
    s->buffer = av_malloc(s->buffer_size);
875 876
    if (!s->buffer)
	return -1;
877
    s->start_code = -1;
F
Fabrice Bellard 已提交
878 879
    s->first_picture = 1;
    s->org_height = avctx->height;
880
    
881 882 883 884
    build_vlc(&s->vlcs[0][0], bits_dc_luminance, val_dc_luminance, 12);
    build_vlc(&s->vlcs[0][1], bits_dc_chrominance, val_dc_chrominance, 12);
    build_vlc(&s->vlcs[1][0], bits_ac_luminance, val_ac_luminance, 251);
    build_vlc(&s->vlcs[1][1], bits_ac_chrominance, val_ac_chrominance, 251);
885

886 887
    if (avctx->flags & CODEC_FLAG_EXTERN_HUFF)
    {
888
	av_log(avctx, AV_LOG_INFO, "mjpeg: using external huffman table\n");
889
	init_get_bits(&s->gb, avctx->extradata, avctx->extradata_size*8);
890
	mjpeg_decode_dht(s);
891 892
	/* should check for error - but dunno */
    }
893

894 895 896 897
    return 0;
}

/* quantize tables */
898
static int mjpeg_decode_dqt(MJpegDecodeContext *s)
899
{
900
    int len, index, i, j;
901 902
    
    len = get_bits(&s->gb, 16) - 2;
903 904 905 906

    while (len >= 65) {
        /* only 8 bit precision handled */
        if (get_bits(&s->gb, 4) != 0)
907 908
	{
	    dprintf("dqt: 16bit precision\n");
909
            return -1;
910
	}
911 912 913 914 915
        index = get_bits(&s->gb, 4);
        if (index >= 4)
            return -1;
        dprintf("index=%d\n", index);
        /* read quant table */
916
        for(i=0;i<64;i++) {
917
            j = s->scantable.permutated[i];
918
	    s->quant_matrixes[index][j] = get_bits(&s->gb, 8);
919
        }
M
Michael Niedermayer 已提交
920 921 922 923 924

        //XXX FIXME finetune, and perhaps add dc too
        s->qscale[index]= FFMAX(
            s->quant_matrixes[index][s->scantable.permutated[1]],
            s->quant_matrixes[index][s->scantable.permutated[8]]) >> 1;
925
	dprintf("qscale[%d]: %d\n", index, s->qscale[index]);
926 927
        len -= 65;
    }
928
    
929 930 931 932
    return 0;
}

/* decode huffman tables and build VLC decoders */
933
static int mjpeg_decode_dht(MJpegDecodeContext *s)
934 935
{
    int len, index, i, class, n, v, code_max;
936 937
    uint8_t bits_table[17];
    uint8_t val_table[256];
938
    
939
    len = get_bits(&s->gb, 16) - 2;
940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971

    while (len > 0) {
        if (len < 17)
            return -1;
        class = get_bits(&s->gb, 4);
        if (class >= 2)
            return -1;
        index = get_bits(&s->gb, 4);
        if (index >= 4)
            return -1;
        n = 0;
        for(i=1;i<=16;i++) {
            bits_table[i] = get_bits(&s->gb, 8);
            n += bits_table[i];
        }
        len -= 17;
        if (len < n || n > 256)
            return -1;

        code_max = 0;
        for(i=0;i<n;i++) {
            v = get_bits(&s->gb, 8);
            if (v > code_max)
                code_max = v;
            val_table[i] = v;
        }
        len -= n;

        /* build VLC and flush previous vlc if present */
        free_vlc(&s->vlcs[class][index]);
        dprintf("class=%d index=%d nb_codes=%d\n",
               class, index, code_max + 1);
M
Michael Niedermayer 已提交
972 973 974
        if(build_vlc(&s->vlcs[class][index], bits_table, val_table, code_max + 1) < 0){
            return -1;
        }
975 976 977 978
    }
    return 0;
}

979
static int mjpeg_decode_sof(MJpegDecodeContext *s)
980
{
981
    int len, nb_components, i, width, height;
982 983 984

    /* XXX: verify len field validity */
    len = get_bits(&s->gb, 16);
M
cleanup  
Michael Niedermayer 已提交
985
    s->bits= get_bits(&s->gb, 8);
986 987 988
    
    if(s->pegasus_rct) s->bits=9;  
    if(s->bits==9 && !s->pegasus_rct) s->rct=1;    //FIXME ugly
M
cleanup  
Michael Niedermayer 已提交
989 990

    if (s->bits != 8 && !s->lossless){
991
        av_log(s->avctx, AV_LOG_ERROR, "only 8 bits/component accepted\n");
992
        return -1;
993
    }
994 995
    height = get_bits(&s->gb, 16);
    width = get_bits(&s->gb, 16);
996
    dprintf("sof0: picture: %dx%d\n", width, height);
997 998 999 1000 1001

    nb_components = get_bits(&s->gb, 8);
    if (nb_components <= 0 ||
        nb_components > MAX_COMPONENTS)
        return -1;
1002
    s->nb_components = nb_components;
1003 1004 1005 1006
    s->h_max = 1;
    s->v_max = 1;
    for(i=0;i<nb_components;i++) {
        /* component id */
1007
        s->component_id[i] = get_bits(&s->gb, 8) - 1;
1008 1009 1010 1011 1012 1013 1014 1015 1016 1017
        s->h_count[i] = get_bits(&s->gb, 4);
        s->v_count[i] = get_bits(&s->gb, 4);
        /* compute hmax and vmax (only used in interleaved case) */
        if (s->h_count[i] > s->h_max)
            s->h_max = s->h_count[i];
        if (s->v_count[i] > s->v_max)
            s->v_max = s->v_count[i];
        s->quant_index[i] = get_bits(&s->gb, 8);
        if (s->quant_index[i] >= 4)
            return -1;
1018 1019
        dprintf("component %d %d:%d id: %d quant:%d\n", i, s->h_count[i],
	    s->v_count[i], s->component_id[i], s->quant_index[i]);
1020
    }
M
cleanup  
Michael Niedermayer 已提交
1021 1022
    
    if(s->v_max==1 && s->h_max==1 && s->lossless==1) s->rgb=1;
1023 1024 1025 1026

    /* if different size, realloc/alloc picture */
    /* XXX: also check h_count and v_count */
    if (width != s->width || height != s->height) {
M
Michael Niedermayer 已提交
1027 1028
        av_freep(&s->qscale_table);
            
1029 1030
        s->width = width;
        s->height = height;
1031 1032 1033
        s->avctx->width = s->width;
        s->avctx->height = s->height;

F
Fabrice Bellard 已提交
1034 1035 1036 1037 1038
        /* test interlaced mode */
        if (s->first_picture &&
            s->org_height != 0 &&
            s->height < ((s->org_height * 3) / 4)) {
            s->interlaced = 1;
1039
//	    s->bottom_field = (s->interlace_polarity) ? 1 : 0;
1040 1041
            s->bottom_field = 0;
            s->avctx->height *= 2;
F
Fabrice Bellard 已提交
1042 1043
        }

M
Michael Niedermayer 已提交
1044 1045
        s->qscale_table= av_mallocz((s->width+15)/16);

F
Fabrice Bellard 已提交
1046
        s->first_picture = 0;
1047
    }
M
Michael Niedermayer 已提交
1048 1049 1050 1051 1052 1053 1054 1055 1056
    
    if(s->interlaced && s->bottom_field)
        return 0;
 
    /* XXX: not complete test ! */
    switch((s->h_count[0] << 4) | s->v_count[0]) {
    case 0x11:
        if(s->rgb){
            s->avctx->pix_fmt = PIX_FMT_RGBA32;
1057
        }else if(s->nb_components==3)
M
Michael Niedermayer 已提交
1058
            s->avctx->pix_fmt = PIX_FMT_YUV444P;
1059 1060
        else
            s->avctx->pix_fmt = PIX_FMT_GRAY8;
M
Michael Niedermayer 已提交
1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075
        break;
    case 0x21:
        s->avctx->pix_fmt = PIX_FMT_YUV422P;
        break;
    default:
    case 0x22:
        s->avctx->pix_fmt = PIX_FMT_YUV420P;
        break;
    }

    if(s->picture.data[0])
        s->avctx->release_buffer(s->avctx, &s->picture);

    s->picture.reference= 0;
    if(s->avctx->get_buffer(s->avctx, &s->picture) < 0){
1076
        av_log(s->avctx, AV_LOG_ERROR, "get_buffer() failed\n");
M
Michael Niedermayer 已提交
1077 1078 1079 1080 1081 1082 1083 1084
        return -1;
    }
    s->picture.pict_type= I_TYPE;
    s->picture.key_frame= 1;
    
    for(i=0; i<3; i++){
        s->linesize[i]= s->picture.linesize[i] << s->interlaced;
    }
1085

M
Michael Niedermayer 已提交
1086 1087
//    printf("%d %d %d %d %d %d\n", s->width, s->height, s->linesize[0], s->linesize[1], s->interlaced, s->avctx->height);
    
1088 1089
    if (len != (8+(3*nb_components)))
    {
1090
	dprintf("decode_sof0: error, len(%d) mismatch\n", len);
1091
    }
F
Fabrice Bellard 已提交
1092
    
1093 1094 1095
    return 0;
}

1096
static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index)
1097
{
M
Michael Niedermayer 已提交
1098
    int code;
M
Michael Niedermayer 已提交
1099
    code = get_vlc2(&s->gb, s->vlcs[0][dc_index].table, 9, 2);
1100
    if (code < 0)
1101
    {
1102
	dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index,
1103
                &s->vlcs[0][dc_index]);
1104
        return 0xffff;
1105
    }
M
Michael Niedermayer 已提交
1106 1107 1108 1109 1110

    if(code)
        return get_xbits(&s->gb, code);
    else
        return 0;
1111 1112 1113 1114 1115 1116
}

/* decode block and dequantize */
static int decode_block(MJpegDecodeContext *s, DCTELEM *block, 
                        int component, int dc_index, int ac_index, int quant_index)
{
M
Michael Niedermayer 已提交
1117
    int code, i, j, level, val;
1118
    VLC *ac_vlc;
1119
    int16_t *quant_matrix;
1120 1121

    /* DC coef */
1122
    val = mjpeg_decode_dc(s, dc_index);
1123 1124 1125 1126
    if (val == 0xffff) {
        dprintf("error dc\n");
        return -1;
    }
1127
    quant_matrix = s->quant_matrixes[quant_index];
1128 1129 1130 1131 1132 1133 1134
    val = val * quant_matrix[0] + s->last_dc[component];
    s->last_dc[component] = val;
    block[0] = val;
    /* AC coefs */
    ac_vlc = &s->vlcs[1][ac_index];
    i = 1;
    for(;;) {
M
Michael Niedermayer 已提交
1135
	code = get_vlc2(&s->gb, s->vlcs[1][ac_index].table, 9, 2);
M
cleanup  
Michael Niedermayer 已提交
1136

1137 1138 1139 1140 1141 1142 1143 1144 1145 1146
        if (code < 0) {
            dprintf("error ac\n");
            return -1;
        }
        /* EOB */
        if (code == 0)
            break;
        if (code == 0xf0) {
            i += 16;
        } else {
M
Michael Niedermayer 已提交
1147 1148
            level = get_xbits(&s->gb, code & 0xf);
            i += code >> 4;
1149 1150 1151 1152
            if (i >= 64) {
                dprintf("error count: %d\n", i);
                return -1;
            }
1153
            j = s->scantable.permutated[i];
1154 1155
            block[j] = level * quant_matrix[j];
            i++;
1156 1157
            if (i >= 64)
                break;
1158 1159 1160 1161 1162
        }
    }
    return 0;
}

M
cleanup  
Michael Niedermayer 已提交
1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173
static int ljpeg_decode_rgb_scan(MJpegDecodeContext *s, int predictor, int point_transform){
    int i, mb_x, mb_y;
    uint16_t buffer[2048][4];
    int left[3], top[3], topleft[3];
    const int linesize= s->linesize[0];
    const int mask= (1<<s->bits)-1;
    
    for(i=0; i<3; i++){
        buffer[0][i]= 1 << (s->bits + point_transform - 1);
    }
    for(mb_y = 0; mb_y < s->mb_height; mb_y++) {
M
10l  
Michael Niedermayer 已提交
1174
        const int modified_predictor= mb_y ? predictor : 1;
M
Michael Niedermayer 已提交
1175
        uint8_t *ptr = s->picture.data[0] + (linesize * mb_y);
M
cleanup  
Michael Niedermayer 已提交
1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251

        if (s->interlaced && s->bottom_field)
            ptr += linesize >> 1;

        for(i=0; i<3; i++){
            top[i]= left[i]= topleft[i]= buffer[0][i];
        }
        for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
            if (s->restart_interval && !s->restart_count)
                s->restart_count = s->restart_interval;

            for(i=0;i<3;i++) {
                int pred;

                topleft[i]= top[i];
                top[i]= buffer[mb_x][i];

                PREDICT(pred, topleft[i], top[i], left[i], modified_predictor);
                
                left[i]= 
                buffer[mb_x][i]= mask & (pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform));
            }

            if (s->restart_interval && !--s->restart_count) {
                align_get_bits(&s->gb);
                skip_bits(&s->gb, 16); /* skip RSTn */
            }
        }

        if(s->rct){
            for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
                ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2] - 0x200)>>2);
                ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1];
                ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1];
            }
        }else if(s->pegasus_rct){
            for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
                ptr[4*mb_x+1] = buffer[mb_x][0] - ((buffer[mb_x][1] + buffer[mb_x][2])>>2);
                ptr[4*mb_x+0] = buffer[mb_x][1] + ptr[4*mb_x+1];
                ptr[4*mb_x+2] = buffer[mb_x][2] + ptr[4*mb_x+1];
            }
        }else{
            for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
                ptr[4*mb_x+0] = buffer[mb_x][0];
                ptr[4*mb_x+1] = buffer[mb_x][1];
                ptr[4*mb_x+2] = buffer[mb_x][2];
            }
        }
    }
    return 0;
}

static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, int point_transform){
    int i, mb_x, mb_y;
    const int nb_components=3;

    for(mb_y = 0; mb_y < s->mb_height; mb_y++) {
        for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
            if (s->restart_interval && !s->restart_count)
                s->restart_count = s->restart_interval;

            if(mb_x==0 || mb_y==0 || s->interlaced){
                for(i=0;i<nb_components;i++) {
                    uint8_t *ptr;
                    int n, h, v, x, y, c, j, linesize;
                    n = s->nb_blocks[i];
                    c = s->comp_index[i];
                    h = s->h_scount[i];
                    v = s->v_scount[i];
                    x = 0;
                    y = 0;
                    linesize= s->linesize[c];
                    
                    for(j=0; j<n; j++) {
                        int pred;

M
Michael Niedermayer 已提交
1252
                        ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
M
cleanup  
Michael Niedermayer 已提交
1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291
                        if(y==0 && mb_y==0){
                            if(x==0 && mb_x==0){
                                pred= 128 << point_transform;
                            }else{
                                pred= ptr[-1];
                            }
                        }else{
                            if(x==0 && mb_x==0){
                                pred= ptr[-linesize];
                            }else{
                                PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
                            }
                        }
                        
                        if (s->interlaced && s->bottom_field)
                            ptr += linesize >> 1;
                        *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform);

                        if (++x == h) {
                            x = 0;
                            y++;
                        }
                    }
                }
            }else{
                for(i=0;i<nb_components;i++) {
                    uint8_t *ptr;
                    int n, h, v, x, y, c, j, linesize;
                    n = s->nb_blocks[i];
                    c = s->comp_index[i];
                    h = s->h_scount[i];
                    v = s->v_scount[i];
                    x = 0;
                    y = 0;
                    linesize= s->linesize[c];
                    
                    for(j=0; j<n; j++) {
                        int pred;

M
Michael Niedermayer 已提交
1292
                        ptr = s->picture.data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
M
cleanup  
Michael Niedermayer 已提交
1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337
                        PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
                        *ptr= pred + (mjpeg_decode_dc(s, s->dc_index[i]) << point_transform);
                        if (++x == h) {
                            x = 0;
                            y++;
                        }
                    }
                }
            }
            if (s->restart_interval && !--s->restart_count) {
                align_get_bits(&s->gb);
                skip_bits(&s->gb, 16); /* skip RSTn */
            }
        }
    }
    return 0;
}

static int mjpeg_decode_scan(MJpegDecodeContext *s){
    int i, mb_x, mb_y;
    const int nb_components=3;

    for(mb_y = 0; mb_y < s->mb_height; mb_y++) {
        for(mb_x = 0; mb_x < s->mb_width; mb_x++) {
            if (s->restart_interval && !s->restart_count)
                s->restart_count = s->restart_interval;

            for(i=0;i<nb_components;i++) {
                uint8_t *ptr;
                int n, h, v, x, y, c, j;
                n = s->nb_blocks[i];
                c = s->comp_index[i];
                h = s->h_scount[i];
                v = s->v_scount[i];
                x = 0;
                y = 0;
                for(j=0;j<n;j++) {
                    memset(s->block, 0, sizeof(s->block));
                    if (decode_block(s, s->block, i, 
                                     s->dc_index[i], s->ac_index[i], 
                                     s->quant_index[c]) < 0) {
                        dprintf("error y=%d x=%d\n", mb_y, mb_x);
                        return -1;
                    }
//		    dprintf("mb: %d %d processed\n", mb_y, mb_x);
M
Michael Niedermayer 已提交
1338
                    ptr = s->picture.data[c] + 
M
cleanup  
Michael Niedermayer 已提交
1339 1340 1341 1342
                        (s->linesize[c] * (v * mb_y + y) * 8) + 
                        (h * mb_x + x) * 8;
                    if (s->interlaced && s->bottom_field)
                        ptr += s->linesize[c] >> 1;
M
Michael Niedermayer 已提交
1343
//printf("%d %d %d %d %d %d %d %d \n", mb_x, mb_y, x, y, c, s->bottom_field, (v * mb_y + y) * 8, (h * mb_x + x) * 8);
M
cleanup  
Michael Niedermayer 已提交
1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363
                    s->idct_put(ptr, s->linesize[c], s->block);
                    if (++x == h) {
                        x = 0;
                        y++;
                    }
                }
            }
            /* (< 1350) buggy workaround for Spectralfan.mov, should be fixed */
            if (s->restart_interval && (s->restart_interval < 1350) &&
                !--s->restart_count) {
                align_get_bits(&s->gb);
                skip_bits(&s->gb, 16); /* skip RSTn */
                for (i=0; i<nb_components; i++) /* reset dc */
                    s->last_dc[i] = 1024;
            }
        }
    }
    return 0;
}

1364
static int mjpeg_decode_sos(MJpegDecodeContext *s)
1365
{
F
Fabrice Bellard 已提交
1366
    int len, nb_components, i, h, v, predictor, point_transform;
M
cleanup  
Michael Niedermayer 已提交
1367
    int vmax, hmax, index, id;
1368 1369
    const int block_size= s->lossless ? 1 : 8;

1370 1371 1372
    /* XXX: verify len field validity */
    len = get_bits(&s->gb, 16);
    nb_components = get_bits(&s->gb, 8);
1373 1374 1375 1376 1377
    if (len != 6+2*nb_components)
    {
	dprintf("decode_sos: invalid len (%d)\n", len);
	return -1;
    }
1378
    /* XXX: only interleaved scan accepted */
1379
    if (nb_components != s->nb_components)
1380 1381
    {
	dprintf("decode_sos: components(%d) mismatch\n", nb_components);
1382
        return -1;
1383
    }
1384 1385 1386
    vmax = 0;
    hmax = 0;
    for(i=0;i<nb_components;i++) {
1387
        id = get_bits(&s->gb, 8) - 1;
1388
	dprintf("component: %d\n", id);
1389 1390 1391 1392 1393
        /* find component index */
        for(index=0;index<s->nb_components;index++)
            if (id == s->component_id[index])
                break;
        if (index == s->nb_components)
1394
	{
1395
	    dprintf("decode_sos: index(%d) out of components\n", index);
1396
            return -1;
1397
	}
1398

M
cleanup  
Michael Niedermayer 已提交
1399
        s->comp_index[i] = index;
M
cleanup  
Michael Niedermayer 已提交
1400

M
cleanup  
Michael Niedermayer 已提交
1401 1402 1403
        s->nb_blocks[i] = s->h_count[index] * s->v_count[index];
        s->h_scount[i] = s->h_count[index];
        s->v_scount[i] = s->v_count[index];
1404

M
cleanup  
Michael Niedermayer 已提交
1405 1406
        s->dc_index[i] = get_bits(&s->gb, 4);
        s->ac_index[i] = get_bits(&s->gb, 4);
1407

M
cleanup  
Michael Niedermayer 已提交
1408 1409
	if (s->dc_index[i] <  0 || s->ac_index[i] < 0 ||
	    s->dc_index[i] >= 4 || s->ac_index[i] >= 4)
1410
	    goto out_of_range;
M
cleanup  
Michael Niedermayer 已提交
1411
#if 0 //buggy
1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427
	switch(s->start_code)
	{
	    case SOF0:
		if (dc_index[i] > 1 || ac_index[i] > 1)
		    goto out_of_range;
		break;
	    case SOF1:
	    case SOF2:
		if (dc_index[i] > 3 || ac_index[i] > 3)
		    goto out_of_range;
		break;
	    case SOF3:
		if (dc_index[i] > 3 || ac_index[i] != 0)
		    goto out_of_range;
		break;	
	}
M
cleanup  
Michael Niedermayer 已提交
1428
#endif
1429
    }
M
cleanup  
Michael Niedermayer 已提交
1430

1431
    predictor= get_bits(&s->gb, 8); /* lossless predictor or start of spectral (Ss) */
1432
    skip_bits(&s->gb, 8); /* Se */
1433 1434
    skip_bits(&s->gb, 4); /* Ah */
    point_transform= get_bits(&s->gb, 4); /* Al */
1435 1436 1437 1438 1439 1440

    for(i=0;i<nb_components;i++) 
        s->last_dc[i] = 1024;

    if (nb_components > 1) {
        /* interleaved stream */
M
cleanup  
Michael Niedermayer 已提交
1441 1442
        s->mb_width  = (s->width  + s->h_max * block_size - 1) / (s->h_max * block_size);
        s->mb_height = (s->height + s->v_max * block_size - 1) / (s->v_max * block_size);
1443
    } else {
M
cleanup  
Michael Niedermayer 已提交
1444 1445 1446 1447 1448 1449 1450
        h = s->h_max / s->h_scount[s->comp_index[0]];
        v = s->v_max / s->v_scount[s->comp_index[0]];
        s->mb_width  = (s->width  + h * block_size - 1) / (h * block_size);
        s->mb_height = (s->height + v * block_size - 1) / (v * block_size);
        s->nb_blocks[0] = 1;
        s->h_scount[0] = 1;
        s->v_scount[0] = 1;
1451
    }
1452

M
cleanup  
Michael Niedermayer 已提交
1453
    if(s->avctx->debug & FF_DEBUG_PICT_INFO)
1454
        av_log(s->avctx, AV_LOG_DEBUG, "%s %s p:%d >>:%d\n", s->lossless ? "lossless" : "sequencial DCT", s->rgb ? "RGB" : "", predictor, point_transform);
M
cleanup  
Michael Niedermayer 已提交
1455
    
1456
    if(s->lossless){
M
cleanup  
Michael Niedermayer 已提交
1457 1458 1459 1460 1461 1462
            if(s->rgb){
                if(ljpeg_decode_rgb_scan(s, predictor, point_transform) < 0)
                    return -1;
            }else{
                if(ljpeg_decode_yuv_scan(s, predictor, point_transform) < 0)
                    return -1;
1463 1464
            }
    }else{
M
cleanup  
Michael Niedermayer 已提交
1465 1466
        if(mjpeg_decode_scan(s) < 0)
            return -1;
1467
    }
1468
    emms_c();
M
cleanup  
Michael Niedermayer 已提交
1469
    return 0;
1470 1471 1472
 out_of_range:
    dprintf("decode_sos: ac/dc index out of range\n");
    return -1;
1473 1474
}

1475
static int mjpeg_decode_dri(MJpegDecodeContext *s)
1476 1477 1478 1479
{
    if (get_bits(&s->gb, 16) != 4)
	return -1;
    s->restart_interval = get_bits(&s->gb, 16);
1480
    dprintf("restart interval: %d\n", s->restart_interval);
1481 1482 1483 1484

    return 0;
}

1485
static int mjpeg_decode_app(MJpegDecodeContext *s)
1486 1487 1488 1489
{
    int len, id;

    /* XXX: verify len field validity */
1490
    len = get_bits(&s->gb, 16);
1491 1492
    if (len < 5)
	return -1;
1493

A
Alex Beregszaszi 已提交
1494 1495
    id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
    id = be2me_32(id);
1496 1497
    len -= 6;

M
cleanup  
Michael Niedermayer 已提交
1498
    if(s->avctx->debug & FF_DEBUG_STARTCODE){
1499
        av_log(s->avctx, AV_LOG_DEBUG, "APPx %8X\n", id); 
M
cleanup  
Michael Niedermayer 已提交
1500 1501
    }
    
1502
    /* buggy AVID, it puts EOI only at every 10th frame */
1503 1504
    /* also this fourcc is used by non-avid files too, it holds some
       informations, but it's always present in AVID creates files */
1505
    if (id == ff_get_fourcc("AVI1"))
1506
    {
1507 1508 1509 1510 1511 1512 1513 1514
	/* structure:
	    4bytes	AVI1
	    1bytes	polarity
	    1bytes	always zero
	    4bytes	field_size
	    4bytes	field_size_less_padding
	*/
    	s->buggy_avid = 1;
1515 1516 1517
//	if (s->first_picture)
//	    printf("mjpeg: workarounding buggy AVID\n");
	s->interlace_polarity = get_bits(&s->gb, 8);
1518 1519 1520 1521 1522 1523
#if 0
	skip_bits(&s->gb, 8);
	skip_bits(&s->gb, 32);
	skip_bits(&s->gb, 32);
	len -= 10;
#endif
1524 1525
//	if (s->interlace_polarity)
//	    printf("mjpeg: interlace polarity: %d\n", s->interlace_polarity);
1526
	goto out;
1527 1528
    }
    
1529
//    len -= 2;
1530
    
1531
    if (id == ff_get_fourcc("JFIF"))
1532
    {
1533
	int t_w, t_h;
1534
	skip_bits(&s->gb, 8); /* the trailing zero-byte */
1535
	av_log(s->avctx, AV_LOG_INFO, "mjpeg: JFIF header found (version: %x.%x)\n",
1536
	    get_bits(&s->gb, 8), get_bits(&s->gb, 8));
M
Michael Niedermayer 已提交
1537
        skip_bits(&s->gb, 8);
M
cleanup  
Michael Niedermayer 已提交
1538

M
Michael Niedermayer 已提交
1539 1540
        s->avctx->sample_aspect_ratio.num= get_bits(&s->gb, 16);
        s->avctx->sample_aspect_ratio.den= get_bits(&s->gb, 16);
1541

1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555
	t_w = get_bits(&s->gb, 8);
	t_h = get_bits(&s->gb, 8);
	if (t_w && t_h)
	{
	    /* skip thumbnail */
	    if (len-10-(t_w*t_h*3) > 0)
		len -= t_w*t_h*3;
	}
	len -= 10;
	goto out;
    }
    
    if (id == ff_get_fourcc("Adob") && (get_bits(&s->gb, 8) == 'e'))
    {
1556
	av_log(s->avctx, AV_LOG_INFO, "mjpeg: Adobe header found\n");
1557 1558 1559 1560 1561
	skip_bits(&s->gb, 16); /* version */
	skip_bits(&s->gb, 16); /* flags0 */
	skip_bits(&s->gb, 16); /* flags1 */
	skip_bits(&s->gb, 8); /* transform */
	len -= 7;
1562 1563
	goto out;
    }
M
cleanup  
Michael Niedermayer 已提交
1564 1565

    if (id == ff_get_fourcc("LJIF")){
1566
        av_log(s->avctx, AV_LOG_INFO, "Pegasus lossless jpeg header found\n");
M
cleanup  
Michael Niedermayer 已提交
1567 1568 1569 1570 1571 1572 1573
	skip_bits(&s->gb, 16); /* version ? */
	skip_bits(&s->gb, 16); /* unknwon always 0? */
	skip_bits(&s->gb, 16); /* unknwon always 0? */
	skip_bits(&s->gb, 16); /* unknwon always 0? */
        switch( get_bits(&s->gb, 8)){
        case 1:
            s->rgb= 1;
1574
            s->pegasus_rct=0;
M
cleanup  
Michael Niedermayer 已提交
1575 1576 1577
            break;
        case 2:
            s->rgb= 1;
1578
            s->pegasus_rct=1;
M
cleanup  
Michael Niedermayer 已提交
1579 1580
            break;
        default:
1581
            av_log(s->avctx, AV_LOG_ERROR, "unknown colorspace\n");
M
cleanup  
Michael Niedermayer 已提交
1582 1583 1584 1585
        }
        len -= 9;
        goto out;
    }
1586 1587
    
    /* Apple MJPEG-A */
1588
    if ((s->start_code == APP1) && (len > (0x28 - 8)))
1589
    {
A
Alex Beregszaszi 已提交
1590 1591
	id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16);
	id = be2me_32(id);
1592
	len -= 4;
1593
	if (id == ff_get_fourcc("mjpg")) /* Apple MJPEG-A */
1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605
	{
#if 0
	    skip_bits(&s->gb, 32); /* field size */
	    skip_bits(&s->gb, 32); /* pad field size */
	    skip_bits(&s->gb, 32); /* next off */
	    skip_bits(&s->gb, 32); /* quant off */
	    skip_bits(&s->gb, 32); /* huff off */
	    skip_bits(&s->gb, 32); /* image off */
	    skip_bits(&s->gb, 32); /* scan off */
	    skip_bits(&s->gb, 32); /* data off */
#endif
	    if (s->first_picture)
1606
		av_log(s->avctx, AV_LOG_INFO, "mjpeg: Apple MJPEG-A header found\n");
1607 1608
	}
    }
1609

1610
out:
1611 1612
    /* slow but needed for extreme adobe jpegs */
    if (len < 0)
1613
	av_log(s->avctx, AV_LOG_ERROR, "mjpeg: error, decode_app parser read over the end\n");
1614 1615 1616
    while(--len > 0)
	skip_bits(&s->gb, 8);

1617 1618 1619
    return 0;
}

1620
static int mjpeg_decode_com(MJpegDecodeContext *s)
1621 1622
{
    /* XXX: verify len field validity */
A
Alex Beregszaszi 已提交
1623
    int len = get_bits(&s->gb, 16);
1624 1625
    if (len >= 2 && len < 32768) {
	/* XXX: any better upper bound */
1626
	uint8_t *cbuf = av_malloc(len - 1);
1627 1628 1629 1630 1631 1632 1633 1634 1635
	if (cbuf) {
	    int i;
	    for (i = 0; i < len - 2; i++)
		cbuf[i] = get_bits(&s->gb, 8);
	    if (i > 0 && cbuf[i-1] == '\n')
		cbuf[i-1] = 0;
	    else
		cbuf[i] = 0;

1636
	    av_log(s->avctx, AV_LOG_INFO, "mjpeg comment: '%s'\n", cbuf);
1637 1638 1639 1640 1641 1642 1643 1644

	    /* buggy avid, it puts EOI only at every 10th frame */
	    if (!strcmp(cbuf, "AVID"))
	    {
		s->buggy_avid = 1;
		//	if (s->first_picture)
		//	    printf("mjpeg: workarounding buggy AVID\n");
	    }
1645

1646 1647
	    av_free(cbuf);
	}
1648 1649 1650 1651 1652
    }

    return 0;
}

1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675
#if 0
static int valid_marker_list[] =
{
        /* 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, a, b, c, d, e, f */
/* 0 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 1 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 2 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 3 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 4 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 5 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 6 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 7 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 8 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* 9 */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* a */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* b */    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
/* c */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* d */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* e */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
/* f */    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0,
}
#endif

1676 1677
/* return the 8 bit start code value and update the search
   state. Return -1 if no start code found */
1678
static int find_marker(uint8_t **pbuf_ptr, uint8_t *buf_end)
1679
{
1680
    uint8_t *buf_ptr;
1681
    unsigned int v, v2;
1682
    int val;
1683 1684 1685
#ifdef DEBUG
    int skipped=0;
#endif
1686 1687

    buf_ptr = *pbuf_ptr;
1688 1689 1690
    while (buf_ptr < buf_end) {
        v = *buf_ptr++;
	v2 = *buf_ptr;
M
Michael Niedermayer 已提交
1691
        if ((v == 0xff) && (v2 >= 0xc0) && (v2 <= 0xfe) && buf_ptr < buf_end) {
1692 1693
	    val = *buf_ptr++;
	    goto found;
1694
        }
1695 1696 1697
#ifdef DEBUG
	skipped++;
#endif
1698
    }
1699 1700 1701 1702 1703
    val = -1;
found:
#ifdef DEBUG
    dprintf("find_marker skipped %d bytes\n", skipped);
#endif
1704 1705 1706 1707 1708 1709
    *pbuf_ptr = buf_ptr;
    return val;
}

static int mjpeg_decode_frame(AVCodecContext *avctx, 
                              void *data, int *data_size,
1710
                              uint8_t *buf, int buf_size)
1711 1712
{
    MJpegDecodeContext *s = avctx->priv_data;
1713
    uint8_t *buf_end, *buf_ptr;
1714
    int start_code;
M
Michael Niedermayer 已提交
1715
    AVFrame *picture = data;
1716

F
Fabrice Bellard 已提交
1717 1718
    *data_size = 0;

1719
    /* no supplementary picture */
F
Fabrice Bellard 已提交
1720
    if (buf_size == 0)
1721 1722 1723 1724 1725 1726
        return 0;

    buf_ptr = buf;
    buf_end = buf + buf_size;
    while (buf_ptr < buf_end) {
        /* find start next marker */
1727 1728 1729 1730 1731
        start_code = find_marker(&buf_ptr, buf_end);
	{
	    /* EOF */
            if (start_code < 0) {
		goto the_end;
1732
            } else {
1733 1734 1735 1736 1737 1738 1739
                dprintf("marker=%x avail_size_in_buf=%d\n", start_code, buf_end - buf_ptr);
		
		if ((buf_end - buf_ptr) > s->buffer_size)
		{
		    av_free(s->buffer);
		    s->buffer_size = buf_end-buf_ptr;
		    s->buffer = av_malloc(s->buffer_size);
1740 1741
		    dprintf("buffer too small, expanding to %d bytes\n",
			s->buffer_size);
1742 1743 1744 1745 1746
		}
		
		/* unescape buffer of SOS */
		if (start_code == SOS)
		{
1747 1748
		    uint8_t *src = buf_ptr;
		    uint8_t *dst = s->buffer;
1749 1750 1751

		    while (src<buf_end)
		    {
1752
			uint8_t x = *(src++);
1753

1754 1755 1756
			*(dst++) = x;
			if (x == 0xff)
			{
M
cleanup  
Michael Niedermayer 已提交
1757 1758
			    while(*src == 0xff) src++;

1759 1760 1761 1762 1763 1764 1765
			    x = *(src++);
			    if (x >= 0xd0 && x <= 0xd7)
				*(dst++) = x;
			    else if (x)
				break;
			}
		    }
1766
		    init_get_bits(&s->gb, s->buffer, (dst - s->buffer)*8);
1767 1768 1769
		    
		    dprintf("escaping removed %d bytes\n",
			(buf_end - buf_ptr) - (dst - s->buffer));
1770 1771
		}
		else
1772
		    init_get_bits(&s->gb, buf_ptr, (buf_end - buf_ptr)*8);
1773 1774
		
		s->start_code = start_code;
M
cleanup  
Michael Niedermayer 已提交
1775
                if(s->avctx->debug & FF_DEBUG_STARTCODE){
1776
                    av_log(s->avctx, AV_LOG_DEBUG, "startcode: %X\n", start_code);
M
cleanup  
Michael Niedermayer 已提交
1777
                }
1778 1779 1780 1781 1782 1783 1784

		/* process markers */
		if (start_code >= 0xd0 && start_code <= 0xd7) {
		    dprintf("restart marker: %d\n", start_code&0x0f);
		} else if (s->first_picture) {
		    /* APP fields */
		    if (start_code >= 0xe0 && start_code <= 0xef)
1785
			mjpeg_decode_app(s);
1786 1787 1788 1789 1790
		    /* Comment */
		    else if (start_code == COM)
			mjpeg_decode_com(s);
		}

1791 1792
                switch(start_code) {
                case SOI:
1793
		    s->restart_interval = 0;
1794 1795 1796
                    /* nothing to do on SOI */
                    break;
                case DQT:
1797
                    mjpeg_decode_dqt(s);
1798 1799
                    break;
                case DHT:
M
Michael Niedermayer 已提交
1800
                    if(mjpeg_decode_dht(s) < 0){
1801
                        av_log(s->avctx, AV_LOG_ERROR, "huffman table decode error\n");
M
Michael Niedermayer 已提交
1802 1803
                        return -1;
                    }
1804 1805
                    break;
                case SOF0:
1806 1807 1808 1809 1810 1811 1812
                    s->lossless=0;
                    if (mjpeg_decode_sof(s) < 0) 
			return -1;
                    break;
                case SOF3:
                    s->lossless=1;
                    if (mjpeg_decode_sof(s) < 0) 
A
10l fix  
Alex Beregszaszi 已提交
1813
			return -1;
1814
                    break;
1815
		case EOI:
M
Michael Niedermayer 已提交
1816 1817
		    if ((s->buggy_avid && !s->interlaced) || s->restart_interval) 
                        break;
1818 1819
eoi_parser:
		    {
F
Fabrice Bellard 已提交
1820 1821 1822 1823
                        if (s->interlaced) {
                            s->bottom_field ^= 1;
                            /* if not bottom field, do not output image yet */
                            if (s->bottom_field)
1824
                                goto not_the_end;
F
Fabrice Bellard 已提交
1825
                        }
M
Michael Niedermayer 已提交
1826
                        *picture = s->picture;
M
Michael Niedermayer 已提交
1827 1828 1829 1830 1831 1832 1833 1834
                        *data_size = sizeof(AVFrame);

                        if(!s->lossless){
                            picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]); 
                            picture->qstride= 0;
                            picture->qscale_table= s->qscale_table;
                            memset(picture->qscale_table, picture->quality, (s->width+15)/16);
                            if(avctx->debug & FF_DEBUG_QP)
1835
                                av_log(s->avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
1836
                            picture->quality*= FF_QP2LAMBDA;
M
Michael Niedermayer 已提交
1837 1838
                        }
                        
1839 1840
                        goto the_end;
                    }
1841 1842 1843 1844 1845 1846 1847
		    break;
                case SOS:
                    mjpeg_decode_sos(s);
		    /* buggy avid puts EOI every 10-20th frame */
		    /* if restart period is over process EOI */
		    if ((s->buggy_avid && !s->interlaced) || s->restart_interval)
			goto eoi_parser;
1848
                    break;
1849
		case DRI:
1850
		    mjpeg_decode_dri(s);
1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863
		    break;
		case SOF1:
		case SOF2:
		case SOF5:
		case SOF6:
		case SOF7:
		case SOF9:
		case SOF10:
		case SOF11:
		case SOF13:
		case SOF14:
		case SOF15:
		case JPG:
1864
		    av_log(s->avctx, AV_LOG_ERROR, "mjpeg: unsupported coding type (%x)\n", start_code);
1865 1866 1867 1868
		    break;
//		default:
//		    printf("mjpeg: unsupported marker (%x)\n", start_code);
//		    break;
1869
                }
1870 1871 1872 1873 1874 1875

not_the_end:
		/* eof process start code */
		buf_ptr += (get_bits_count(&s->gb)+7)/8;
		dprintf("marker parser used %d bytes (%d bits)\n",
		    (get_bits_count(&s->gb)+7)/8, get_bits_count(&s->gb));
1876 1877 1878
            }
        }
    }
1879 1880 1881
the_end:
    dprintf("mjpeg decode frame unused %d bytes\n", buf_end - buf_ptr);
//    return buf_end - buf_ptr;
1882 1883 1884
    return buf_ptr - buf;
}

1885 1886
static int mjpegb_decode_frame(AVCodecContext *avctx, 
                              void *data, int *data_size,
1887
                              uint8_t *buf, int buf_size)
1888 1889
{
    MJpegDecodeContext *s = avctx->priv_data;
1890
    uint8_t *buf_end, *buf_ptr;
M
Michael Niedermayer 已提交
1891
    AVFrame *picture = data;
1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908
    GetBitContext hgb; /* for the header */
    uint32_t dqt_offs, dht_offs, sof_offs, sos_offs, second_field_offs;
    uint32_t field_size;

    *data_size = 0;

    /* no supplementary picture */
    if (buf_size == 0)
        return 0;

    buf_ptr = buf;
    buf_end = buf + buf_size;
    
read_header:
    /* reset on every SOI */
    s->restart_interval = 0;

1909
    init_get_bits(&hgb, buf_ptr, /*buf_size*/(buf_end - buf_ptr)*8);
1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930

    skip_bits(&hgb, 32); /* reserved zeros */
    
    if (get_bits(&hgb, 32) != be2me_32(ff_get_fourcc("mjpg")))
    {
	dprintf("not mjpeg-b (bad fourcc)\n");
	return 0;
    }

    field_size = get_bits(&hgb, 32); /* field size */
    dprintf("field size: 0x%x\n", field_size);
    skip_bits(&hgb, 32); /* padded field size */
    second_field_offs = get_bits(&hgb, 32);
    dprintf("second field offs: 0x%x\n", second_field_offs);
    if (second_field_offs)
	s->interlaced = 1;

    dqt_offs = get_bits(&hgb, 32);
    dprintf("dqt offs: 0x%x\n", dqt_offs);
    if (dqt_offs)
    {
1931
	init_get_bits(&s->gb, buf+dqt_offs, (buf_end - (buf+dqt_offs))*8);
1932 1933 1934 1935 1936 1937 1938 1939
	s->start_code = DQT;
	mjpeg_decode_dqt(s);
    }
    
    dht_offs = get_bits(&hgb, 32);
    dprintf("dht offs: 0x%x\n", dht_offs);
    if (dht_offs)
    {
1940
	init_get_bits(&s->gb, buf+dht_offs, (buf_end - (buf+dht_offs))*8);
1941 1942 1943 1944 1945 1946 1947 1948
	s->start_code = DHT;
	mjpeg_decode_dht(s);
    }

    sof_offs = get_bits(&hgb, 32);
    dprintf("sof offs: 0x%x\n", sof_offs);
    if (sof_offs)
    {
1949
	init_get_bits(&s->gb, buf+sof_offs, (buf_end - (buf+sof_offs))*8);
1950
	s->start_code = SOF0;
1951
	if (mjpeg_decode_sof(s) < 0)
A
10l fix  
Alex Beregszaszi 已提交
1952
	    return -1;
1953 1954 1955 1956 1957 1958
    }

    sos_offs = get_bits(&hgb, 32);
    dprintf("sos offs: 0x%x\n", sos_offs);
    if (sos_offs)
    {
1959 1960
//	init_get_bits(&s->gb, buf+sos_offs, (buf_end - (buf+sos_offs))*8);
	init_get_bits(&s->gb, buf+sos_offs, field_size*8);
1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977
	s->start_code = SOS;
	mjpeg_decode_sos(s);
    }

    skip_bits(&hgb, 32); /* start of data offset */

    if (s->interlaced) {
        s->bottom_field ^= 1;
        /* if not bottom field, do not output image yet */
        if (s->bottom_field && second_field_offs)
	{
	    buf_ptr = buf + second_field_offs;
	    second_field_offs = 0;
	    goto read_header;
    	}
    }

M
Michael Niedermayer 已提交
1978
    //XXX FIXME factorize, this looks very similar to the EOI code
M
Michael Niedermayer 已提交
1979 1980

    *picture= s->picture;
M
Michael Niedermayer 已提交
1981 1982 1983 1984 1985 1986 1987 1988
    *data_size = sizeof(AVFrame);
    
    if(!s->lossless){
        picture->quality= FFMAX(FFMAX(s->qscale[0], s->qscale[1]), s->qscale[2]); 
        picture->qstride= 0;
        picture->qscale_table= s->qscale_table;
        memset(picture->qscale_table, picture->quality, (s->width+15)/16);
        if(avctx->debug & FF_DEBUG_QP)
1989
            av_log(avctx, AV_LOG_DEBUG, "QP: %d\n", picture->quality);
1990
        picture->quality*= FF_QP2LAMBDA;
M
Michael Niedermayer 已提交
1991
    }
1992 1993 1994 1995

    return buf_ptr - buf;
}

1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047
#include "sp5x.h"

static int sp5x_decode_frame(AVCodecContext *avctx, 
                              void *data, int *data_size,
                              uint8_t *buf, int buf_size)
{
#if 0
    MJpegDecodeContext *s = avctx->priv_data;
#endif
    const int qscale = 5;
    uint8_t *buf_ptr, *buf_end, *recoded;
    int i = 0, j = 0;

    *data_size = 0;

    /* no supplementary picture */
    if (buf_size == 0)
        return 0;

    if (!avctx->width || !avctx->height)
	return -1;

    buf_ptr = buf;
    buf_end = buf + buf_size;

#if 1
    recoded = av_mallocz(buf_size + 1024);
    if (!recoded)
	return -1;

    /* SOI */
    recoded[j++] = 0xFF;
    recoded[j++] = 0xD8;

    memcpy(recoded+j, &sp5x_data_dqt[0], sizeof(sp5x_data_dqt));
    memcpy(recoded+j+5, &sp5x_quant_table[qscale * 2], 64);
    memcpy(recoded+j+70, &sp5x_quant_table[(qscale * 2) + 1], 64);
    j += sizeof(sp5x_data_dqt);

    memcpy(recoded+j, &sp5x_data_dht[0], sizeof(sp5x_data_dht));
    j += sizeof(sp5x_data_dht);

    memcpy(recoded+j, &sp5x_data_sof[0], sizeof(sp5x_data_sof));
    recoded[j+5] = (avctx->height >> 8) & 0xFF;
    recoded[j+6] = avctx->height & 0xFF;
    recoded[j+7] = (avctx->width >> 8) & 0xFF;
    recoded[j+8] = avctx->width & 0xFF;
    j += sizeof(sp5x_data_sof);

    memcpy(recoded+j, &sp5x_data_sos[0], sizeof(sp5x_data_sos));
    j += sizeof(sp5x_data_sos);

M
Michael Niedermayer 已提交
2048
    for (i = 14; i < buf_size && j < buf_size+1024-2; i++)
2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149
    {
	recoded[j++] = buf[i];
	if (buf[i] == 0xff)
	    recoded[j++] = 0;
    }

    /* EOI */
    recoded[j++] = 0xFF;
    recoded[j++] = 0xD9;

    i = mjpeg_decode_frame(avctx, data, data_size, recoded, j);

    av_free(recoded);

#else
    /* SOF */
    s->bits = 8;
    s->width = avctx->width;
    s->height = avctx->height;
    s->nb_components = 3;
    s->component_id[0] = 0;
    s->h_count[0] = 2;
    s->v_count[0] = 2;
    s->quant_index[0] = 0;
    s->component_id[1] = 1;
    s->h_count[1] = 1;
    s->v_count[1] = 1;
    s->quant_index[1] = 1;
    s->component_id[2] = 2;
    s->h_count[2] = 1;
    s->v_count[2] = 1;
    s->quant_index[2] = 1;
    s->h_max = 2;
    s->v_max = 2;
    
    s->qscale_table = av_mallocz((s->width+15)/16);
    avctx->pix_fmt = PIX_FMT_YUV420P;
    s->interlaced = 0;
    
    s->picture.reference = 0;
    if (avctx->get_buffer(avctx, &s->picture) < 0)
    {
	fprintf(stderr, "get_buffer() failed\n");
	return -1;
    }

    s->picture.pict_type = I_TYPE;
    s->picture.key_frame = 1;

    for (i = 0; i < 3; i++)
	s->linesize[i] = s->picture.linesize[i] << s->interlaced;

    /* DQT */
    for (i = 0; i < 64; i++)
    {
	j = s->scantable.permutated[i];
	s->quant_matrixes[0][j] = sp5x_quant_table[(qscale * 2) + i];
    }
    s->qscale[0] = FFMAX(
	s->quant_matrixes[0][s->scantable.permutated[1]],
	s->quant_matrixes[0][s->scantable.permutated[8]]) >> 1;

    for (i = 0; i < 64; i++)
    {
	j = s->scantable.permutated[i];
	s->quant_matrixes[1][j] = sp5x_quant_table[(qscale * 2) + 1 + i];
    }
    s->qscale[1] = FFMAX(
	s->quant_matrixes[1][s->scantable.permutated[1]],
	s->quant_matrixes[1][s->scantable.permutated[8]]) >> 1;

    /* DHT */

    /* SOS */
    s->comp_index[0] = 0;
    s->nb_blocks[0] = s->h_count[0] * s->v_count[0];
    s->h_scount[0] = s->h_count[0];
    s->v_scount[0] = s->v_count[0];
    s->dc_index[0] = 0;
    s->ac_index[0] = 0;

    s->comp_index[1] = 1;
    s->nb_blocks[1] = s->h_count[1] * s->v_count[1];
    s->h_scount[1] = s->h_count[1];
    s->v_scount[1] = s->v_count[1];
    s->dc_index[1] = 1;
    s->ac_index[1] = 1;

    s->comp_index[2] = 2;
    s->nb_blocks[2] = s->h_count[2] * s->v_count[2];
    s->h_scount[2] = s->h_count[2];
    s->v_scount[2] = s->v_count[2];
    s->dc_index[2] = 1;
    s->ac_index[2] = 1;
    
    for (i = 0; i < 3; i++)
	s->last_dc[i] = 1024;

    s->mb_width = (s->width * s->h_max * 8 -1) / (s->h_max * 8);
    s->mb_height = (s->height * s->v_max * 8 -1) / (s->v_max * 8);

A
10l  
Alex Beregszaszi 已提交
2150
    init_get_bits(&s->gb, buf+14, (buf_size-14)*8);
2151 2152 2153 2154 2155 2156
    
    return mjpeg_decode_scan(s);
#endif

    return i;
}
2157

2158 2159 2160 2161 2162
static int mjpeg_decode_end(AVCodecContext *avctx)
{
    MJpegDecodeContext *s = avctx->priv_data;
    int i, j;

2163
    av_free(s->buffer);
M
Michael Niedermayer 已提交
2164
    av_free(s->qscale_table);
M
Michael Niedermayer 已提交
2165 2166
    avcodec_default_free_buffers(avctx);
    
2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182
    for(i=0;i<2;i++) {
        for(j=0;j<4;j++)
            free_vlc(&s->vlcs[i][j]);
    }
    return 0;
}

AVCodec mjpeg_decoder = {
    "mjpeg",
    CODEC_TYPE_VIDEO,
    CODEC_ID_MJPEG,
    sizeof(MJpegDecodeContext),
    mjpeg_decode_init,
    NULL,
    mjpeg_decode_end,
    mjpeg_decode_frame,
M
Michael Niedermayer 已提交
2183
    CODEC_CAP_DR1,
2184
    NULL
2185
};
2186 2187 2188 2189 2190 2191 2192 2193 2194 2195

AVCodec mjpegb_decoder = {
    "mjpegb",
    CODEC_TYPE_VIDEO,
    CODEC_ID_MJPEGB,
    sizeof(MJpegDecodeContext),
    mjpeg_decode_init,
    NULL,
    mjpeg_decode_end,
    mjpegb_decode_frame,
M
Michael Niedermayer 已提交
2196
    CODEC_CAP_DR1,
2197 2198
    NULL
};
2199

2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212
AVCodec sp5x_decoder = {
    "sp5x",
    CODEC_TYPE_VIDEO,
    CODEC_ID_SP5X,
    sizeof(MJpegDecodeContext),
    mjpeg_decode_init,
    NULL,
    mjpeg_decode_end,
    sp5x_decode_frame,
    CODEC_CAP_DR1,
    NULL
};

M
Michael Niedermayer 已提交
2213
#ifdef CONFIG_ENCODERS
2214 2215 2216 2217 2218 2219 2220 2221 2222
AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them
    "ljpeg",
    CODEC_TYPE_VIDEO,
    CODEC_ID_LJPEG,
    sizeof(MpegEncContext),
    MPV_encode_init,
    encode_picture_lossless,
    MPV_encode_end,
};
M
Michael Niedermayer 已提交
2223
#endif