diff options
| author | David Schleef <ds@schleef.org> | 2011-02-20 14:14:27 -0800 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2011-02-20 14:15:28 -0800 |
| commit | f64b66ab23a9ad021b5ba7c3de36391221a769ea (patch) | |
| tree | c5448b62188ebab9b626e69b8bcff08b2ad2fe9b /gst/colorspace | |
| parent | 6fcdba78a8995d4ebee17bfaf418a39f0083ba31 (diff) | |
colorspace: fix a few formats
Diffstat (limited to 'gst/colorspace')
| -rw-r--r-- | gst/colorspace/colorspace.c | 5 | ||||
| -rw-r--r-- | gst/colorspace/gstcolorspace.c | 2 | ||||
| -rw-r--r-- | gst/colorspace/gstcolorspaceorc.orc | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gst/colorspace/colorspace.c b/gst/colorspace/colorspace.c index b949fe28f..d98ad20d7 100644 --- a/gst/colorspace/colorspace.c +++ b/gst/colorspace/colorspace.c @@ -588,7 +588,8 @@ getline_Y41B (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, { cogorc_getline_YUV9 (dest, FRAME_GET_LINE (src, 0, j), - FRAME_GET_LINE (src, 1, j), FRAME_GET_LINE (src, 2, j), convert->width); + FRAME_GET_LINE (src, 1, j), FRAME_GET_LINE (src, 2, j), + convert->width / 2); } static void @@ -1053,7 +1054,7 @@ getline_YUV9 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, cogorc_getline_YUV9 (dest, FRAME_GET_LINE (src, 0, j), FRAME_GET_LINE (src, 1, j >> 2), - FRAME_GET_LINE (src, 2, j >> 2), convert->width); + FRAME_GET_LINE (src, 2, j >> 2), convert->width / 2); } static void diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index 350b6c23e..84c9af956 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -49,7 +49,7 @@ GST_DEBUG_CATEGORY (colorspace_performance); #define CSP_VIDEO_CAPS \ "video/x-raw-yuv, width = "GST_VIDEO_SIZE_RANGE" , " \ "height="GST_VIDEO_SIZE_RANGE",framerate="GST_VIDEO_FPS_RANGE"," \ - "format= (fourcc) { I420 , NV12 , NV21 , YV12 , YUY2 , Y42B , Y444 , YUV9 , YVU9 , Y41B , Y800 , Y8 , GREY , Y16 , UYVY , YVYU , IYU1 , v308 , AYUV, v210, A420, AY64 } ;" \ + "format= (fourcc) { I420 , NV12 , NV21 , YV12 , YUY2 , Y42B , Y444 , YUV9 , YVU9 , Y41B , Y800 , Y8 , GREY , Y16 , UYVY , YVYU , IYU1 , v308 , AYUV, v210, v216, A420, AY64 } ;" \ GST_VIDEO_CAPS_RGB";" \ GST_VIDEO_CAPS_BGR";" \ GST_VIDEO_CAPS_RGBx";" \ diff --git a/gst/colorspace/gstcolorspaceorc.orc b/gst/colorspace/gstcolorspaceorc.orc index 263992dd4..086990e15 100644 --- a/gst/colorspace/gstcolorspaceorc.orc +++ b/gst/colorspace/gstcolorspaceorc.orc @@ -1384,7 +1384,8 @@ x2 mergewl ayuv, ayay, uvuv .temp 4 ayay .temp 4 uvuv -x2 splitwb yy, uv, uyvy +x2 splitwb uv, yy, uyvy +swapw uv, uv x2 mergebw ayay, c255, yy mergewl uvuv, uv, uv x2 mergewl ayuv, ayay, uvuv |