diff options
author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-03-28 11:27:56 +0100 |
---|---|---|
committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2009-03-28 11:27:56 +0100 |
commit | b69231ad214b28a267c3e14ce66c27e2b124ba7e (patch) | |
tree | 51955dbbf64d3dd79921c6dd2aed6d5eda2907ef | |
parent | 1c36c03001e07aa299dba00fe542b91ebfa4c2db (diff) |
videoscale: Don't read after the end of a line when lineary scaling YUYV/UYVY
Partially fixes bug #577054.
-rw-r--r-- | gst/videoscale/vs_scanline.c | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/gst/videoscale/vs_scanline.c b/gst/videoscale/vs_scanline.c index 9a045722e..6e8576cd5 100644 --- a/gst/videoscale/vs_scanline.c +++ b/gst/videoscale/vs_scanline.c @@ -280,10 +280,16 @@ vs_scanline_resample_linear_YUYV (uint8_t * dest, uint8_t * src, int n, j = acc >> 17; x = acc & 0x1ffff; - dest[i * 4 + 1] = - (src[j * 4 + 1] * (131072 - x) + src[j * 4 + 5] * x) >> 17; - dest[i * 4 + 3] = - (src[j * 4 + 3] * (131072 - x) + src[j * 4 + 7] * x) >> 17; + + if (i < n - 1) { + dest[i * 4 + 1] = + (src[j * 4 + 1] * (131072 - x) + src[j * 4 + 5] * x) >> 17; + dest[i * 4 + 3] = + (src[j * 4 + 3] * (131072 - x) + src[j * 4 + 7] * x) >> 17; + } else { + dest[i * 4 + 1] = src[j * 4 + 1]; + dest[i * 4 + 3] = src[j * 4 + 3]; + } acc += increment; @@ -379,10 +385,16 @@ vs_scanline_resample_linear_UYVY (uint8_t * dest, uint8_t * src, int n, j = acc >> 17; x = acc & 0x1ffff; - dest[i * 4 + 0] = - (src[j * 4 + 0] * (131072 - x) + src[j * 4 + 4] * x) >> 17; - dest[i * 4 + 2] = - (src[j * 4 + 2] * (131072 - x) + src[j * 4 + 6] * x) >> 17; + + if (i < n - 1) { + dest[i * 4 + 0] = + (src[j * 4 + 0] * (131072 - x) + src[j * 4 + 4] * x) >> 17; + dest[i * 4 + 2] = + (src[j * 4 + 2] * (131072 - x) + src[j * 4 + 6] * x) >> 17; + } else { + dest[i * 4 + 0] = src[j * 4 + 0]; + dest[i * 4 + 2] = src[j * 4 + 2]; + } acc += increment; |