Revision: 8968
http://playerstage.svn.sourceforge.net/playerstage/?rev=8968&view=rev
Author: jpgr87
Date: 2010-11-15 03:06:34 +0000 (Mon, 15 Nov 2010)
Log Message:
-----------
Changes to playercam: now supports MONO16 in addition ot MONO8 and RGB888
compression
Modified Paths:
--------------
code/player/trunk/utils/playercam/playercam.c
Modified: code/player/trunk/utils/playercam/playercam.c
===================================================================
--- code/player/trunk/utils/playercam/playercam.c 2010-11-13 13:38:43 UTC
(rev 8967)
+++ code/player/trunk/utils/playercam/playercam.c 2010-11-15 03:06:34 UTC
(rev 8968)
@@ -413,17 +413,20 @@
// Decompress the image
csize = g_camera->image_count;
playerc_camera_decompress(g_camera);
- usize = g_camera->image_count;
+ usize = g_camera->image_count;
+
g_print("camera: [w %d h %d d %d] [%d/%d bytes]\n",
g_camera->width, g_camera->height, g_camera->bpp, csize, usize);
g_width = g_camera->width;
g_height = g_camera->height;
- if (allocated_size != usize)
+
+ int buffsize = g_camera->width * g_camera->height * 3;
+ if (allocated_size != buffsize)
{
- g_img = realloc(g_img, usize);
- allocated_size = usize;
+ g_img = realloc(g_img, buffsize);
+ allocated_size = buffsize;
}
}
else // try the blobfinder
@@ -485,11 +488,11 @@
{
int j = 0;
// Transform to MONO8
- for (i = 0; i < g_camera->image_count; i++, j+=2)
+ for (i = 0; i < g_camera->image_count/2; i++, j+=2)
{
- g_img[i*3+1] = g_img[i*3+2] = g_img[i*3+3] =
- ((unsigned char)(g_camera->image[j]) << 8) +
- (unsigned char)(g_camera->image[j+1]);
+ g_img[i*3] = g_img[i*3+1] = g_img[i*3+2] =
+ ((unsigned char)(g_camera->image[j]));// << 8) +
+// (unsigned char)(g_camera->image[j+1]);
}
break;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
