Commit 65fd680f authored by michael's avatar michael

lowres slice fix


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@3513 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5bf48da5
...@@ -139,6 +139,7 @@ static int get_consumed_bytes(MpegEncContext *s, int buf_size){ ...@@ -139,6 +139,7 @@ static int get_consumed_bytes(MpegEncContext *s, int buf_size){
static int decode_slice(MpegEncContext *s){ static int decode_slice(MpegEncContext *s){
const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F; const int part_mask= s->partitioned_frame ? (AC_END|AC_ERROR) : 0x7F;
const int mb_size= 16>>s->avctx->lowres;
s->last_resync_gb= s->gb; s->last_resync_gb= s->gb;
s->first_slice_line= 1; s->first_slice_line= 1;
...@@ -214,7 +215,7 @@ static int decode_slice(MpegEncContext *s){ ...@@ -214,7 +215,7 @@ static int decode_slice(MpegEncContext *s){
if(++s->mb_x >= s->mb_width){ if(++s->mb_x >= s->mb_width){
s->mb_x=0; s->mb_x=0;
ff_draw_horiz_band(s, s->mb_y*16, 16); ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size);
s->mb_y++; s->mb_y++;
} }
return 0; return 0;
...@@ -234,7 +235,7 @@ static int decode_slice(MpegEncContext *s){ ...@@ -234,7 +235,7 @@ static int decode_slice(MpegEncContext *s){
ff_h263_loop_filter(s); ff_h263_loop_filter(s);
} }
ff_draw_horiz_band(s, s->mb_y*16, 16); ff_draw_horiz_band(s, s->mb_y*mb_size, mb_size);
s->mb_x= 0; s->mb_x= 0;
} }
......
...@@ -2526,8 +2526,9 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, ...@@ -2526,8 +2526,9 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y,
MPV_decode_mb(s, s->block); MPV_decode_mb(s, s->block);
if (++s->mb_x >= s->mb_width) { if (++s->mb_x >= s->mb_width) {
const int mb_size= 16>>s->avctx->lowres;
ff_draw_horiz_band(s, 16*s->mb_y, 16); ff_draw_horiz_band(s, mb_size*s->mb_y, mb_size);
s->mb_x = 0; s->mb_x = 0;
s->mb_y++; s->mb_y++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment