Revision: 6603
http://playerstage.svn.sourceforge.net/playerstage/?rev=6603&view=rev
Author: thjc
Date: 2008-06-16 18:01:49 -0700 (Mon, 16 Jun 2008)
Log Message:
-----------
applied multiple camera1394 fixes from 2-1 [6559,6560]
Modified Paths:
--------------
code/player/trunk/server/drivers/camera/1394/camera1394.cc
Modified: code/player/trunk/server/drivers/camera/1394/camera1394.cc
===================================================================
--- code/player/trunk/server/drivers/camera/1394/camera1394.cc 2008-06-17
00:59:23 UTC (rev 6602)
+++ code/player/trunk/server/drivers/camera/1394/camera1394.cc 2008-06-17
01:01:49 UTC (rev 6603)
@@ -273,9 +273,15 @@
#define DC1394_ISO_SPEED_100 SPEED_100
#define DC1394_ISO_SPEED_200 SPEED_200
#define DC1394_ISO_SPEED_400 SPEED_400
+#ifdef SPEED_800
#define DC1394_ISO_SPEED_800 SPEED_800
+#endif
+#ifdef SPEED_1600
#define DC1394_ISO_SPEED_1600 SPEED_1600
+#endif
+#ifdef SPEED_3200
#define DC1394_ISO_SPEED_3200 SPEED_3200
+#endif
#endif
@@ -660,15 +666,25 @@
case 400:
this->iso_speed = DC1394_ISO_SPEED_400;
break;
+#ifdef DC1394_ISO_SPEED_800
case 800:
this->iso_speed = DC1394_ISO_SPEED_800;
break;
+#endif
+#ifdef DC1394_ISO_SPEED_1600
case 1600:
this->iso_speed = DC1394_ISO_SPEED_1600;
break;
+#endif
+#ifdef DC1394_ISO_SPEED_3200
case 3200:
this->iso_speed = DC1394_ISO_SPEED_3200;
break;
+#endif
+ default:
+ PLAYER_ERROR("Unsupported iso_speed");
+ this->SetError(-1);
+ return;
}
return;
@@ -1186,7 +1202,7 @@
unsigned int frame_height;
uint8_t * capture_buffer;
#if LIBDC1394_VERSION == 0200
- frameTime = frame->timestamp/1.e-6;
+ frameTime = frame->timestamp*1.e-6;
frame_width = frame->size[0];
frame_height = frame->size[1];
capture_buffer = reinterpret_cast<uint8_t *>(frame->image);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
