Mercurial > libavcodec.hg

comparison mjpeg.c @ 440:000aeeac27a2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* started to cleanup name clashes for onetime compilation
author kabi
date Mon, 27 May 2002 16:42:14 +0000
parents c058624083e1
children bc7ceb6461eb
comparison
equal deleted inserted replaced
439:6ae275655a23 440:000aeeac27a2
454 { 454 {
455 jflush_put_bits(&s->pb); 455 jflush_put_bits(&s->pb);
456 put_marker(&s->pb, EOI); 456 put_marker(&s->pb, EOI);
457 } 457 }
458 458
459 static inline void encode_dc(MpegEncContext *s, int val, 459 static inline void mjpeg_encode_dc(MpegEncContext *s, int val,
460 UINT8 *huff_size, UINT16 *huff_code) 460 UINT8 *huff_size, UINT16 *huff_code)
461 { 461 {
462 int mant, nbits; 462 int mant, nbits;
463 463
464 if (val == 0) { 464 if (val == 0) {
465 jput_bits(&s->pb, huff_size[0], huff_code[0]); 465 jput_bits(&s->pb, huff_size[0], huff_code[0]);
494 /* DC coef */ 494 /* DC coef */
495 component = (n <= 3 ? 0 : n - 4 + 1); 495 component = (n <= 3 ? 0 : n - 4 + 1);
496 dc = block[0]; /* overflow is impossible */ 496 dc = block[0]; /* overflow is impossible */
497 val = dc - s->last_dc[component]; 497 val = dc - s->last_dc[component];
498 if (n < 4) { 498 if (n < 4) {
499 encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance); 499 mjpeg_encode_dc(s, val, m->huff_size_dc_luminance, m->huff_code_dc_luminance);
500 huff_size_ac = m->huff_size_ac_luminance; 500 huff_size_ac = m->huff_size_ac_luminance;
501 huff_code_ac = m->huff_code_ac_luminance; 501 huff_code_ac = m->huff_code_ac_luminance;
502 } else { 502 } else {
503 encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance); 503 mjpeg_encode_dc(s, val, m->huff_size_dc_chrominance, m->huff_code_dc_chrominance);
504 huff_size_ac = m->huff_size_ac_chrominance; 504 huff_size_ac = m->huff_size_ac_chrominance;
505 huff_code_ac = m->huff_code_ac_chrominance; 505 huff_code_ac = m->huff_code_ac_chrominance;
506 } 506 }
507 s->last_dc[component] = dc; 507 s->last_dc[component] = dc;
508 508
806 } 806 }
807 807
808 return 0; 808 return 0;
809 } 809 }
810 810
811 static inline int decode_dc(MJpegDecodeContext *s, int dc_index) 811 static inline int mjpeg_decode_dc(MJpegDecodeContext *s, int dc_index)
812 { 812 {
813 int code, diff; 813 int code, diff;
814 814
815 code = get_vlc(&s->gb, &s->vlcs[0][dc_index]); 815 code = get_vlc(&s->gb, &s->vlcs[0][dc_index]);
816 if (code < 0) 816 if (code < 0)
817 { 817 {
818 dprintf("decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index, 818 dprintf("mjpeg_decode_dc: bad vlc: %d:%d (%p)\n", 0, dc_index,
819 &s->vlcs[0][dc_index]); 819 &s->vlcs[0][dc_index]);
820 return 0xffff; 820 return 0xffff;
821 } 821 }
822 if (code == 0) { 822 if (code == 0) {
823 diff = 0; 823 diff = 0;
837 int run, val; 837 int run, val;
838 VLC *ac_vlc; 838 VLC *ac_vlc;
839 INT16 *quant_matrix; 839 INT16 *quant_matrix;
840 840
841 /* DC coef */ 841 /* DC coef */
842 val = decode_dc(s, dc_index); 842 val = mjpeg_decode_dc(s, dc_index);
843 if (val == 0xffff) { 843 if (val == 0xffff) {
844 dprintf("error dc\n"); 844 dprintf("error dc\n");
845 return -1; 845 return -1;
846 } 846 }
847 quant_matrix = s->quant_matrixes[quant_index]; 847 quant_matrix = s->quant_matrixes[quant_index];