Update of /cvsroot/playerstage/code/player/server/drivers/camera/compress
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11860/server/drivers/camera/compress
Modified Files:
Tag: b_thjc_dynamic_arrays
.cvsignore cameracompress.cc camerauncompress.cc
Log Message:
dynamic array changes to drivers compile, still needs testing
added lots more .cvsignore settings for eclipse
Index: .cvsignore
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/compress/.cvsignore,v
retrieving revision 1.1.14.1
retrieving revision 1.1.14.2
diff -C2 -d -r1.1.14.1 -r1.1.14.2
*** .cvsignore 10 Oct 2007 09:26:06 -0000 1.1.14.1
--- .cvsignore 19 Oct 2007 21:58:58 -0000 1.1.14.2
***************
*** 6,7 ****
--- 6,8 ----
*.lo
*.a
+ *.loT
Index: cameracompress.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/compress/cameracompress.cc,v
retrieving revision 1.16.2.1
retrieving revision 1.16.2.2
diff -C2 -d -r1.16.2.1 -r1.16.2.2
*** cameracompress.cc 10 Oct 2007 09:26:06 -0000 1.16.2.1
--- cameracompress.cc 19 Oct 2007 21:58:58 -0000 1.16.2.2
***************
*** 114,118 ****
// scratch for converted data camera data
! char converted[PLAYER_CAMERA_IMAGE_SIZE];
// Output (compressed) camera data
--- 114,118 ----
// scratch for converted data camera data
! char *converted;
// Output (compressed) camera data
***************
*** 235,248 ****
void CameraCompress::ProcessImage(player_camera_data_t & rawdata)
{
- size_t size;
char filename[256];
char * ptr, * ptr1;
int i, l;
!
switch (rawdata.bpp)
{
case 8:
l = (rawdata.width) * (rawdata.height);
! ptr = this->converted;
ptr1 = (char *)(rawdata.image);
for (i = 0; i < l; i++)
--- 235,248 ----
void CameraCompress::ProcessImage(player_camera_data_t & rawdata)
{
char filename[256];
char * ptr, * ptr1;
int i, l;
! char * buffer = NULL;
!
switch (rawdata.bpp)
{
case 8:
l = (rawdata.width) * (rawdata.height);
! ptr = buffer = new char[(rawdata.width) * (rawdata.height)*3];
ptr1 = (char *)(rawdata.image);
for (i = 0; i < l; i++)
***************
*** 253,257 ****
ptr += 3; ptr1++;
}
! ptr = this->converted;
break;
case 24:
--- 253,257 ----
ptr += 3; ptr1++;
}
! ptr = buffer;
break;
case 24:
***************
*** 260,264 ****
case 32:
l = (rawdata.width) * (rawdata.height);
! ptr = this->converted;
ptr1 = (char *)(rawdata.image);
for (i = 0; i < l; i++)
--- 260,264 ----
case 32:
l = (rawdata.width) * (rawdata.height);
! ptr = buffer = new char[(rawdata.width) * (rawdata.height)*3];
ptr1 = (char *)(rawdata.image);
for (i = 0; i < l; i++)
***************
*** 269,273 ****
ptr += 3; ptr1 += 4;
}
! ptr = this->converted;
break;
default:
--- 269,273 ----
ptr += 3; ptr1 += 4;
}
! ptr = buffer;
break;
default:
***************
*** 280,285 ****
rawdata.width,
rawdata.height,
! PLAYER_CAMERA_IMAGE_SIZE,
(int)(this->quality*100));
if (this->save)
--- 280,286 ----
rawdata.width,
rawdata.height,
! rawdata.width*rawdata.width*3,
(int)(this->quality*100));
+ delete [] buffer;
if (this->save)
***************
*** 296,303 ****
this->data.format = PLAYER_CAMERA_FORMAT_RGB888;
this->data.compression = PLAYER_CAMERA_COMPRESS_JPEG;
delete [] this->data.image;
this->data.image = NULL;
-
- Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE, (void*)
&this->data, &this->camera_time);
}
--- 297,304 ----
this->data.format = PLAYER_CAMERA_FORMAT_RGB888;
this->data.compression = PLAYER_CAMERA_COMPRESS_JPEG;
+
+ Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE, (void*)
&this->data,0, &this->camera_time);
delete [] this->data.image;
this->data.image = NULL;
}
Index: camerauncompress.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/compress/camerauncompress.cc,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -C2 -d -r1.4.2.1 -r1.4.2.2
*** camerauncompress.cc 10 Oct 2007 09:26:06 -0000 1.4.2.1
--- camerauncompress.cc 19 Oct 2007 21:58:58 -0000 1.4.2.2
***************
*** 116,122 ****
bool NewCamData;
- // Acquired camera data
- char converted[PLAYER_CAMERA_IMAGE_SIZE];
-
// Output (uncompressed) camera data
private: player_camera_data_t data;
--- 116,119 ----
***************
*** 249,255 ****
jpeg_decompress( (unsigned char*)this->data.image,
! PLAYER_CAMERA_IMAGE_SIZE,
! compdata.image,
! compdata.image_count);
--- 246,252 ----
jpeg_decompress( (unsigned char*)this->data.image,
! this->data.image_count,
! compdata.image,
! compdata.image_count);
***************
*** 262,266 ****
}
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE, (void*)
&this->data, &this->camera_time);
delete [] this->data.image;
this->data.image = NULL;
--- 259,263 ----
}
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE, (void*)
&this->data, 0, &this->camera_time);
delete [] this->data.image;
this->data.image = NULL;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
