From 3b6415b421ef4c673c563bdd83d2b5579b984cfc Mon Sep 17 00:00:00 2001 From: Haihao Xiang Date: Fri, 15 Mar 2019 13:06:53 +0800 Subject: [PATCH] video: add BGR10A2_LE pixel format This pixel format is a packed 4:4:4 RGB with alpha channel (B-G-R-A), R/G/B channel has 10 bits and alpha channel is the MSB 2 bits. --- gst-libs/gst/video/video-converter.c | 1 + gst-libs/gst/video/video-format.c | 73 +++++++++++++++++++++++++++++++++++- gst-libs/gst/video/video-format.h | 4 +- gst-libs/gst/video/video-info.c | 1 + 4 files changed, 76 insertions(+), 3 deletions(-) diff --git a/gst-libs/gst/video/video-converter.c b/gst-libs/gst/video/video-converter.c index f8775c5..22f81a4 100644 --- a/gst-libs/gst/video/video-converter.c +++ b/gst-libs/gst/video/video-converter.c @@ -5899,6 +5899,7 @@ get_scale_format (GstVideoFormat format, gint plane) case GST_VIDEO_FORMAT_NV12_10LE32: case GST_VIDEO_FORMAT_NV16_10LE32: case GST_VIDEO_FORMAT_NV12_10LE40: + case GST_VIDEO_FORMAT_BGR10A2_LE: res = format; g_assert_not_reached (); break; diff --git a/gst-libs/gst/video/video-format.c b/gst-libs/gst/video/video-format.c index 160b234..d1b8bd4 100644 --- a/gst-libs/gst/video/video-format.c +++ b/gst-libs/gst/video/video-format.c @@ -5278,6 +5278,66 @@ pack_VUYA (const GstVideoFormatInfo * info, GstVideoPackFlags flags, video_orc_pack_VUYA (d, s, width); } +#define PACK_BGR10A2_LE GST_VIDEO_FORMAT_ARGB64, unpack_bgr10a2_le, 1, pack_bgr10a2_le +static void +unpack_bgr10a2_le (const GstVideoFormatInfo * info, GstVideoPackFlags flags, + gpointer dest, const gpointer data[GST_VIDEO_MAX_PLANES], + const gint stride[GST_VIDEO_MAX_PLANES], gint x, gint y, gint width) +{ + int i; + const guint8 *restrict s = GET_LINE (y); + guint16 *restrict d = dest; + guint32 ARGB; + guint16 A, R, G, B; + + s += x * 4; + + for (i = 0; i < width; i++) { + ARGB = GST_READ_UINT32_LE (s + 4 * i); + + B = ((ARGB >> 0) & 0x3ff) << 6; + G = ((ARGB >> 10) & 0x3ff) << 6; + R = ((ARGB >> 20) & 0x3ff) << 6; + A = ((ARGB >> 30) & 0x03) << 14; + + if (!(flags & GST_VIDEO_PACK_FLAG_TRUNCATE_RANGE)) { + B |= (B >> 10); + G |= (G >> 10); + R |= (R >> 10); + A |= (A >> 10); + } + + d[4 * i + 0] = A; + d[4 * i + 1] = R; + d[4 * i + 2] = G; + d[4 * i + 3] = B; + } +} + +static void +pack_bgr10a2_le (const GstVideoFormatInfo * info, GstVideoPackFlags flags, + const gpointer src, gint sstride, gpointer data[GST_VIDEO_MAX_PLANES], + const gint stride[GST_VIDEO_MAX_PLANES], GstVideoChromaSite chroma_site, + gint y, gint width) +{ + int i; + guint32 *restrict d = GET_LINE (y); + const guint16 *restrict s = src; + guint32 ARGB; + guint16 A, R, G, B; + + for (i = 0; i < width; i++) { + A = s[4 * i] & 0xc000; + R = s[4 * i + 1] & 0xffc0; + G = s[4 * i + 2] & 0xffc0; + B = s[4 * i + 3] & 0xffc0; + + ARGB = (B >> 6) | (G << 4) | (R << 14) | (A << 16); + + GST_WRITE_UINT32_LE (d + i, ARGB); + } +} + typedef struct { guint32 fourcc; @@ -5607,6 +5667,9 @@ static const VideoFormat formats[] = { DPTH10_10_10_2, PSTR0, PLANE0, OFFS0, SUB4444, PACK_Y410), MAKE_YUVA_PACK_FORMAT (VUYA, "raw video", GST_MAKE_FOURCC ('V', 'U', 'Y', 'A'), DPTH8888, PSTR4444, PLANE0, OFFS2103, SUB4444, PACK_VUYA), + MAKE_RGBA_LE_PACK_FORMAT (BGR10A2_LE, "raw video", DPTH10_10_10_2, PSTR4444, + PLANE0, + OFFS0, SUB4444, PACK_BGR10A2_LE), }; static GstVideoFormat @@ -5725,7 +5788,8 @@ gst_video_format_from_masks (gint depth, gint bpp, gint endianness, GstVideoFormat format; /* our caps system handles 24/32bpp RGB as big-endian. */ - if ((bpp == 24 || bpp == 32) && endianness == G_LITTLE_ENDIAN) { + if ((bpp == 24 || bpp == 32) && endianness == G_LITTLE_ENDIAN && + alpha_mask != 0xc0000000) { red_mask = GUINT32_TO_BE (red_mask); green_mask = GUINT32_TO_BE (green_mask); blue_mask = GUINT32_TO_BE (blue_mask); @@ -5738,7 +5802,10 @@ gst_video_format_from_masks (gint depth, gint bpp, gint endianness, } } - if (depth == 30 && bpp == 32) { + if (depth == 32 && bpp == 32 && alpha_mask == 0xc0000000 && + endianness == G_LITTLE_ENDIAN) { + format = GST_VIDEO_FORMAT_BGR10A2_LE; + } else if (depth == 30 && bpp == 32) { format = GST_VIDEO_FORMAT_r210; } else if (depth == 24 && bpp == 32) { format = gst_video_format_from_rgb32_masks (red_mask, green_mask, @@ -5853,6 +5920,8 @@ gst_video_format_from_fourcc (guint32 fourcc) return GST_VIDEO_FORMAT_Y410; case GST_MAKE_FOURCC ('V', 'U', 'Y', 'A'): return GST_VIDEO_FORMAT_VUYA; + case GST_MAKE_FOURCC ('A', 'R', '3', '0'): + return GST_VIDEO_FORMAT_BGR10A2_LE; default: return GST_VIDEO_FORMAT_UNKNOWN; diff --git a/gst-libs/gst/video/video-format.h b/gst-libs/gst/video/video-format.h index bc392b6..5beb3b2 100644 --- a/gst-libs/gst/video/video-format.h +++ b/gst-libs/gst/video/video-format.h @@ -117,6 +117,7 @@ G_BEGIN_DECLS * @GST_VIDEO_FORMAT_Y210: packed 4:2:2 YUV, 10 bits per channel (Since: 1.16) * @GST_VIDEO_FORMAT_Y410: packed 4:4:4 YUV, 10 bits per channel(A-V-Y-U...) (Since: 1.16) * @GST_VIDEO_FORMAT_VUYA: packed 4:4:4 YUV with alpha channel (V0-U0-Y0-A0...) (Since: 1.16) + * @GST_VIDEO_FORMAT_BGR10A2_LE: packed 4:4:4 RGB with alpha channel(B-G-R-A), 10 bits for R/G/B channel and MSB 2 bits for alpha channel (Since: 1.16) * * Enum value describing the most common video formats. * @@ -209,6 +210,7 @@ typedef enum { GST_VIDEO_FORMAT_Y210, GST_VIDEO_FORMAT_Y410, GST_VIDEO_FORMAT_VUYA, + GST_VIDEO_FORMAT_BGR10A2_LE, } GstVideoFormat; #define GST_VIDEO_MAX_PLANES 4 @@ -558,7 +560,7 @@ gconstpointer gst_video_format_get_palette (GstVideoFormat format, gsi "AYUV64, r210, I420_10BE, I420_10LE, I422_10BE, I422_10LE, Y444_10BE, " \ "Y444_10LE, GBR, GBR_10BE, GBR_10LE, NV16, NV24, NV12_64Z32, A420_10BE, " \ "A420_10LE, A422_10BE, A422_10LE, A444_10BE, A444_10LE, NV61, P010_10BE, " \ - "P010_10LE, IYU2, VYUY, GBRA, GBRA_10BE, GBRA_10LE, GBR_12BE, GBR_12LE, " \ + "P010_10LE, IYU2, VYUY, GBRA, GBRA_10BE, GBRA_10LE, BGR10A2_LE, GBR_12BE, GBR_12LE, " \ "GBRA_12BE, GBRA_12LE, I420_12BE, I420_12LE, I422_12BE, I422_12LE, " \ "Y444_12BE, Y444_12LE, GRAY10_LE32, NV12_10LE32, NV16_10LE32, NV12_10LE40 }" diff --git a/gst-libs/gst/video/video-info.c b/gst-libs/gst/video/video-info.c index cc98cfc..033df01 100644 --- a/gst-libs/gst/video/video-info.c +++ b/gst-libs/gst/video/video-info.c @@ -783,6 +783,7 @@ fill_planes (GstVideoInfo * info) case GST_VIDEO_FORMAT_r210: case GST_VIDEO_FORMAT_Y410: case GST_VIDEO_FORMAT_VUYA: + case GST_VIDEO_FORMAT_BGR10A2_LE: info->stride[0] = width * 4; info->offset[0] = 0; info->size = info->stride[0] * height; -- 2.7.4