From af2a9e8fdb94e12297500244e222c1140d6e1716 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 26 Sep 2004 13:03:43 +0000 Subject: [PATCH] lowres slice fix Originally committed as revision 3513 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h263dec.c | 5 +++-- libavcodec/mpeg12.c | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index 78e13300b9..212d538cc3 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -139,6 +139,7 @@ static int get_consumed_bytes(MpegEncContext *s, int buf_size){ static int decode_slice(MpegEncContext *s){ 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->first_slice_line= 1; @@ -214,7 +215,7 @@ static int decode_slice(MpegEncContext *s){ if(++s->mb_x >= s->mb_width){ 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++; } return 0; @@ -234,7 +235,7 @@ static int decode_slice(MpegEncContext *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; } diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index 484f6b278e..550f17d154 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -2526,8 +2526,9 @@ static int mpeg_decode_slice(Mpeg1Context *s1, int mb_y, MPV_decode_mb(s, s->block); 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_y++;