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

matroxsrc: fix colorized output with a monochrome source

Browse Source
This commit is contained in:
Joshua M. Doe 2017-05-09 14:54:53 -04:00
parent 0aa17031c3
commit 55e2881006
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/matrox/gstmatroxsrc.c
View File

@ -393,8 +393,6 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
src->color_mode = MdigInquire (src->MilDigitizer, M_COLOR_MODE, M_NULL); src->color_mode = MdigInquire (src->MilDigitizer, M_COLOR_MODE, M_NULL);
gst_video_info_init (&vinfo); gst_video_info_init (&vinfo);
vinfo.width = width;
vinfo.height = height;
if (src->caps) { if (src->caps) {
gst_caps_unref (src->caps); gst_caps_unref (src->caps);
@ -414,7 +412,8 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
} else if (G_BYTE_ORDER == G_BIG_ENDIAN) { } else if (G_BYTE_ORDER == G_BIG_ENDIAN) {
src->video_format = GST_VIDEO_FORMAT_GRAY16_BE; src->video_format = GST_VIDEO_FORMAT_GRAY16_BE;
} }
vinfo.finfo = gst_video_format_get_info (src->video_format);
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);
/* set bpp, extra info for GRAY16 so elements can scale properly */ /* set bpp, extra info for GRAY16 so elements can scale properly */
@ -452,6 +451,8 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
} }
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); 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);
} }
@ -463,11 +464,17 @@ gst_matroxsrc_start (GstBaseSrc * bsrc)
} }
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++) {
MbufAllocColor (src->MilSystem, if (src->color_mode == M_MONOCHROME) {
n_bands, MbufAlloc2d (src->MilSystem, width, height, bpp,
width, M_IMAGE + M_GRAB + M_PROC, &src->MilGrabBufferList[i]);
height, } else {
bpp, M_IMAGE + M_GRAB + M_PROC + M_PACKED, &src->MilGrabBufferList[i]); MbufAllocColor (src->MilSystem,
n_bands,
width,
height,
bpp, M_IMAGE + M_GRAB + M_PROC + M_PACKED,
&src->MilGrabBufferList[i]);
}
if (src->MilGrabBufferList[i]) { if (src->MilGrabBufferList[i]) {
MbufClear (src->MilGrabBufferList[i], 0xFF); MbufClear (src->MilGrabBufferList[i], 0xFF);