Commit 9d586e04 authored by Sebastian Dröge's avatar Sebastian Dröge
Browse files

videoscale: Rewrite YUYV (and friends) scaling and don't read/write over line ends

Partially fixes bug #577054, there's just one issue left now.
parent 5545a970
This diff is collapsed.
......@@ -42,8 +42,8 @@ vs_scanline_downsample_Y (uint8_t * dest, uint8_t * src, int n)
}
void
vs_scanline_resample_nearest_Y (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_nearest_Y (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
......@@ -53,7 +53,7 @@ vs_scanline_resample_nearest_Y (uint8_t * dest, uint8_t * src, int n,
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i] = (x < 32768) ? src[j] : src[j + 1];
dest[i] = (x < 32768 || j + 1 >= src_width) ? src[j] : src[j + 1];
acc += increment;
}
......@@ -62,15 +62,24 @@ vs_scanline_resample_nearest_Y (uint8_t * dest, uint8_t * src, int n,
}
void
vs_scanline_resample_linear_Y (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_linear_Y (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
uint32_t vals[2];
vals[0] = *accumulator;
vals[1] = increment;
oil_resample_linear_u8 (dest, src, n, vals);
if (src_width % 2 == 0) {
oil_resample_linear_u8 (dest, src, n, vals);
} else if (src_width > 1) {
if (n > 1)
oil_resample_linear_u8 (dest, src, n - 1, vals);
dest[n - 1] = src[vals[0] >> 16];
vals[0] += increment;
} else {
oil_splat_u8 (dest, 1, &src[0], n);
}
*accumulator = vals[0];
}
......@@ -101,8 +110,8 @@ vs_scanline_downsample_RGBA (uint8_t * dest, uint8_t * src, int n)
}
void
vs_scanline_resample_nearest_RGBA (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_nearest_RGBA (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
......@@ -112,10 +121,18 @@ vs_scanline_resample_nearest_RGBA (uint8_t * dest, uint8_t * src, int n,
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i * 4 + 0] = (x < 32768) ? src[j * 4 + 0] : src[j * 4 + 4];
dest[i * 4 + 1] = (x < 32768) ? src[j * 4 + 1] : src[j * 4 + 5];
dest[i * 4 + 2] = (x < 32768) ? src[j * 4 + 2] : src[j * 4 + 6];
dest[i * 4 + 3] = (x < 32768) ? src[j * 4 + 3] : src[j * 4 + 7];
if (j + 1 < src_width) {
dest[i * 4 + 0] = (x < 32768) ? src[j * 4 + 0] : src[j * 4 + 4];
dest[i * 4 + 1] = (x < 32768) ? src[j * 4 + 1] : src[j * 4 + 5];
dest[i * 4 + 2] = (x < 32768) ? src[j * 4 + 2] : src[j * 4 + 6];
dest[i * 4 + 3] = (x < 32768) ? src[j * 4 + 3] : src[j * 4 + 7];
} else {
dest[i * 4 + 0] = src[j * 4 + 0];
dest[i * 4 + 1] = src[j * 4 + 1];
dest[i * 4 + 2] = src[j * 4 + 2];
dest[i * 4 + 3] = src[j * 4 + 3];
}
acc += increment;
}
......@@ -125,18 +142,25 @@ vs_scanline_resample_nearest_RGBA (uint8_t * dest, uint8_t * src, int n,
#include <stdio.h>
void
vs_scanline_resample_linear_RGBA (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_linear_RGBA (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
if (increment != 0) {
uint32_t vals[2];
uint32_t vals[2];
vals[0] = *accumulator;
vals[1] = increment;
vals[0] = *accumulator;
vals[1] = increment;
if (src_width % 2 == 0) {
oil_resample_linear_argb ((uint32_t *) dest, (uint32_t *) src, n, vals);
*accumulator = vals[0];
} else if (src_width > 1) {
if (n > 1)
oil_resample_linear_argb ((uint32_t *) dest, (uint32_t *) src, n - 1,
vals);
dest[4 * (n - 1) + 0] = src[(vals[0] >> 16) + 0];
dest[4 * (n - 1) + 1] = src[(vals[0] >> 16) + 1];
dest[4 * (n - 1) + 2] = src[(vals[0] >> 16) + 2];
dest[4 * (n - 1) + 3] = src[(vals[0] >> 16) + 3];
vals[0] += increment;
} else {
int i;
......@@ -145,8 +169,11 @@ vs_scanline_resample_linear_RGBA (uint8_t * dest, uint8_t * src, int n,
dest[4 * i + 1] = src[1];
dest[4 * i + 2] = src[2];
dest[4 * i + 3] = src[3];
vals[0] += increment;
}
}
*accumulator = vals[0];
}
void
......@@ -175,8 +202,8 @@ vs_scanline_downsample_RGB (uint8_t * dest, uint8_t * src, int n)
}
void
vs_scanline_resample_nearest_RGB (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_nearest_RGB (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
......@@ -186,9 +213,12 @@ vs_scanline_resample_nearest_RGB (uint8_t * dest, uint8_t * src, int n,
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i * 3 + 0] = (x < 32768) ? src[j * 3 + 0] : src[j * 3 + 3];
dest[i * 3 + 1] = (x < 32768) ? src[j * 3 + 1] : src[j * 3 + 4];
dest[i * 3 + 2] = (x < 32768) ? src[j * 3 + 2] : src[j * 3 + 5];
dest[i * 3 + 0] = (x < 32768
|| j + 1 >= src_width) ? src[j * 3 + 0] : src[j * 3 + 3];
dest[i * 3 + 1] = (x < 32768
|| j + 1 >= src_width) ? src[j * 3 + 1] : src[j * 3 + 4];
dest[i * 3 + 2] = (x < 32768
|| j + 1 >= src_width) ? src[j * 3 + 2] : src[j * 3 + 5];
acc += increment;
}
......@@ -197,33 +227,32 @@ vs_scanline_resample_nearest_RGB (uint8_t * dest, uint8_t * src, int n,
}
void
vs_scanline_resample_linear_RGB (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_linear_RGB (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
int j;
int x;
if (increment != 0) {
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
if (j + 1 < src_width) {
dest[i * 3 + 0] =
(src[j * 3 + 0] * (65536 - x) + src[j * 3 + 3] * x) >> 16;
dest[i * 3 + 1] =
(src[j * 3 + 1] * (65536 - x) + src[j * 3 + 4] * x) >> 16;
dest[i * 3 + 2] =
(src[j * 3 + 2] * (65536 - x) + src[j * 3 + 5] * x) >> 16;
acc += increment;
}
} else {
for (i = 0; i < n; i++) {
dest[i * 3 + 0] = src[0];
dest[i * 3 + 1] = src[1];
dest[i * 3 + 2] = src[2];
} else {
dest[i * 3 + 0] = src[j * 3 + 0];
dest[i * 3 + 1] = src[j * 3 + 1];
dest[i * 3 + 2] = src[j * 3 + 2];
}
acc += increment;
}
*accumulator = acc;
......@@ -241,7 +270,7 @@ vs_scanline_merge_linear_RGB (uint8_t * dest, uint8_t * src1, uint8_t * src2,
/* YUYV */
/* n is the number of bi-pixels */
/* n is the number of pixels */
/* increment is per Y pixel */
void
......@@ -258,80 +287,98 @@ vs_scanline_downsample_YUYV (uint8_t * dest, uint8_t * src, int n)
}
void
vs_scanline_resample_nearest_YUYV (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_nearest_YUYV (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
int j;
int x;
int quads = (n + 1) / 2;
for (i = 0; i < n; i++) {
for (i = 0; i < quads; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i * 4 + 0] = (x < 32768) ? src[j * 2 + 0] : src[j * 2 + 2];
dest[i * 4 + 0] = (x < 32768
|| j + 1 >= src_width) ? src[j * 2 + 0] : src[j * 2 + 2];
j = acc >> 17;
x = acc & 0x1ffff;
dest[i * 4 + 1] = (x < 65536) ? src[j * 4 + 1] : src[j * 4 + 5];
dest[i * 4 + 3] = (x < 65536) ? src[j * 4 + 3] : src[j * 4 + 7];
dest[i * 4 + 1] = (x < 65536
|| 2 * (j + 2) >= src_width) ? src[j * 4 + 1] : src[j * 4 + 5];
if (2 * i + 1 < n && 2 * (j + 1) < src_width)
dest[i * 4 + 3] = (x < 65536
|| 2 * (j + 3) >= src_width) ? src[j * 4 + 3] : src[j * 4 + 7];
acc += increment;
j = acc >> 16;
x = acc & 0xffff;
dest[i * 4 + 2] = (x < 32768) ? src[j * 2 + 0] : src[j * 2 + 2];
acc += increment;
if (2 * i + 1 < n && j < src_width) {
dest[i * 4 + 2] = (x < 32768
|| j + 1 >= src_width) ? src[j * 2 + 0] : src[j * 2 + 2];
acc += increment;
}
}
*accumulator = acc;
}
void
vs_scanline_resample_linear_YUYV (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_linear_YUYV (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
int j;
int x;
int quads = (n + 1) / 2;
for (i = 0; i < n; i++) {
for (i = 0; i < quads; i++) {
j = acc >> 16;
x = acc & 0xffff;
if (increment != 0)
if (j + 1 < src_width)
dest[i * 4 + 0] =
(src[j * 2 + 0] * (65536 - x) + src[j * 2 + 2] * x) >> 16;
else
dest[i * 4 + 0] = src[0];
dest[i * 4 + 0] = src[j * 2 + 0];
j = acc >> 17;
x = acc & 0x1ffff;
if (i < n - 1 && increment != 0) {
if (2 * (j + 2) < src_width)
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 {
else
dest[i * 4 + 1] = src[j * 4 + 1];
dest[i * 4 + 3] = src[j * 4 + 3];
if (2 * i + 1 < n && 2 * (j + 1) < src_width) {
if (2 * (j + 3) < src_width)
dest[i * 4 + 3] =
(src[j * 4 + 3] * (131072 - x) + src[j * 4 + 7] * x) >> 17;
else
dest[i * 4 + 3] = src[j * 4 + 3];
}
acc += increment;
j = acc >> 16;
x = acc & 0xffff;
if (increment != 0)
dest[i * 4 + 2] =
(src[j * 2 + 0] * (65536 - x) + src[j * 2 + 2] * x) >> 16;
else
dest[i * 4 + 2] = src[0];
acc += increment;
if (2 * i + 1 < n && j < src_width) {
if (j + 1 < src_width)
dest[i * 4 + 2] =
(src[j * 2 + 0] * (65536 - x) + src[j * 2 + 2] * x) >> 16;
else
dest[i * 4 + 2] = src[j * 2 + 0];
acc += increment;
}
}
*accumulator = acc;
}
......@@ -340,16 +387,20 @@ vs_scanline_merge_linear_YUYV (uint8_t * dest, uint8_t * src1, uint8_t * src2,
int n, int x)
{
int i;
int quads = (n + 1) / 2;
for (i = 0; i < n; i++) {
for (i = 0; i < quads; i++) {
dest[i * 4 + 0] =
(src1[i * 4 + 0] * (65536 - x) + src2[i * 4 + 0] * x) >> 16;
dest[i * 4 + 1] =
(src1[i * 4 + 1] * (65536 - x) + src2[i * 4 + 1] * x) >> 16;
dest[i * 4 + 2] =
(src1[i * 4 + 2] * (65536 - x) + src2[i * 4 + 2] * x) >> 16;
dest[i * 4 + 3] =
(src1[i * 4 + 3] * (65536 - x) + src2[i * 4 + 3] * x) >> 16;
if (2 * i + 1 < n) {
dest[i * 4 + 2] =
(src1[i * 4 + 2] * (65536 - x) + src2[i * 4 + 2] * x) >> 16;
dest[i * 4 + 3] =
(src1[i * 4 + 3] * (65536 - x) + src2[i * 4 + 3] * x) >> 16;
}
}
}
......@@ -373,90 +424,121 @@ vs_scanline_downsample_UYVY (uint8_t * dest, uint8_t * src, int n)
}
void
vs_scanline_resample_nearest_UYVY (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_nearest_UYVY (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
int j;
int x;
int quads = (n + 1) / 2;
for (i = 0; i < n; i++) {
for (i = 0; i < quads; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i * 4 + 1] = (x < 32768) ? src[j * 2 + 1] : src[j * 2 + 3];
dest[i * 4 + 1] = (x < 32768
|| j + 1 >= src_width) ? src[j * 2 + 1] : src[j * 2 + 3];
j = acc >> 17;
x = acc & 0x1ffff;
dest[i * 4 + 0] = (x < 65536) ? src[j * 4 + 0] : src[j * 4 + 4];
dest[i * 4 + 2] = (x < 65536) ? src[j * 4 + 2] : src[j * 4 + 6];
dest[i * 4 + 0] = (x < 65536
|| 2 * (j + 2) >= src_width) ? src[j * 4 + 0] : src[j * 4 + 4];
if (2 * i + 1 < n && 2 * (j + 1) < src_width)
dest[i * 4 + 2] = (x < 65536
|| 2 * (j + 3) >= src_width) ? src[j * 4 + 2] : src[j * 4 + 6];
acc += increment;
j = acc >> 16;
x = acc & 0xffff;
dest[i * 4 + 3] = (x < 32768) ? src[j * 2 + 1] : src[j * 2 + 3];
acc += increment;
if (2 * i + 1 < n && j < src_width) {
dest[i * 4 + 3] = (x < 32768
|| j + 1 >= src_width) ? src[j * 2 + 1] : src[j * 2 + 3];
acc += increment;
}
}
*accumulator = acc;
}
void
vs_scanline_resample_linear_UYVY (uint8_t * dest, uint8_t * src, int n,
int *accumulator, int increment)
vs_scanline_resample_linear_UYVY (uint8_t * dest, uint8_t * src, int src_width,
int n, int *accumulator, int increment)
{
int acc = *accumulator;
int i;
int j;
int x;
int quads = (n + 1) / 2;
for (i = 0; i < n; i++) {
for (i = 0; i < quads; i++) {
j = acc >> 16;
x = acc & 0xffff;
if (increment != 0)
if (j + 1 < src_width)
dest[i * 4 + 1] =
(src[j * 2 + 1] * (65536 - x) + src[j * 2 + 3] * x) >> 16;
else
dest[i * 4 + 1] = src[1];
dest[i * 4 + 1] = src[j * 2 + 1];
j = acc >> 17;
x = acc & 0x1ffff;
if (i < n - 1 && increment != 0) {
if (2 * (j + 2) < src_width)
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 {
else
dest[i * 4 + 0] = src[j * 4 + 0];
dest[i * 4 + 2] = src[j * 4 + 2];
if (i * 2 + 1 < n && 2 * (j + 1) < src_width) {
if (2 * (j + 3) < src_width)
dest[i * 4 + 2] =
(src[j * 4 + 2] * (131072 - x) + src[j * 4 + 6] * x) >> 17;
else
dest[i * 4 + 2] = src[j * 4 + 2];
}
acc += increment;
j = acc >> 16;
x = acc & 0xffff;
if (increment != 0)
dest[i * 4 + 3] =
(src[j * 2 + 1] * (65536 - x) + src[j * 2 + 3] * x) >> 16;
else
dest[i * 4 + 3] = src[1];
acc += increment;
if (2 * i + 1 < n && j < src_width) {
if (j + 1 < src_width)
dest[i * 4 + 3] =
(src[j * 2 + 1] * (65536 - x) + src[j * 2 + 3] * x) >> 16;
else
dest[i * 4 + 3] = src[j * 2 + 1];
acc += increment;
}
}
*accumulator = acc;
}
void
vs_scanline_merge_linear_UYVY (uint8_t * dest, uint8_t * src1, uint8_t * src2,
int n, int x)
vs_scanline_merge_linear_UYVY (uint8_t * dest, uint8_t * src1,
uint8_t * src2, int n, int x)
{
uint32_t value = x >> 8;
int i;
int quads = (n + 1) / 2;
oil_merge_linear_argb ((uint32_t *) dest, (uint32_t *) src1,
(uint32_t *) src2, &value, n);
for (i = 0; i < quads; i++) {
dest[i * 4 + 0] =
(src1[i * 4 + 0] * (65536 - x) + src2[i * 4 + 0] * x) >> 16;
dest[i * 4 + 1] =
(src1[i * 4 + 1] * (65536 - x) + src2[i * 4 + 1] * x) >> 16;
if (2 * i + 1 < n) {
dest[i * 4 + 2] =
(src1[i * 4 + 2] * (65536 - x) + src2[i * 4 + 2] * x) >> 16;
dest[i * 4 + 3] =
(src1[i * 4 + 3] * (65536 - x) + src2[i * 4 + 3] * x) >> 16;
}
}
}
......@@ -488,8 +570,8 @@ vs_scanline_downsample_RGB565 (uint8_t * dest_u8, uint8_t * src_u8, int n)
}
void
vs_scanline_resample_nearest_RGB565 (uint8_t * dest_u8, uint8_t * src_u8, int n,
int *accumulator, int increment)
vs_scanline_resample_nearest_RGB565 (uint8_t * dest_u8, uint8_t * src_u8,
int src_width, int n, int *accumulator, int increment)
{
uint16_t *dest = (uint16_t *) dest_u8;
uint16_t *src = (uint16_t *) src_u8;
......@@ -501,7 +583,7 @@ vs_scanline_resample_nearest_RGB565 (uint8_t * dest_u8, uint8_t * src_u8, int n,
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i] = (x < 32768) ? src[j] : src[j + 1];
dest[i] = (x < 32768 || j + 1 >= src_width) ? src[j] : src[j + 1];
acc += increment;
}
......@@ -510,8 +592,8 @@ vs_scanline_resample_nearest_RGB565 (uint8_t * dest_u8, uint8_t * src_u8, int n,
}
void
vs_scanline_resample_linear_RGB565 (uint8_t * dest_u8, uint8_t * src_u8, int n,
int *accumulator, int increment)
vs_scanline_resample_linear_RGB565 (uint8_t * dest_u8, uint8_t * src_u8,
int src_width, int n, int *accumulator, int increment)
{
uint16_t *dest = (uint16_t *) dest_u8;
uint16_t *src = (uint16_t *) src_u8;
......@@ -523,10 +605,16 @@ vs_scanline_resample_linear_RGB565 (uint8_t * dest_u8, uint8_t * src_u8, int n,
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i] = RGB565 (
(RGB565_R (src[j]) * (65536 - x) + RGB565_R (src[j + 1]) * x) >> 16,
(RGB565_G (src[j]) * (65536 - x) + RGB565_G (src[j + 1]) * x) >> 16,
(RGB565_B (src[j]) * (65536 - x) + RGB565_B (src[j + 1]) * x) >> 16);
if (j + 1 < src_width) {
dest[i] = RGB565 (
(RGB565_R (src[j]) * (65536 - x) + RGB565_R (src[j + 1]) * x) >> 16,
(RGB565_G (src[j]) * (65536 - x) + RGB565_G (src[j + 1]) * x) >> 16,
(RGB565_B (src[j]) * (65536 - x) + RGB565_B (src[j + 1]) * x) >> 16);
} else {
dest[i] = RGB565 (RGB565_R (src[j]),
RGB565_G (src[j]), RGB565_B (src[j]));
}
acc += increment;
}
......@@ -580,8 +668,8 @@ vs_scanline_downsample_RGB555 (uint8_t * dest_u8, uint8_t * src_u8, int n)
}
void
vs_scanline_resample_nearest_RGB555 (uint8_t * dest_u8, uint8_t * src_u8, int n,
int *accumulator, int increment)
vs_scanline_resample_nearest_RGB555 (uint8_t * dest_u8, uint8_t * src_u8,
int src_width, int n, int *accumulator, int increment)
{
uint16_t *dest = (uint16_t *) dest_u8;
uint16_t *src = (uint16_t *) src_u8;
......@@ -593,7 +681,7 @@ vs_scanline_resample_nearest_RGB555 (uint8_t * dest_u8, uint8_t * src_u8, int n,
for (i = 0; i < n; i++) {
j = acc >> 16;
x = acc & 0xffff;
dest[i] = (x < 32768) ? src[j] : src[j + 1];
dest[i] = (x < 32768 || j + 1 >= src_width) ? src[j] : src[j + 1];
acc += increment;
}
......@@ -602,8 +690,8 @@ vs_scanline_resample_nearest_RGB555 (uint8_t * dest_u8, uint8_t * src_u8, int n,
}
void
vs_scanline_resample_linear_RGB555 (uint8_t * dest_u8, uint8_t * src_u8, int n,
int *accumulator, int increment)
vs_scanline_resample_linear_RGB555 (uint8_t * dest_u8, uint8_t * src_u8,
int src_width, int n, int *accumulator, int increment)