Permalink
Browse files
Reinsert global timer use
- Loading branch information...
Showing
with
1 addition
and
2 deletions.
-
+1
−1
cvd/Linux/v4l1buffer.h
-
+0
−1
cvd_src/Linux/v4l2buffer.cc
|
@@ -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)
|
|
|
{
|
|
|
|
@@ -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;
|
|
|
0 comments on commit
ec41afe