virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

fixed mjpeg matrix quant encoding and decoding

Browse Source 
Originally committed as revision 48 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2001-08-07 22:46:19 +00:00
parent 13b5475264
commit 47476fa9fd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/mjpeg.c
View File

@ -220,7 +220,7 @@ static int put_huffman_table(MpegEncContext *s, int table_class, int table_id,
static void jpeg_table_header(MpegEncContext *s) static void jpeg_table_header(MpegEncContext *s)
{ {
PutBitContext *p = &s->pb; PutBitContext *p = &s->pb;
int i, size; int i, j, size;
UINT8 *ptr; UINT8 *ptr;
/* quant matrixes */ /* quant matrixes */
@ -229,13 +229,15 @@ static void jpeg_table_header(MpegEncContext *s)
put_bits(p, 4, 0); /* 8 bit precision */ put_bits(p, 4, 0); /* 8 bit precision */
put_bits(p, 4, 0); /* table 0 */ put_bits(p, 4, 0); /* table 0 */
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
put_bits(p, 8, s->intra_matrix[i]); j = zigzag_direct[i];
put_bits(p, 8, s->intra_matrix[j]);
} }
#if 0 #if 0
put_bits(p, 4, 0); /* 8 bit precision */ put_bits(p, 4, 0); /* 8 bit precision */
put_bits(p, 4, 1); /* table 1 */ put_bits(p, 4, 1); /* table 1 */
for(i=0;i<64;i++) { for(i=0;i<64;i++) {
put_bits(p, 8, s->chroma_intra_matrix[i]); j = zigzag_direct[i];
put_bits(p, 8, s->chroma_intra_matrix[j]);
} }
#endif #endif
@ -489,7 +491,7 @@ static int mjpeg_decode_init(AVCodecContext *avctx)
static int mjpeg_decode_dqt(MJpegDecodeContext *s, static int mjpeg_decode_dqt(MJpegDecodeContext *s,
UINT8 *buf, int buf_size) UINT8 *buf, int buf_size)
{ {
int len, index, i; int len, index, i, j;
init_get_bits(&s->gb, buf, buf_size); init_get_bits(&s->gb, buf, buf_size);
len = get_bits(&s->gb, 16); len = get_bits(&s->gb, 16);
@ -504,8 +506,10 @@ static int mjpeg_decode_dqt(MJpegDecodeContext *s,
return -1; return -1;
dprintf("index=%d\n", index); dprintf("index=%d\n", index);
/* read quant table */ /* read quant table */
for(i=0;i<64;i++) for(i=0;i<64;i++) {
s->quant_matrixes[index][i] = get_bits(&s->gb, 8); j = zigzag_direct[i];
s->quant_matrixes[index][j] = get_bits(&s->gb, 8);
}
len -= 65; len -= 65;
} }
return 0; return 0;