[Sumover-dev] [svn commit] r4723 - vic/branches/cc/video

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

Author: soohyunc
Date: Wed Mar 24 16:15:37 2010
New Revision: 4723

Modified:
   vic/branches/cc/video/grabber-macosx.cpp
   vic/branches/cc/video/grabber-still.cpp
   vic/branches/cc/video/grabber.h

Log:
-- generalise timing measurement variable names for the use of other grabber
   (integrated into the mother class, Grabber)



Modified: vic/branches/cc/video/grabber-macosx.cpp
==============================================================================
--- vic/branches/cc/video/grabber-macosx.cpp	(original)
+++ vic/branches/cc/video/grabber-macosx.cpp	Wed Mar 24 16:15:37 2010
@@ -114,13 +114,6 @@
     // Overridden functions.
     virtual int command(int argc, const char*const* argv);
 
-	inline double MacOSX_now() {
-		timeval tv;
-		::gettimeofday(&tv, NULL);
-		return ((double) tv.tv_sec + 1e-6 * (double) tv.tv_usec);
-	}
-	double MacOSX_ts_off_;
-	
 protected:
     // sequence grabber support requires a callback function
     static OSErr seqGrabberDataProc(SGChannel, Ptr, long, long *, long, TimeValue, short, long);
@@ -195,7 +188,7 @@
     useconfig_ = false;
 
 	// time measurement
-	MacOSX_ts_off_ = MacOSX_now();
+	grabber_ts_off_ = grabber_now();
 
      // allocate prezeroed nonrelocatable block of memory
 	sgDataProcRefCon = (SGDataProcRefCon *)NewPtrClear(sizeof(SGDataProcRefCon));
@@ -236,7 +229,7 @@
     if (!quicktime_) return;
 
 	// time measurement
-	target_->offset_ = MacOSX_ts_off_;
+	target_->offset_ = grabber_ts_off_;
 
 	format();
 	
@@ -260,7 +253,7 @@
 
 int MacOSXGrabber::grab() {
 	// time measurement------------------*
-	start_grab_ = MacOSX_now() - MacOSX_ts_off_;
+	start_grab_ = grabber_now() - grabber_ts_off_;
 	fprintf(stderr, "start_grab\tnow: %f\n", start_grab_);
 	//-----------------------------------*
 
@@ -275,7 +268,7 @@
     YuvFrame f(media_ts(), frame_, crvec_, outw_, outh_, format_);
 
 	// time measurement------------------*
-	end_grab_ = MacOSX_now() - MacOSX_ts_off_;
+	end_grab_ = grabber_now() - grabber_ts_off_;
     fprintf(stderr, "end_grab\tnow: %f\n", end_grab_);
     fprintf(stderr, "num: %f\tgrab_time: %f\n",
         end_grab_, end_grab_ - start_grab_);

Modified: vic/branches/cc/video/grabber-still.cpp
==============================================================================
--- vic/branches/cc/video/grabber-still.cpp	(original)
+++ vic/branches/cc/video/grabber-still.cpp	Wed Mar 24 16:15:37 2010
@@ -80,13 +80,6 @@
 	virtual ~StillYuvGrabber();
 	virtual int command(int argc, const char* const* argv);
 	
-	inline double stillYuv_now() {
-		timeval tv;
-		::gettimeofday(&tv, NULL);
-		return ((double) tv.tv_sec + 1e-6 * (double) tv.tv_usec);
-	}
-	double stillYuv_ts_off_;
-
 protected:
 	void start();
 	void stop();
@@ -323,7 +316,7 @@
 StillYuvGrabber::StillYuvGrabber() :
 	width_(0), height_(0), nbytes_(0)
 {
-	stillYuv_ts_off_ = stillYuv_now();
+	grabber_ts_off_ = grabber_now();
 }
 
 StillYuvGrabber::~StillYuvGrabber()
@@ -340,7 +333,7 @@
 
 void StillYuvGrabber::start()
 {
-	target_->offset_ = stillYuv_ts_off_;
+	target_->offset_ = grabber_ts_off_;
 	Grabber::start();
 }
 
@@ -374,7 +367,7 @@
 #endif
 
 	// time measurement
-	start_grab_ = stillYuv_now() - stillYuv_ts_off_;
+	start_grab_ = grabber_now() - grabber_ts_off_;
 	fprintf(stderr, "start_grab\tnow: %f\n", start_grab_);
 
     int frc=0; //SV-XXX: gcc4 warns for initialisation
@@ -403,7 +396,7 @@
 	YuvFrame f(media_ts(), (u_int8_t *) frame_, crvec_, outw_, outh_);
 
 	// time measurement
-	end_grab_ = stillYuv_now() - stillYuv_ts_off_;
+	end_grab_ = grabber_now() - grabber_ts_off_;
 	fprintf(stderr, "end_grab\tnow: %f\n", end_grab_);
 	fprintf(stderr, "num: %f\tgrab_time: %f\n",
 		end_grab_, end_grab_ - start_grab_);

Modified: vic/branches/cc/video/grabber.h
==============================================================================
--- vic/branches/cc/video/grabber.h	(original)
+++ vic/branches/cc/video/grabber.h	Wed Mar 24 16:15:37 2010
@@ -78,6 +78,12 @@
 	int background() const;
 
 	// time measurement
+	inline double grabber_now() {
+        timeval tv;
+        ::gettimeofday(&tv, NULL);
+        return ((double) tv.tv_sec + 1e-6 * (double) tv.tv_usec);
+	}
+	double grabber_ts_off_;
 	double start_grab_;
 	double end_grab_;