yair/gst-plugin-linescan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

matroxsrc: add support for Bayer, including option to treat as gray or demosaic

Browse Source
This commit is contained in:
Joshua M. Doe 2017-05-16 10:18:52 -04:00
parent 5b46c95699
commit 23f67133f7
2 changed files with 150 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

186
sys/matrox/gstmatroxsrc.c
View File

@ -64,6 +64,22 @@ static GstCaps *gst_matroxsrc_create_caps (GstMatroxSrc * src);
static MIL_INT MFTYPE static MIL_INT MFTYPE
gst_matroxsrc_callback (MIL_INT HookType, MIL_ID EventId, void *UserDataPtr); gst_matroxsrc_callback (MIL_INT HookType, MIL_ID EventId, void *UserDataPtr);
#define VIDEO_CAPS_MAKE_BAYER8(format) \
"video/x-bayer, " \
"format = (string) " format ", " \
"width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " GST_VIDEO_FPS_RANGE
#define VIDEO_CAPS_MAKE_BAYER16(format) \
"video/x-bayer, " \
"format = (string) " format ", " \
"endianness = (int) 1234, " \
"bpp = (int) {16, 14, 12, 10}, " \
"width = " GST_VIDEO_SIZE_RANGE ", " \
"height = " GST_VIDEO_SIZE_RANGE ", " \
"framerate = " GST_VIDEO_FPS_RANGE
enum enum
{ {
PROP_0, PROP_0,
@ -72,7 +88,8 @@ enum
PROP_CHANNEL, PROP_CHANNEL,
PROP_FORMAT, PROP_FORMAT,
PROP_NUM_CAPTURE_BUFFERS, PROP_NUM_CAPTURE_BUFFERS,
PROP_TIMEOUT PROP_TIMEOUT,
PROP_BAYER_MODE
}; };
#define DEFAULT_PROP_DEVICE "M_SYSTEM_DEFAULT" #define DEFAULT_PROP_DEVICE "M_SYSTEM_DEFAULT"
@ -81,6 +98,28 @@ enum
#define DEFAULT_PROP_FORMAT "M_DEFAULT" #define DEFAULT_PROP_FORMAT "M_DEFAULT"
#define DEFAULT_PROP_NUM_CAPTURE_BUFFERS 2 #define DEFAULT_PROP_NUM_CAPTURE_BUFFERS 2
#define DEFAULT_PROP_TIMEOUT 1000 #define DEFAULT_PROP_TIMEOUT 1000
#define DEFAULT_PROP_BAYER_MODE GST_MATROX_BAYER_MODE_BAYER
#define GST_TYPE_MATROX_BAYER_MODE (gst_matrox_bayer_mode_get_type())
static GType
gst_matrox_bayer_mode_get_type (void)
{
static GType matrox_bayer_mode_type = 0;
static const GEnumValue matrox_bayer_mode[] = {
{GST_MATROX_BAYER_MODE_BAYER, "bayer", "Get raw bayer"},
{GST_MATROX_BAYER_MODE_GRAY, "gray", "Get raw bayer as grayscale"},
{GST_MATROX_BAYER_MODE_RGB, "rgb", "Get demosaiced RGB"},
{0, NULL, NULL},
};
if (!matrox_bayer_mode_type) {
matrox_bayer_mode_type =
g_enum_register_static ("GstMatroxBayerMode", matrox_bayer_mode);
}
return matrox_bayer_mode_type;
}
/* pad templates */ /* pad templates */
@ -89,7 +128,10 @@ GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE
("{ GRAY8, GRAY16_LE, GRAY16_BE, BGRA }")) ("{ GRAY8, GRAY16_LE, GRAY16_BE, BGRA }") ";"
VIDEO_CAPS_MAKE_BAYER8 ("{ bggr, grbg, rggb, gbrg }") ";"
VIDEO_CAPS_MAKE_BAYER16 ("{ bggr, grbg, rggb, gbrg }")
)
); );
/* class initialization */ /* class initialization */
@ -156,6 +198,12 @@ gst_matroxsrc_class_init (GstMatroxSrcClass * klass)
g_param_spec_int ("timeout", "Timeout (ms)", g_param_spec_int ("timeout", "Timeout (ms)",
"Timeout in ms (0 to use default)", 0, G_MAXINT, DEFAULT_PROP_TIMEOUT, "Timeout in ms (0 to use default)", 0, G_MAXINT, DEFAULT_PROP_TIMEOUT,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE)); G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, PROP_BAYER_MODE,
g_param_spec_enum ("bayer-mode", "Bayer mode",
"Pull Bayer frames as raw bayer, grayscale, or demosaiced RGB",
GST_TYPE_MATROX_BAYER_MODE, DEFAULT_PROP_BAYER_MODE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE |
GST_PARAM_MUTABLE_READY));
} }
static void static void
@ -164,6 +212,9 @@ gst_matroxsrc_reset (GstMatroxSrc * src)
gint i; gint i;
src->acq_started = FALSE; src->acq_started = FALSE;
src->height = 0;
src->gst_stride = 0;
if (src->caps) { if (src->caps) {
gst_caps_unref (src->caps); gst_caps_unref (src->caps);
src->caps = NULL; src->caps = NULL;
@ -216,6 +267,7 @@ gst_matroxsrc_init (GstMatroxSrc * src)
src->format = g_strdup (DEFAULT_PROP_FORMAT); src->format = g_strdup (DEFAULT_PROP_FORMAT);
src->num_capture_buffers = DEFAULT_PROP_NUM_CAPTURE_BUFFERS; src->num_capture_buffers = DEFAULT_PROP_NUM_CAPTURE_BUFFERS;
src->timeout = DEFAULT_PROP_TIMEOUT; src->timeout = DEFAULT_PROP_TIMEOUT;
src->bayer_mode = DEFAULT_PROP_BAYER_MODE;
g_mutex_init (&src->mutex); g_mutex_init (&src->mutex);
g_cond_init (&src->cond); g_cond_init (&src->cond);
@ -266,6 +318,9 @@ gst_matroxsrc_set_property (GObject * object, guint property_id,
case PROP_TIMEOUT: case PROP_TIMEOUT:
src->timeout = g_value_get_int (value); src->timeout = g_value_get_int (value);
break; break;
case PROP_BAYER_MODE:
src->bayer_mode = g_value_get_enum (value);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -300,6 +355,9 @@ gst_matroxsrc_get_property (GObject * object, guint property_id,
case PROP_TIMEOUT: case PROP_TIMEOUT:
g_value_set_int (value, src->timeout); g_value_set_int (value, src->timeout);
break; break;
case PROP_BAYER_MODE:
g_value_set_enum (value, src->bayer_mode);
break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break; break;
@ -349,6 +407,10 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
gint height; gint height;
gint bpp; gint bpp;
gint n_bands; gint n_bands;
gint source_format;
gint bayer_pattern;
gchar bayer_pattern_format[5];
gint is_bayer_conversion;
GstVideoInfo vinfo; GstVideoInfo vinfo;
GST_DEBUG_OBJECT (src, "start"); GST_DEBUG_OBJECT (src, "start");
@ -387,11 +449,43 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
} }
/* get format info and create caps */ /* get format info and create caps */
bayer_pattern = MdigInquire (src->MilDigitizer, M_BAYER_PATTERN, M_NULL);
is_bayer_conversion =
MdigInquire (src->MilDigitizer, M_BAYER_CONVERSION, M_NULL);
if (bayer_pattern != M_NULL) {
if (src->bayer_mode == GST_MATROX_BAYER_MODE_RGB) {
MdigControl (src->MilDigitizer, M_BAYER_CONVERSION, M_ENABLE);
} else {
MdigControl (src->MilDigitizer, M_BAYER_CONVERSION, M_DISABLE);
}
switch (bayer_pattern) {
case M_BAYER_BG:
g_strlcpy (bayer_pattern_format, "bggr", 5);
break;
case M_BAYER_GB:
g_strlcpy (bayer_pattern_format, "gbrg", 5);
break;
case M_BAYER_GR:
g_strlcpy (bayer_pattern_format, "grbg", 5);
break;
case M_BAYER_RG:
g_strlcpy (bayer_pattern_format, "rggb", 5);
break;
default:
g_assert_not_reached ();
}
}
width = MdigInquire (src->MilDigitizer, M_SIZE_X, M_NULL); width = MdigInquire (src->MilDigitizer, M_SIZE_X, M_NULL);
height = MdigInquire (src->MilDigitizer, M_SIZE_Y, M_NULL); height = MdigInquire (src->MilDigitizer, M_SIZE_Y, M_NULL);
bpp = MdigInquire (src->MilDigitizer, M_SIZE_BIT, M_NULL); bpp = MdigInquire (src->MilDigitizer, M_SIZE_BIT, M_NULL);
n_bands = MdigInquire (src->MilDigitizer, M_SIZE_BAND, M_NULL); n_bands = MdigInquire (src->MilDigitizer, M_SIZE_BAND, M_NULL);
src->color_mode = MdigInquire (src->MilDigitizer, M_COLOR_MODE, M_NULL); src->mil_type = MdigInquire (src->MilDigitizer, M_TYPE, M_NULL);
/* only valid for GigE Vision and USB3 Vision */
source_format =
MdigInquire (src->MilDigitizer, M_SOURCE_DATA_FORMAT, M_PACKED);
gst_video_info_init (&vinfo); gst_video_info_init (&vinfo);
@ -400,20 +494,34 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
src->caps = NULL; src->caps = NULL;
} }
if (src->color_mode == M_MONOCHROME) { /* bayer is described as 3 bands even before demosaic */
g_assert (n_bands == 1); if (n_bands == 1) {
if (bpp == 8) { if (bpp == 8) {
src->video_format = GST_VIDEO_FORMAT_GRAY8; src->video_format = GST_VIDEO_FORMAT_GRAY8;
if (bayer_pattern != M_NULL
&& src->bayer_mode == GST_MATROX_BAYER_MODE_BAYER) {
src->caps =
gst_caps_new_simple ("video/x-bayer", "format", G_TYPE_STRING,
bayer_pattern_format, "width", G_TYPE_INT, width, "height",
G_TYPE_INT, height, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
G_MAXINT, 1, NULL);
}
} else if (bpp > 8 && bpp <= 16) { } else if (bpp > 8 && bpp <= 16) {
src->video_format = GST_VIDEO_FORMAT_GRAY16_LE;
if (bayer_pattern != M_NULL
&& src->bayer_mode == GST_MATROX_BAYER_MODE_BAYER) {
src->caps =
gst_caps_new_simple ("video/x-bayer", "format", G_TYPE_STRING,
bayer_pattern_format, "bpp", G_TYPE_INT, bpp, "endianness",
G_TYPE_INT, G_LITTLE_ENDIAN, "width", G_TYPE_INT, width, "height",
G_TYPE_INT, height, "framerate", GST_TYPE_FRACTION_RANGE, 0, 1,
G_MAXINT, 1, NULL);
} else {
GValue val = G_VALUE_INIT; GValue val = G_VALUE_INIT;
GstStructure *s; GstStructure *s;
if (G_BYTE_ORDER == G_LITTLE_ENDIAN) {
src->video_format = GST_VIDEO_FORMAT_GRAY16_LE; src->video_format = GST_VIDEO_FORMAT_GRAY16_LE;
} else if (G_BYTE_ORDER == G_BIG_ENDIAN) {
src->video_format = GST_VIDEO_FORMAT_GRAY16_BE;
}
gst_video_info_set_format (&vinfo, src->video_format, width, height); gst_video_info_set_format (&vinfo, src->video_format, width, height);
src->caps = gst_video_info_to_caps (&vinfo); src->caps = gst_video_info_to_caps (&vinfo);
@ -423,55 +531,40 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
g_value_set_int (&val, bpp); g_value_set_int (&val, bpp);
gst_structure_set_value (s, "bpp", &val); gst_structure_set_value (s, "bpp", &val);
g_value_unset (&val); g_value_unset (&val);
}
} else { } else {
GST_ELEMENT_ERROR (src, STREAM, WRONG_TYPE, GST_ELEMENT_ERROR (src, STREAM, WRONG_TYPE,
("Unknown or unsupported bit depth (%d).", bpp), (NULL)); ("Unknown or unsupported bit depth (%d).", bpp), (NULL));
return FALSE; return FALSE;
} }
} else if (src->color_mode == M_BGR24) { } else if (n_bands == 3) {
g_assert (n_bands == 3); /* TODO: handle non-Solios color formats */
src->video_format = GST_VIDEO_FORMAT_BGR;
} else if (src->color_mode == M_BGR32) {
g_assert (n_bands == 3);
src->video_format = GST_VIDEO_FORMAT_BGRx; src->video_format = GST_VIDEO_FORMAT_BGRx;
} else if (src->color_mode == M_RGB) {
g_assert (n_bands == 3);
src->video_format = GST_VIDEO_FORMAT_RGB;
} /*else if (color_mode == M_YUV) {
g_assert (n_bands == 3);
src = GST_VIDEO_FORMAT_YUY2;
} */
else {
GST_WARNING_OBJECT (src,
"Color mode %d not directly supported, will try converting to BGRx",
src->color_mode);
src->video_format = GST_VIDEO_FORMAT_BGRx;
src->color_mode = M_BGR32;
n_bands = 3;
bpp = 8;
} }
/* note that we abuse formats with Bayer */
gst_video_info_set_format (&vinfo, src->video_format, width, height);
vinfo.finfo = gst_video_format_get_info (src->video_format);
if (!src->caps) { if (!src->caps) {
gst_video_info_set_format (&vinfo, src->video_format, width, height);
vinfo.finfo = gst_video_format_get_info (src->video_format);
src->caps = gst_video_info_to_caps (&vinfo); src->caps = gst_video_info_to_caps (&vinfo);
} }
src->height = vinfo.height;
src->height = height;
src->gst_stride = GST_VIDEO_INFO_COMP_STRIDE (&vinfo, 0); src->gst_stride = GST_VIDEO_INFO_COMP_STRIDE (&vinfo, 0);
g_assert (src->MilGrabBufferList == NULL); g_assert (src->MilGrabBufferList == NULL);
src->MilGrabBufferList = g_new (MIL_ID, src->num_capture_buffers); src->MilGrabBufferList = g_new (MIL_ID, src->num_capture_buffers);
for (i = 0; i < src->num_capture_buffers; i++) { for (i = 0; i < src->num_capture_buffers; i++) {
if (src->color_mode == M_MONOCHROME) { if (n_bands == 1) {
MbufAlloc2d (src->MilSystem, width, height, bpp, MbufAlloc2d (src->MilSystem, width, height, src->mil_type,
M_IMAGE + M_GRAB + M_PROC, &src->MilGrabBufferList[i]); M_IMAGE + M_GRAB + M_PROC, &src->MilGrabBufferList[i]);
} else { } else {
MbufAllocColor (src->MilSystem, MbufAllocColor (src->MilSystem,
n_bands, n_bands,
width, width,
height, height,
bpp, M_IMAGE + M_GRAB + M_PROC + M_PACKED, src->mil_type, M_IMAGE + M_GRAB + M_PROC + M_PACKED + M_BGR32,
&src->MilGrabBufferList[i]); &src->MilGrabBufferList[i]);
} }
@ -536,24 +629,10 @@ static gboolean
gst_matroxsrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps) gst_matroxsrc_set_caps (GstBaseSrc * bsrc, GstCaps * caps)
{ {
GstMatroxSrc *src = GST_MATROX_SRC (bsrc); GstMatroxSrc *src = GST_MATROX_SRC (bsrc);
GstVideoInfo vinfo;
GstStructure *s = gst_caps_get_structure (caps, 0);
GST_DEBUG_OBJECT (src, "The caps being set are %" GST_PTR_FORMAT, caps); GST_DEBUG_OBJECT (src, "The caps being set are %" GST_PTR_FORMAT, caps);
gst_video_info_from_caps (&vinfo, caps);
if (GST_VIDEO_INFO_FORMAT (&vinfo) != GST_VIDEO_FORMAT_UNKNOWN) {
src->gst_stride = GST_VIDEO_INFO_COMP_STRIDE (&vinfo, 0);
} else {
goto unsupported_caps;
}
return TRUE; return TRUE;
unsupported_caps:
GST_ERROR_OBJECT (src, "Unsupported caps: %" GST_PTR_FORMAT, caps);
return FALSE;
} }
static gboolean static gboolean
@ -604,8 +683,7 @@ gst_matroxsrc_create_buffer_from_id (GstMatroxSrc * src, MIL_ID buffer_id)
MbufGet (buffer_id, minfo.data); MbufGet (buffer_id, minfo.data);
} else { } else {
/* TODO: add support for planar color and YUV */ /* TODO: add support for planar color and YUV */
MbufGetColor (buffer_id, M_PACKED | src->color_mode, M_ALL_BANDS, MbufGetColor (buffer_id, M_PACKED | M_BGR32, M_ALL_BANDS, minfo.data);
minfo.data);
} }
gst_buffer_unmap (buf, &minfo); gst_buffer_unmap (buf, &minfo);

