Reinsert global timer use

edrosten · Jan 27, 2012 · ec41afe · ec41afe
1 parent 1e5aba8
commit ec41afe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cvd/Linux/v4l1buffer.h b/cvd/Linux/v4l1buffer.h
@@ -211,7 +211,7 @@ template <class T> class V4L1Buffer : public VideoBuffer<T>, public V4L1::RawV4L
     }
     virtual VideoFrame<T> * get_frame()
     {
-        return new V4L1Frame<T>(get_time_of_day(), (T *)RawV4L1::get_frame(), RawV4L1::get_size());
+        return new V4L1Frame<T>(timer.get_time(), (T *)RawV4L1::get_frame(), RawV4L1::get_size());
     }
     virtual void put_frame(VideoFrame<T>* f)
     {

diff --git a/cvd_src/Linux/v4l2buffer.cc b/cvd_src/Linux/v4l2buffer.cc
@@ -440,7 +440,6 @@ V4L2FrameT<unsigned char>* V4L2Buffer_Base::get_frame(){
 	break;
     }
   )
-  cvd_timer timer;
   frame=new V4L2FrameT<unsigned char>(timer.conv_ntime(buffer.timestamp),my_image_size,buffer.index,(unsigned char *)m_pvVideoBuffer[buffer.index], field);
 
   frame->m_buf = new struct v4l2_buffer;