mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 18:21:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Mark Nauwelaerts 2011-11-24 11:04:10 +01:00 committed by Sebastian Dröge
parent 95138db216
commit 2c0b294005
1 changed files with 88 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
gst/videoconvert/videoconvert.c
View file

@ -1817,7 +1817,7 @@ convert_I420_YUY2 (VideoConvert * convert, GstVideoFrame * 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),
@ -1825,6 +1825,12 @@ convert_I420_YUY2 (VideoConvert * convert, GstVideoFrame * 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
@ -1833,7 +1839,7 @@ convert_I420_UYVY (VideoConvert * convert, GstVideoFrame * 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),
@ -1841,6 +1847,12 @@ convert_I420_UYVY (VideoConvert * convert, GstVideoFrame * 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
@ -1849,7 +1861,7 @@ convert_I420_AYUV (VideoConvert * convert, GstVideoFrame * 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),
@ -1857,6 +1869,12 @@ convert_I420_AYUV (VideoConvert * convert, GstVideoFrame * 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
@ -1889,23 +1907,31 @@ convert_I420_Y444 (VideoConvert * convert, GstVideoFrame * dest,
cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 1, 0), cogorc_planar_chroma_420_444 (FRAME_GET_LINE (dest, 1, 0),
2 * FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (dest, 1, 1), 2 * FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (dest, 1, 1),
2 * FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (src, 1, 0), 2 * FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (src, 1, 0),
FRAME_GET_STRIDE (src, 1), (convert->width + 1) / 2, FRAME_GET_STRIDE (src, 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 * FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (dest, 2, 1), 2 * FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (dest, 2, 1),
2 * FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 2, 0), 2 * FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 2, 0),
FRAME_GET_STRIDE (src, 2), (convert->width + 1) / 2, FRAME_GET_STRIDE (src, 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 (VideoConvert * convert, GstVideoFrame * dest, convert_YUY2_I420 (VideoConvert * convert, GstVideoFrame * dest,
const GstVideoFrame * src) const GstVideoFrame * 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),
@ -1913,6 +1939,12 @@ convert_YUY2_I420 (VideoConvert * convert, GstVideoFrame * 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
@ -1921,7 +1953,14 @@ convert_YUY2_AYUV (VideoConvert * convert, GstVideoFrame * dest,
{ {
cogorc_convert_YUY2_AYUV (FRAME_GET_LINE (dest, 0, 0), cogorc_convert_YUY2_AYUV (FRAME_GET_LINE (dest, 0, 0),
FRAME_GET_STRIDE (dest, 0), FRAME_GET_LINE (src, 0, 0), FRAME_GET_STRIDE (dest, 0), FRAME_GET_LINE (src, 0, 0),
FRAME_GET_STRIDE (src, 0), (convert->width + 1) / 2, convert->height); FRAME_GET_STRIDE (src, 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
@ -1953,7 +1992,7 @@ convert_UYVY_I420 (VideoConvert * convert, GstVideoFrame * 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),
@ -1961,6 +2000,12 @@ convert_UYVY_I420 (VideoConvert * convert, GstVideoFrame * 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
@ -1969,7 +2014,14 @@ convert_UYVY_AYUV (VideoConvert * convert, GstVideoFrame * dest,
{ {
cogorc_convert_UYVY_AYUV (FRAME_GET_LINE (dest, 0, 0), cogorc_convert_UYVY_AYUV (FRAME_GET_LINE (dest, 0, 0),
FRAME_GET_STRIDE (dest, 0), FRAME_GET_LINE (src, 0, 0), FRAME_GET_STRIDE (dest, 0), FRAME_GET_LINE (src, 0, 0),
FRAME_GET_STRIDE (src, 0), (convert->width + 1) / 2, convert->height); FRAME_GET_STRIDE (src, 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
@ -2042,7 +2094,14 @@ convert_AYUV_Y42B (VideoConvert * convert, GstVideoFrame * dest,
FRAME_GET_STRIDE (dest, 0), FRAME_GET_LINE (dest, 1, 0), FRAME_GET_STRIDE (dest, 0), FRAME_GET_LINE (dest, 1, 0),
FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (dest, 2, 0), FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (dest, 2, 0),
FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 0, 0), FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 0, 0),
FRAME_GET_STRIDE (src, 0), (convert->width + 1) / 2, convert->height); FRAME_GET_STRIDE (src, 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
@ -2068,13 +2127,19 @@ convert_Y42B_I420 (VideoConvert * convert, GstVideoFrame * dest,
FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (src, 1, 0), FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (src, 1, 0),
2 * FRAME_GET_STRIDE (src, 1), FRAME_GET_LINE (src, 1, 1), 2 * FRAME_GET_STRIDE (src, 1), FRAME_GET_LINE (src, 1, 1),
2 * FRAME_GET_STRIDE (src, 1), (convert->width + 1) / 2, 2 * FRAME_GET_STRIDE (src, 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),
FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 2, 0), FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 2, 0),
2 * FRAME_GET_STRIDE (src, 2), FRAME_GET_LINE (src, 2, 1), 2 * FRAME_GET_STRIDE (src, 2), FRAME_GET_LINE (src, 2, 1),
2 * FRAME_GET_STRIDE (src, 2), (convert->width + 1) / 2, 2 * FRAME_GET_STRIDE (src, 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
@ -2139,13 +2204,19 @@ convert_Y444_I420 (VideoConvert * convert, GstVideoFrame * dest,
FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (src, 1, 0), FRAME_GET_STRIDE (dest, 1), FRAME_GET_LINE (src, 1, 0),
2 * FRAME_GET_STRIDE (src, 1), FRAME_GET_LINE (src, 1, 1), 2 * FRAME_GET_STRIDE (src, 1), FRAME_GET_LINE (src, 1, 1),
2 * FRAME_GET_STRIDE (src, 1), (convert->width + 1) / 2, 2 * FRAME_GET_STRIDE (src, 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),
FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 2, 0), FRAME_GET_STRIDE (dest, 2), FRAME_GET_LINE (src, 2, 0),
2 * FRAME_GET_STRIDE (src, 2), FRAME_GET_LINE (src, 2, 1), 2 * FRAME_GET_STRIDE (src, 2), FRAME_GET_LINE (src, 2, 1),
2 * FRAME_GET_STRIDE (src, 2), (convert->width + 1) / 2, 2 * FRAME_GET_STRIDE (src, 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