if (!done) {
done = 1;
- init_vlc(&dc_lum_vlc, DC_VLC_BITS, 10/*12*/,
+ init_vlc(&dc_lum_vlc, DC_VLC_BITS, 12,
vlc_dc_lum_bits, 1, 1,
vlc_dc_lum_code, 2, 2);
- init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 10/*12*/,
+ init_vlc(&dc_chroma_vlc, DC_VLC_BITS, 12,
vlc_dc_chroma_bits, 1, 1,
vlc_dc_chroma_code, 2, 2);
init_vlc(&mv_vlc, MV_VLC_BITS, 17,
}
if (++s->mb_x >= s->mb_width) {
s->mb_x = 0;
- if (s->mb_y >= (s->mb_height - 1))
+ if (s->mb_y >= (s->mb_height - 1)){
+ fprintf(stderr, "slice too long\n");
return -1;
+ }
s->mb_y++;
}
dprintf("decode_mb: x=%d y=%d\n", s->mb_x, s->mb_y);
break;
case P_TYPE:
mb_type = get_vlc2(&s->gb, mb_ptype_vlc.table, MB_PTYPE_VLC_BITS, 1);
- if (mb_type < 0)
+ if (mb_type < 0){
+ fprintf(stderr, "invalid mb type in P Frame at %d %d\n", s->mb_x, s->mb_y);
return -1;
+ }
break;
case B_TYPE:
mb_type = get_vlc2(&s->gb, mb_btype_vlc.table, MB_BTYPE_VLC_BITS, 1);
- if (mb_type < 0)
+ if (mb_type < 0){
+ fprintf(stderr, "invalid mb type in B Frame at %d %d\n", s->mb_x, s->mb_y);
return -1;
+ }
break;
}
dprintf("mb_type=%x\n", mb_type);
if (mb_type & MB_PAT) {
cbp = get_vlc2(&s->gb, mb_pat_vlc.table, MB_PAT_VLC_BITS, 1);
- if (cbp < 0)
+ if (cbp < 0){
+ fprintf(stderr, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
return -1;
+ }
cbp++;
}
dprintf("cbp=%x\n", cbp);
int code, diff;
if (component == 0) {
- code = get_vlc2(&s->gb, dc_lum_vlc.table, DC_VLC_BITS, 1);
+ code = get_vlc2(&s->gb, dc_lum_vlc.table, DC_VLC_BITS, 2);
} else {
- code = get_vlc2(&s->gb, dc_chroma_vlc.table, DC_VLC_BITS, 1);
+ code = get_vlc2(&s->gb, dc_chroma_vlc.table, DC_VLC_BITS, 2);
}
- if (code < 0)
+ if (code < 0){
+ fprintf(stderr, "invalid dc code at %d %d\n", s->mb_x, s->mb_y);
return 0xffff;
+ }
if (code == 0) {
diff = 0;
} else {
/* now quantify & encode AC coefs */
for(;;) {
code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2);
- if (code < 0)
+ if (code < 0){
+ fprintf(stderr, "invalid ac code at %d %d\n", s->mb_x, s->mb_y);
return -1;
+ }
if (code == 112) {
break;
} else if (code == 111) {
level = -level;
}
i += run;
- if (i >= 64)
+ if (i >= 64){
+ fprintf(stderr, "run too long at %d %d\n", s->mb_x, s->mb_y);
return -1;
+ }
add_coef:
j = scan_table[i];
dprintf("%d: run=%d level=%d\n", n, run, level);
/* now quantify & encode AC coefs */
for(;;) {
code = get_vlc2(&s->gb, rl->vlc.table, TEX_VLC_BITS, 2);
- if (code < 0)
+ if (code < 0){
+ fprintf(stderr, "invalid ac code at %d %d\n", s->mb_x, s->mb_y);
return -1;
+ }
if (code == 112) {
break;
} else if (code == 111) {
level = -level;
}
i += run;
- if (i >= 64)
+ if (i >= 64){
+ fprintf(stderr, "run too long at %d %d\n", s->mb_x, s->mb_y);
return -1;
+ }
j = scan_table[i];
dprintf("%d: run=%d level=%d\n", n, run, level);
level = (level * s->qscale * matrix[j]) / 16;
int ret;
start_code = (start_code - 1) & 0xff;
- if (start_code >= s->mb_height)
+ if (start_code >= s->mb_height){
+ fprintf(stderr, "slice below image\n");
return -1;
+ }
s->last_dc[0] = 1 << (7 + s->intra_dc_precision);
s->last_dc[1] = s->last_dc[0];
s->last_dc[2] = s->last_dc[0];
}
*data_size = sizeof(AVPicture);
goto the_end;
+ }else if(ret==-1){
+ printf("Error while decoding slice\n");
}
}
break;