Mercurial > libavcodec.hg
changeset 5198:579c01dbb5a1 libavcodec
use properly AVFrame.linesize
patch by Vitor: [vitor1001 gmail com]
| author | benoit |
|---|---|
| date | Mon, 02 Jul 2007 10:20:12 +0000 |
| parents | 953a9fd3b5f5 |
| children | 0af35881395e |
| files | roqvideoenc.c |
| diffstat | 1 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/roqvideoenc.c Mon Jul 02 10:13:19 2007 +0000 +++ b/roqvideoenc.c Mon Jul 02 10:20:12 2007 +0000 @@ -125,7 +125,7 @@ // FIXME Could use DSPContext.sse, but it is not so speed critical (used // just for motion estimation). static int block_sse(uint8_t **buf1, uint8_t **buf2, int x1, int y1, int x2, - int y2, int *stride, int size) + int y2, int *stride1, int *stride2, int size) { int i, k; int sse=0; @@ -133,8 +133,8 @@ for (k=0; k<3; k++) { int bias = (k ? CHROMA_BIAS : 4); for (i=0; i<size; i++) - sse += bias*eval_sse(buf1[k] + (y1+i)*stride[k] + x1, - buf2[k] + (y2+i)*stride[k] + x2, size); + sse += bias*eval_sse(buf1[k] + (y1+i)*stride1[k] + x1, + buf2[k] + (y2+i)*stride2[k] + x2, size); } return sse; @@ -159,7 +159,9 @@ return INT_MAX; return block_sse(enc->frame_to_enc->data, enc->last_frame->data, x, y, - mx, my, enc->frame_to_enc->linesize, size); + mx, my, + enc->frame_to_enc->linesize, enc->last_frame->linesize, + size); } /** @@ -417,6 +419,7 @@ enc->current_frame->data, x, y, x, y, enc->frame_to_enc->linesize, + enc->current_frame->linesize, 4); else subcel->eval_dist[RoQ_ID_MOT] = INT_MAX; @@ -479,7 +482,8 @@ enc->current_frame->data, cel->sourceX, cel->sourceY, cel->sourceX, cel->sourceY, - enc->frame_to_enc->linesize, 8); + enc->frame_to_enc->linesize, + enc->current_frame->linesize,8); else cel->eval_dist[RoQ_ID_MOT] = INT_MAX; @@ -740,7 +744,9 @@ av_log(enc->avctx, AV_LOG_ERROR, "Expected distortion: %i Actual: %i\n", dist, block_sse(fdata, cdata, 0, 0, 0, 0, - enc->frame_to_enc->linesize, enc->width)); //WARNING: Square dimensions implied... + enc->frame_to_enc->linesize, + enc->current_frame->linesize, + enc->width)); //WARNING: Square dimensions implied... #endif } @@ -993,8 +999,6 @@ uint8_t *buf_start = buf; enc->out_buf = buf; - enc->y_stride = frame->linesize[0]; - enc->c_stride = frame->linesize[1]; enc->avctx = avctx; enc->frame_to_enc = frame;