virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

lagarith: fix alignment on buffers passed into prediction dsp code.

Browse Source 
This should fix issues with direct rendering

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-08-23 19:03:57 +02:00
parent 732dfc7660
commit 2b3b52d519
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libavcodec/lagarith.c
View File

@ -250,8 +250,8 @@ static void lag_pred_line(LagarithContext *l, uint8_t *buf,
if (!line) { if (!line) {
/* 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, buf,
width - 1, buf[0]); width, 0);
} 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];
@ -277,11 +277,12 @@ static void lag_pred_line_yuy2(LagarithContext *l, uint8_t *buf,
int L, TL; int L, TL;
if (!line) { if (!line) {
if (is_luma) { L= buf[0];
buf++; if (is_luma)
width--; buf[0] = 0;
} l->dsp.add_hfyu_left_prediction(buf, buf, width, 0);
l->dsp.add_hfyu_left_prediction(buf + 1, buf + 1, width - 1, buf[0]); if (is_luma)
buf[0] = L;
return; return;
} }
if (line == 1) { if (line == 1) {
@ -294,14 +295,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,