mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-23 15:48:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

colorspace: fix odd width and height handling in some fastpath cases

Browse source
This commit is contained in:
Mark Nauwelaerts 2011-06-15 18:20:48 +02:00
parent 26f7a1ca66
commit a1f5b2e0cc
1 changed files with 90 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
gst/colorspace/colorspace.c
View file

@ -1830,7 +1830,7 @@ convert_I420_YUY2 (ColorspaceConvert * convert, guint8 * dest,
{ {
int i; int i;
for (i = 0; i < convert->height; i += 2) { for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
cogorc_convert_I420_YUY2 (FRAME_GET_LINE (dest, 0, i), cogorc_convert_I420_YUY2 (FRAME_GET_LINE (dest, 0, i),
FRAME_GET_LINE (dest, 0, i + 1), FRAME_GET_LINE (dest, 0, i + 1),
FRAME_GET_LINE (src, 0, i), FRAME_GET_LINE (src, 0, i),
@ -1838,6 +1838,12 @@ convert_I420_YUY2 (ColorspaceConvert * convert, guint8 * dest,
FRAME_GET_LINE (src, 1, i >> 1), FRAME_GET_LINE (src, 1, i >> 1),
FRAME_GET_LINE (src, 2, i >> 1), (convert->width + 1) / 2); FRAME_GET_LINE (src, 2, i >> 1), (convert->width + 1) / 2);
} }
/* now handle last line */
if (convert->height & 1) {
getline_I420 (convert, convert->tmpline, src, convert->height - 1);
putline_YUY2 (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -1846,7 +1852,7 @@ convert_I420_UYVY (ColorspaceConvert * convert, guint8 * dest,
{ {
int i; int i;
for (i = 0; i < convert->height; i += 2) { for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
cogorc_convert_I420_UYVY (FRAME_GET_LINE (dest, 0, i), cogorc_convert_I420_UYVY (FRAME_GET_LINE (dest, 0, i),
FRAME_GET_LINE (dest, 0, i + 1), FRAME_GET_LINE (dest, 0, i + 1),
FRAME_GET_LINE (src, 0, i), FRAME_GET_LINE (src, 0, i),
@ -1854,6 +1860,12 @@ convert_I420_UYVY (ColorspaceConvert * convert, guint8 * dest,
FRAME_GET_LINE (src, 1, i >> 1), FRAME_GET_LINE (src, 1, i >> 1),
FRAME_GET_LINE (src, 2, i >> 1), (convert->width + 1) / 2); FRAME_GET_LINE (src, 2, i >> 1), (convert->width + 1) / 2);
} }
/* now handle last line */
if (convert->height & 1) {
getline_I420 (convert, convert->tmpline, src, convert->height - 1);
putline_UYVY (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -1862,7 +1874,7 @@ convert_I420_AYUV (ColorspaceConvert * convert, guint8 * dest,
{ {
int i; int i;
for (i = 0; i < convert->height; i += 2) { for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
cogorc_convert_I420_AYUV (FRAME_GET_LINE (dest, 0, i), cogorc_convert_I420_AYUV (FRAME_GET_LINE (dest, 0, i),
FRAME_GET_LINE (dest, 0, i + 1), FRAME_GET_LINE (dest, 0, i + 1),
FRAME_GET_LINE (src, 0, i), FRAME_GET_LINE (src, 0, i),
@ -1870,6 +1882,12 @@ convert_I420_AYUV (ColorspaceConvert * convert, guint8 * dest,
FRAME_GET_LINE (src, 1, i >> 1), FRAME_GET_LINE (src, 1, i >> 1),
FRAME_GET_LINE (src, 2, i >> 1), convert->width); FRAME_GET_LINE (src, 2, i >> 1), convert->width);
} }
/* now handle last line */
if (convert->height & 1) {
getline_I420 (convert, convert->tmpline, src, convert->height - 1);
putline_AYUV (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -1902,23 +1920,31 @@ convert_I420_Y444 (ColorspaceConvert * convert, guint8 * dest,
cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 1, 0), cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 1, 0),
2 * convert->dest_stride[1], FRAME_GET_LINE (dest, 1, 1), 2 * convert->dest_stride[1], FRAME_GET_LINE (dest, 1, 1),
2 * convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0), 2 * convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0),
convert->src_stride[1], (convert->width + 1) / 2, convert->src_stride[1], (convert->width + 1) / 2, convert->height / 2);
(convert->height + 1) / 2);
cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 2, 0), cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 2, 0),
2 * convert->dest_stride[2], FRAME_GET_LINE (dest, 2, 1), 2 * convert->dest_stride[2], FRAME_GET_LINE (dest, 2, 1),
2 * convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0), 2 * convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0),
convert->src_stride[2], (convert->width + 1) / 2, convert->src_stride[2], (convert->width + 1) / 2, convert->height / 2);
(convert->height + 1) / 2);
/* now handle last line */
if (convert->height & 1) {
getline_I420 (convert, convert->tmpline, src, convert->height - 1);
putline_Y444 (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
convert_YUY2_I420 (ColorspaceConvert * convert, guint8 * dest, convert_YUY2_I420 (ColorspaceConvert * convert, guint8 * dest,
const guint8 * src) const guint8 * src)
{ {
int i; int i, h;
for (i = 0; i < convert->height; i += 2) { h = convert->height;
if (convert->width & 1)
h--;
for (i = 0; i < h; i += 2) {
cogorc_convert_YUY2_I420 (FRAME_GET_LINE (dest, 0, i), cogorc_convert_YUY2_I420 (FRAME_GET_LINE (dest, 0, i),
FRAME_GET_LINE (dest, 0, i + 1), FRAME_GET_LINE (dest, 0, i + 1),
FRAME_GET_LINE (dest, 1, i >> 1), FRAME_GET_LINE (dest, 1, i >> 1),
@ -1926,6 +1952,12 @@ convert_YUY2_I420 (ColorspaceConvert * convert, guint8 * dest,
FRAME_GET_LINE (src, 0, i), FRAME_GET_LINE (src, 0, i),
FRAME_GET_LINE (src, 0, i + 1), (convert->width + 1) / 2); FRAME_GET_LINE (src, 0, i + 1), (convert->width + 1) / 2);
} }
/* now handle last line */
if (convert->width & 1) {
getline_YUY2 (convert, convert->tmpline, src, convert->height - 1);
putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -1934,7 +1966,14 @@ convert_YUY2_AYUV (ColorspaceConvert * convert, guint8 * dest,
{ {
cogorc_convert_YUY2_AYUV (FRAME_GET_LINE (dest, 0, 0), cogorc_convert_YUY2_AYUV (FRAME_GET_LINE (dest, 0, 0),
convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0), convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
convert->src_stride[0], (convert->width + 1) / 2, convert->height); convert->src_stride[0], (convert->width + 1) / 2,
convert->width & 1 ? convert->height - 1 : convert->height);
/* now handle last line */
if (convert->width & 1) {
getline_YUY2 (convert, convert->tmpline, src, convert->height - 1);
putline_AYUV (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -1966,7 +2005,7 @@ convert_UYVY_I420 (ColorspaceConvert * convert, guint8 * dest,
{ {
int i; int i;
for (i = 0; i < convert->height; i += 2) { for (i = 0; i < GST_ROUND_DOWN_2 (convert->height); i += 2) {
cogorc_convert_UYVY_I420 (FRAME_GET_LINE (dest, 0, i), cogorc_convert_UYVY_I420 (FRAME_GET_LINE (dest, 0, i),
FRAME_GET_LINE (dest, 0, i + 1), FRAME_GET_LINE (dest, 0, i + 1),
FRAME_GET_LINE (dest, 1, i >> 1), FRAME_GET_LINE (dest, 1, i >> 1),
@ -1974,6 +2013,12 @@ convert_UYVY_I420 (ColorspaceConvert * convert, guint8 * dest,
FRAME_GET_LINE (src, 0, i), FRAME_GET_LINE (src, 0, i),
FRAME_GET_LINE (src, 0, i + 1), (convert->width + 1) / 2); FRAME_GET_LINE (src, 0, i + 1), (convert->width + 1) / 2);
} }
/* now handle last line */
if (convert->height & 1) {
getline_UYVY (convert, convert->tmpline, src, convert->height - 1);
putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -1982,7 +2027,14 @@ convert_UYVY_AYUV (ColorspaceConvert * convert, guint8 * dest,
{ {
cogorc_convert_UYVY_AYUV (FRAME_GET_LINE (dest, 0, 0), cogorc_convert_UYVY_AYUV (FRAME_GET_LINE (dest, 0, 0),
convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0), convert->dest_stride[0], FRAME_GET_LINE (src, 0, 0),
convert->src_stride[0], (convert->width + 1) / 2, convert->height); convert->src_stride[0], (convert->width + 1) / 2,
convert->width & 1 ? convert->height - 1 : convert->height);
/* now handle last line */
if (convert->width & 1) {
getline_UYVY (convert, convert->tmpline, src, convert->height - 1);
putline_AYUV (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -2055,7 +2107,15 @@ convert_AYUV_Y42B (ColorspaceConvert * convert, guint8 * dest,
convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0), convert->dest_stride[0], FRAME_GET_LINE (dest, 1, 0),
convert->dest_stride[1], FRAME_GET_LINE (dest, 2, 0), convert->dest_stride[1], FRAME_GET_LINE (dest, 2, 0),
convert->dest_stride[2], FRAME_GET_LINE (src, 0, 0), convert->dest_stride[2], FRAME_GET_LINE (src, 0, 0),
convert->src_stride[0], (convert->width + 1) / 2, convert->height); convert->src_stride[0], (convert->width + 1) / 2,
convert->width & 1 ? convert->height - 1 : convert->height);
/* now handle last line */
if (convert->height & 1) {
getline_AYUV (convert, convert->tmpline, src, convert->height - 1);
putline_Y42B (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -2081,13 +2141,20 @@ convert_Y42B_I420 (ColorspaceConvert * convert, guint8 * dest,
convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0), convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0),
2 * convert->src_stride[1], FRAME_GET_LINE (src, 1, 1), 2 * convert->src_stride[1], FRAME_GET_LINE (src, 1, 1),
2 * convert->src_stride[1], (convert->width + 1) / 2, 2 * convert->src_stride[1], (convert->width + 1) / 2,
(convert->height + 1) / 2); convert->height / 2);
cogorc_planar_chroma_422_420 (FRAME_GET_LINE (dest, 2, 0), cogorc_planar_chroma_422_420 (FRAME_GET_LINE (dest, 2, 0),
convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0), convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0),
2 * convert->src_stride[2], FRAME_GET_LINE (src, 2, 1), 2 * convert->src_stride[2], FRAME_GET_LINE (src, 2, 1),
2 * convert->src_stride[2], (convert->width + 1) / 2, 2 * convert->src_stride[2], (convert->width + 1) / 2,
(convert->height + 1) / 2); convert->height / 2);
/* now handle last line */
if (convert->height & 1) {
getline_Y42B (convert, convert->tmpline, src, convert->height - 1);
putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void
@ -2152,13 +2219,19 @@ convert_Y444_I420 (ColorspaceConvert * convert, guint8 * dest,
convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0), convert->dest_stride[1], FRAME_GET_LINE (src, 1, 0),
2 * convert->src_stride[1], FRAME_GET_LINE (src, 1, 1), 2 * convert->src_stride[1], FRAME_GET_LINE (src, 1, 1),
2 * convert->src_stride[1], (convert->width + 1) / 2, 2 * convert->src_stride[1], (convert->width + 1) / 2,
(convert->height + 1) / 2); convert->height / 2);
cogorc_planar_chroma_444_420 (FRAME_GET_LINE (dest, 2, 0), cogorc_planar_chroma_444_420 (FRAME_GET_LINE (dest, 2, 0),
convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0), convert->dest_stride[2], FRAME_GET_LINE (src, 2, 0),
2 * convert->src_stride[2], FRAME_GET_LINE (src, 2, 1), 2 * convert->src_stride[2], FRAME_GET_LINE (src, 2, 1),
2 * convert->src_stride[2], (convert->width + 1) / 2, 2 * convert->src_stride[2], (convert->width + 1) / 2,
(convert->height + 1) / 2); convert->height / 2);
/* now handle last line */
if (convert->height & 1) {
getline_Y444 (convert, convert->tmpline, src, convert->height - 1);
putline_I420 (convert, dest, convert->tmpline, convert->height - 1);
}
} }
static void static void