11
sys/matrox/gstmatroxsrc.h
View File

@ -35,6 +35,12 @@ G_BEGIN_DECLS
typedef struct _GstMatroxSrc GstMatroxSrc; typedef struct _GstMatroxSrc GstMatroxSrc;
typedef struct _GstMatroxSrcClass GstMatroxSrcClass; typedef struct _GstMatroxSrcClass GstMatroxSrcClass;
typedef enum {
GST_MATROX_BAYER_MODE_BAYER,
GST_MATROX_BAYER_MODE_GRAY,
GST_MATROX_BAYER_MODE_RGB
} GstMatroxBayerModeEnum;
struct _GstMatroxSrc struct _GstMatroxSrc
{ {
GstPushSrc base_matroxsrc; GstPushSrc base_matroxsrc;
@ -54,16 +60,15 @@ struct _GstMatroxSrc
gchar *format; gchar *format;
guint num_capture_buffers; guint num_capture_buffers;
gint timeout; gint timeout;
GstMatroxBayerModeEnum bayer_mode;
GstBuffer *buffer; GstBuffer *buffer;
GstClockTime acq_start_time; GstClockTime acq_start_time;
GstCaps *caps; GstCaps *caps;
gint width;
gint height; gint height;
gint bpp;
gint gst_stride; gint gst_stride;
MIL_INT color_mode; MIL_INT mil_type;
GstVideoFormat video_format; GstVideoFormat video_format;
GMutex mutex; GMutex mutex;