diff options
| -rw-r--r-- | gst/colorspace/colorspace.c | 58 | ||||
| -rw-r--r-- | gst/colorspace/gstcolorspace.c | 1 |
2 files changed, 57 insertions, 2 deletions
diff --git a/gst/colorspace/colorspace.c b/gst/colorspace/colorspace.c index 98a8f827c..a20f5e26d 100644 --- a/gst/colorspace/colorspace.c +++ b/gst/colorspace/colorspace.c @@ -595,6 +595,60 @@ putline_BGR16 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, } static void +getline_RGB15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, + int j) +{ + int i; + const guint16 *srcline = (const guint16 *) FRAME_GET_LINE (src, 0, j); + for (i = 0; i < convert->width; i++) { + dest[i * 4 + 0] = 0xff; + dest[i * 4 + 1] = ((srcline[i] >> 10) & 0x1f) << 3; + dest[i * 4 + 2] = ((srcline[i] >> 5) & 0x1f) << 3; + dest[i * 4 + 3] = ((srcline[i]) & 0x1f) << 3; + } +} + +static void +putline_RGB15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, + int j) +{ + int i; + guint16 *destline = (guint16 *) FRAME_GET_LINE (dest, 0, j); + for (i = 0; i < convert->width; i++) { + destline[i] = + ((src[i * 4 + 1] >> 3) << 10) | ((src[i * 4 + + 2] >> 3) << 5) | (src[i * 4 + 3] >> 3); + } +} + +static void +getline_BGR15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, + int j) +{ + int i; + const guint16 *srcline = (const guint16 *) FRAME_GET_LINE (src, 0, j); + for (i = 0; i < convert->width; i++) { + dest[i * 4 + 0] = 0xff; + dest[i * 4 + 3] = ((srcline[i] >> 10) & 0x1f) << 3; + dest[i * 4 + 2] = ((srcline[i] >> 5) & 0x1f) << 3; + dest[i * 4 + 1] = ((srcline[i]) & 0x1f) << 3; + } +} + +static void +putline_BGR15 (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, + int j) +{ + int i; + guint16 *destline = (guint16 *) FRAME_GET_LINE (dest, 0, j); + for (i = 0; i < convert->width; i++) { + destline[i] = + ((src[i * 4 + 3] >> 3) << 10) | ((src[i * 4 + + 2] >> 3) << 5) | (src[i * 4 + 1] >> 3); + } +} + +static void getline_BGRA (ColorspaceConvert * convert, guint8 * dest, const guint8 * src, int j) { @@ -836,8 +890,8 @@ static const ColorspaceLine lines[] = { {GST_VIDEO_FORMAT_Y16, getline_Y16, putline_Y16}, {GST_VIDEO_FORMAT_RGB16, getline_RGB16, putline_RGB16}, {GST_VIDEO_FORMAT_BGR16, getline_BGR16, putline_BGR16}, - //{GST_VIDEO_FORMAT_RGB15, getline_RGB15, putline_RGB15}, - //{GST_VIDEO_FORMAT_BGR15, getline_BGR15, putline_BGR15}, + {GST_VIDEO_FORMAT_RGB15, getline_RGB15, putline_RGB15}, + {GST_VIDEO_FORMAT_BGR15, getline_BGR15, putline_BGR15}, {GST_VIDEO_FORMAT_UYVP, getline_UYVP, putline_UYVP}, {GST_VIDEO_FORMAT_A420, getline_A420, putline_A420} }; diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index a4e9493d5..dd2e03da0 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -61,6 +61,7 @@ GST_DEBUG_CATEGORY (colorspace_performance); GST_VIDEO_CAPS_RGB_16";" \ GST_VIDEO_CAPS_BGR_16";" \ GST_VIDEO_CAPS_RGB_15";" \ + GST_VIDEO_CAPS_BGR_15";" \ "video/x-raw-rgb, bpp = (int)8, depth = (int)8, " \ "width = "GST_VIDEO_SIZE_RANGE" , " \ "height = " GST_VIDEO_SIZE_RANGE ", " \ |