generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/svq1enc: fix encoding of small widths

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-06-13 20:59:24 +02:00
parent 1df441eaa8
commit 043bcdcdb0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/svq1enc.c
View File

@ -252,7 +252,7 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane,
int block_width, block_height; int block_width, block_height;
int level; int level;
int threshold[6]; int threshold[6];
uint8_t *src = s->scratchbuf + stride * 16; uint8_t *src = s->scratchbuf + stride * 32;
const int lambda = (f->quality * f->quality) >> const int lambda = (f->quality * f->quality) >>
(2 * FF_LAMBDA_SHIFT); (2 * FF_LAMBDA_SHIFT);
@ -427,12 +427,12 @@ static int svq1_encode_plane(SVQ1EncContext *s, int plane,
dxy = (mx & 1) + 2 * (my & 1); dxy = (mx & 1) + 2 * (my & 1);
s->hdsp.put_pixels_tab[0][dxy](temp + 16, s->hdsp.put_pixels_tab[0][dxy](temp + 16*stride,
ref + (mx >> 1) + ref + (mx >> 1) +
stride * (my >> 1), stride * (my >> 1),
stride, 16); stride, 16);
score[1] += encode_block(s, src + 16 * x, temp + 16, score[1] += encode_block(s, src + 16 * x, temp + 16*stride,
decoded, stride, 5, 64, lambda, 0); decoded, stride, 5, 64, lambda, 0);
best = score[1] <= score[0]; best = score[1] <= score[0];
@ -586,7 +586,7 @@ static int svq1_encode_frame(AVCodecContext *avctx, AVPacket *pkt,
(ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) { (ret = ff_get_buffer(avctx, s->last_picture, 0)) < 0) {
return ret; return ret;
} }
s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 2); s->scratchbuf = av_malloc(s->current_picture->linesize[0] * 16 * 3);
} }
FFSWAP(AVFrame*, s->current_picture, s->last_picture); FFSWAP(AVFrame*, s->current_picture, s->last_picture);