Revision: 7277
http://playerstage.svn.sourceforge.net/playerstage/?rev=7277&view=rev
Author: thjc
Date: 2009-01-16 21:58:55 +0000 (Fri, 16 Jan 2009)
Log Message:
-----------
Merge of 7276 from 2-1:
Bugfix [2513331] no timestamp from "cameracompress" driver
also applies to camera uncompress
Modified Paths:
--------------
code/player/trunk/server/drivers/camera/compress/cameracompress.cc
code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
Property Changed:
----------------
code/player/trunk/
Property changes on: code/player/trunk
___________________________________________________________________
Modified: svn:mergeinfo
-
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263
/code/player/trunk:6985
+
/code/player/branches/release-2-1-patches:6672-6673,6738,6834,6886,6905,6930,6936,6946,6951,6955,6975,6979-6981,6985,6987-6996,7087-7088,7204,7226,7230,7248,7250-7252,7256,7262-7263,7276
/code/player/trunk:6985
Modified: code/player/trunk/server/drivers/camera/compress/cameracompress.cc
===================================================================
--- code/player/trunk/server/drivers/camera/compress/cameracompress.cc
2009-01-16 21:52:44 UTC (rev 7276)
+++ code/player/trunk/server/drivers/camera/compress/cameracompress.cc
2009-01-16 21:58:55 UTC (rev 7277)
@@ -201,6 +201,7 @@
{
assert(data);
player_camera_data_t * recv = reinterpret_cast<player_camera_data_t * >
(data);
+ camera_time = hdr->timestamp;
ProcessImage(*recv);
return 0;
}
Modified: code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
===================================================================
--- code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
2009-01-16 21:52:44 UTC (rev 7276)
+++ code/player/trunk/server/drivers/camera/compress/camerauncompress.cc
2009-01-16 21:58:55 UTC (rev 7277)
@@ -205,6 +205,7 @@
PLAYER_WARN("uncompressing raw camera images (not good)");
return -1;
}
+ camera_time = hdr->timestamp;
ProcessImage(*camera_data);
return 0;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
