diff --git a/sys/pixci/gstpixcisrc.c b/sys/pixci/gstpixcisrc.c
index de27deb..44eb6f5 100644
--- a/sys/pixci/gstpixcisrc.c
+++ b/sys/pixci/gstpixcisrc.c
@@ -80,16 +80,10 @@ enum
/* pad templates */
static GstStaticPadTemplate gst_pixcisrc_src_template =
- GST_STATIC_PAD_TEMPLATE ("src",
+GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE
- ("{ GRAY8, GRAY16_LE, GRAY16_BE, RGB, xRGB, RGB_15, RGB_16 }") ";"
- "video/x-bayer,format=(string){bggr,grbg,gbrg,rggb},"
- "width=(int)[1,MAX],height=(int)[1,MAX],framerate=(fraction)[0/1,MAX];"
- "video/x-bayer,format=(string){bggr16,grbg16,gbrg16,rggb16},"
- "bpp=(int){10,12,14,16},endianness={1234,4321},"
- "width=(int)[1,MAX],height=(int)[1,MAX],framerate=(fraction)[0/1,MAX]")
+ GST_STATIC_CAPS (GST_VIDEO_CAPS_MAKE ("{ GRAY8, GRAY16_LE, GRAY16_BE }"))
);
/* class initialization */
@@ -622,7 +616,8 @@ gst_pixcisrc_create (GstPushSrc * psrc, GstBuffer ** buf)
GST_LOG_OBJECT (src,
"GstBuffer size=%d, gst_stride=%d, phx_stride=%d", minfo.size,
src->gst_stride, src->px_stride);
- pxd_readuchar (src->unitmap, buffer, 0, 0, -1, -1, minfo.data, minfo.size,
+ /* TODO: must use readuchar for 8-bit buffers */
+ pxd_readushort (src->unitmap, buffer, 0, 0, -1, -1, minfo.data, minfo.size,
"Grey");
//for (i = 0; i < src->height; i++) {
// memcpy (minfo.data + i * src->gst_stride,
diff --git a/vs2010/gst-plugins-vision.sln b/vs2010/gst-plugins-vision.sln
index 6172b77..81052f1 100644
--- a/vs2010/gst-plugins-vision.sln
+++ b/vs2010/gst-plugins-vision.sln
@@ -65,7 +65,7 @@ Global
{6D883DC5-A8E1-4A42-B247-CBBD243DE1C1}.Debug|x64.ActiveCfg = Debug|Win32
{6D883DC5-A8E1-4A42-B247-CBBD243DE1C1}.Release|Win32.ActiveCfg = Release|Win32
{6D883DC5-A8E1-4A42-B247-CBBD243DE1C1}.Release|Win32.Build.0 = Release|Win32
- {6D883DC5-A8E1-4A42-B247-CBBD243DE1C1}.Release|x64.ActiveCfg = Release|Win32
+ {6D883DC5-A8E1-4A42-B247-CBBD243DE1C1}.Release|x64.ActiveCfg = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/vs2010/pixci/pixci.props b/vs2010/pixci/pixci.props
index eed204c..f47327e 100644
--- a/vs2010/pixci/pixci.props
+++ b/vs2010/pixci/pixci.props
@@ -6,11 +6,14 @@
- C:\Program Files (x86)\EPIX\XCLIB;%(AdditionalIncludeDirectories)
+ C:\Program Files (x86)\EPIX\XCLIB;%(AdditionalIncludeDirectories)
+ C:\Program Files\EPIX\XCLIB;%(AdditionalIncludeDirectories)
- C:\Program Files (x86)\EPIX\XCLIB;%(AdditionalLibraryDirectories)
- XCLIBWNT.lib;%(AdditionalDependencies)
+ C:\Program Files (x86)\EPIX\XCLIB;%(AdditionalLibraryDirectories)
+ C:\Program Files\EPIX\XCLIB;%(AdditionalLibraryDirectories)
+ XCLIBWNT.lib;%(AdditionalDependencies)
+ XCLIBW64.lib;%(AdditionalDependencies)
diff --git a/vs2010/pixci/pixci.vcxproj b/vs2010/pixci/pixci.vcxproj
index 830a985..17ab6b2 100644
--- a/vs2010/pixci/pixci.vcxproj
+++ b/vs2010/pixci/pixci.vcxproj
@@ -5,10 +5,18 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{6D883DC5-A8E1-4A42-B247-CBBD243DE1C1}
@@ -20,23 +28,44 @@
true
MultiByte
+
+ Application
+ true
+ MultiByte
+
DynamicLibrary
false
true
MultiByte
+
+ DynamicLibrary
+ false
+ true
+ MultiByte
+
-
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -52,6 +81,17 @@
true
+
+
+ Level3
+ Disabled
+ HAVE_CONFIG_H;_MBCS;%(PreprocessorDefinitions)
+ $(SolutionDir)\..\;C:\Program Files\EPIX\XCLIB;%(AdditionalIncludeDirectories)
+
+
+ true
+
+
Level3
@@ -67,6 +107,21 @@
true
+
+
+ Level3
+ MaxSpeed
+ true
+ true
+ HAVE_CONFIG_H;_MBCS;%(PreprocessorDefinitions)
+ $(SolutionDir)\..\;C:\Program Files\EPIX\XCLIB;%(AdditionalIncludeDirectories)
+
+
+ true
+ true
+ true
+
+