[Sumover-dev] [svn commit] r3926 - vic/branches/mpeg4/codec

[sumover-dev at cs.ucl.ac.uk]

Author: barz
Date: Fri Nov 10 19:21:30 2006
New Revision: 3926

Modified:
   vic/branches/mpeg4/codec/encoder-h264.cpp

Log:
change ftime() to gettimeofday() since Apple depreciated ftime.

Modified: vic/branches/mpeg4/codec/encoder-h264.cpp
==============================================================================
--- vic/branches/mpeg4/codec/encoder-h264.cpp	(original)
+++ vic/branches/mpeg4/codec/encoder-h264.cpp	Fri Nov 10 19:21:30 2006
@@ -4,7 +4,7 @@
 #include <math.h>
 #include <errno.h>
 #include <assert.h>
-#include <sys/timeb.h>
+#include <sys/time.h>
 #include "inet.h"
 #include "net.h"
 #include "rtp.h"
@@ -44,7 +44,7 @@
     x264Encoder *enc;
     DataBuffer *fIn;
     DataBuffer *fOut;
-    timeb timeStamp;
+    timeval timeStamp;
     time_t prevTime;
     unsigned short prevTimeMS;
 
@@ -152,17 +152,17 @@
 	enc->setGOP(gop);
 	frame_size = vf->width_ * vf->height_;
 	//fptr = fopen("out.m4v", "w");
-	ftime(&timeStamp);
-	prevTime = timeStamp.time;
-	prevTimeMS = timeStamp.millitm;
+	gettimeofday(&timeStamp, NULL);
+	prevTime = timeStamp.tv_sec;
+	prevTimeMS = timeStamp.tv_sec;
     }
 
     //Encode
-    ftime(&timeStamp);
+    gettimeofday(&timeStamp, NULL);
     int ms =
-	(timeStamp.time - prevTime) * 1000 + timeStamp.millitm - prevTimeMS;
-    prevTime = timeStamp.time;
-    prevTimeMS = timeStamp.millitm;
+	(timeStamp.tv_sec - prevTime) * 1000 + timeStamp.tv_usec - prevTimeMS;
+    prevTime = timeStamp.tv_sec;
+    prevTimeMS = timeStamp.tv_usec;
     //printf("ms:%d\n", ms);
     frame_size = vf->width_ * vf->height_;
     char *data = fIn->getData();