Ohmy, didnt anyone notice? this is horribly broken

Original commit message from CVS:
Ohmy, didnt anyone notice? this is horribly broken

diff --git a/sys/v4l/gstv4lmjpegsrc.c b/sys/v4l/gstv4lmjpegsrc.c
index 5ca9534..9cd4b4f 100644 (file)
--- a/sys/v4l/gstv4lmjpegsrc.c
+++ b/sys/v4l/gstv4lmjpegsrc.c
@@ -365,10 +365,10 @@ gst_v4lmjpegsrc_get (GstPad *pad)
     return NULL;
   GST_BUFFER_DATA(buf) = gst_v4lmjpegsrc_get_buffer(v4lmjpegsrc, num);
   if (!v4lmjpegsrc->first_timestamp)
-    v4lmjpegsrc->first_timestamp = v4lmjpegsrc->bsync.timestamp.tv_sec * 1000000 +
-      v4lmjpegsrc->bsync.timestamp.tv_usec;
-  GST_BUFFER_TIMESTAMP(buf) = v4lmjpegsrc->bsync.timestamp.tv_sec * 1000000 +
-    v4lmjpegsrc->bsync.timestamp.tv_usec - v4lmjpegsrc->first_timestamp;
+    v4lmjpegsrc->first_timestamp = v4lmjpegsrc->bsync.timestamp.tv_sec * GST_SECOND +
+      v4lmjpegsrc->bsync.timestamp.tv_usec * GST_SECOND/1000000;
+  GST_BUFFER_TIMESTAMP(buf) = v4lmjpegsrc->bsync.timestamp.tv_sec * GST_SECOND +
+    v4lmjpegsrc->bsync.timestamp.tv_usec - v4lmjpegsrc->first_timestamp * GST_SECOND/1000000;
 
   return buf;
 }

diff --git a/sys/v4l/gstv4lsrc.c b/sys/v4l/gstv4lsrc.c
index d3d9c0d..670e6ef 100644 (file)
--- a/sys/v4l/gstv4lsrc.c
+++ b/sys/v4l/gstv4lsrc.c
@@ -464,10 +464,10 @@ gst_v4lsrc_get (GstPad *pad)
   GST_BUFFER_SIZE(buf) = v4lsrc->buffer_size;
 
   if (!v4lsrc->first_timestamp)
-    v4lsrc->first_timestamp = v4lsrc->timestamp_soft_sync[num].tv_sec * 1000000 +
-      v4lsrc->timestamp_soft_sync[num].tv_usec;
-  GST_BUFFER_TIMESTAMP(buf) = v4lsrc->timestamp_soft_sync[num].tv_sec * 1000000 +
-    v4lsrc->timestamp_soft_sync[num].tv_usec - v4lsrc->first_timestamp;
+    v4lsrc->first_timestamp = v4lsrc->timestamp_soft_sync[num].tv_sec * GST_SECOND +
+      v4lsrc->timestamp_soft_sync[num].tv_usec * GST_SECOND/1000000;
+  GST_BUFFER_TIMESTAMP(buf) = v4lsrc->timestamp_soft_sync[num].tv_sec * GST_SECOND +
+    v4lsrc->timestamp_soft_sync[num].tv_usec - v4lsrc->first_timestamp * GST_SECOND/1000000;
 
   return buf;
 }