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

lagarith: do not call simd functions on unaligned lines

Browse Source 
They end up overwriting past the line end.

Partially based on a patch by Michael Niedermayer <michaelni@gmx.at>

Bug-Id: vlc/9700
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Kostya Shishkov 2013-12-30 09:31:57 +01:00 committed by Anton Khirnov
parent f4a8a00805
commit 2f97094608
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libavcodec/lagarith.c
View File

@ -248,9 +248,12 @@ static void lag_pred_line(LagarithContext *l, uint8_t *buf,
int L, TL; int L, TL;
if (!line) { if (!line) {
int i, align_width = (width - 1) & ~31;
/* Left prediction only for first line */ /* Left prediction only for first line */
L = l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1, L = l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1,
width - 1, buf[0]); align_width, buf[0]);
for (i = align_width + 1; i < width; i++)
buf[i] += buf[i - 1];
} else { } else {
/* Left pixel is actually prev_row[width] */ /* Left pixel is actually prev_row[width] */
L = buf[width - stride - 1]; L = buf[width - stride - 1];
@ -276,11 +279,18 @@ static void lag_pred_line_yuy2(LagarithContext *l, uint8_t *buf,
int L, TL; int L, TL;
if (!line) { if (!line) {
int i, align_width;
if (is_luma) { if (is_luma) {
buf++; buf++;
width--; width--;
} }
l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1, width - 1, buf[0]);
align_width = (width - 1) & ~31;
l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1, align_width, buf[0]);
for (i = align_width + 1; i < width; i++)
buf[i] += buf[i - 1];
return; return;
} }
if (line == 1) { if (line == 1) {
@ -293,14 +303,17 @@ static void lag_pred_line_yuy2(LagarithContext *l, uint8_t *buf,
L += buf[i]; L += buf[i];
buf[i] = L; buf[i] = L;
} }
buf += HEAD; for (; i < width; i++) {
width -= HEAD; L = mid_pred(L & 0xFF, buf[i - stride], (L + buf[i - stride] - TL) & 0xFF) + buf[i];
TL = buf[i - stride];
buf[i] = L;
}
} else { } else {
TL = buf[width - (2 * stride) - 1]; TL = buf[width - (2 * stride) - 1];
L = buf[width - stride - 1]; L = buf[width - stride - 1];
l->dsp.add_hfyu_median_prediction(buf, buf - stride, buf, width,
&L, &TL);
} }
l->dsp.add_hfyu_median_prediction(buf, buf - stride, buf, width,
&L, &TL);
} }
static int lag_decode_line(LagarithContext *l, lag_rac *rac, static int lag_decode_line(LagarithContext *l, lag_rac *rac,