Skip to content

Commit be68f3e

Browse files
committed
Set timestamp
1 parent be38081 commit be68f3e

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

src/FramePlayer.cpp

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
#include <vrs/IndexRecord.h>
2525

2626
namespace rerun_vrs {
27-
28-
using namespace std;
29-
3027
RerunFramePlayer::RerunFramePlayer(StreamId id, rerun::RecordingStream& rec)
3128
: id_{id}, rec_{rec} {}
3229

@@ -36,8 +33,10 @@ namespace rerun_vrs {
3633
if (!enabled_)
3734
return false;
3835

36+
rec_.set_time_seconds("timestamp", record.timestamp);
37+
3938
/* std::cout << "onDataLayoutRead " << std::endl; */
40-
ostringstream buffer;
39+
std::ostringstream buffer;
4140
layout.printLayoutCompact(buffer);
4241
/* std::cout << buffer.str() << std::endl; */
4342
// TODO write this information to a markdown file
@@ -60,7 +59,7 @@ namespace rerun_vrs {
6059
) {
6160
/* std::cout << "onImageRead" << std::endl; */
6261
const auto& spec = contentBlock.image();
63-
shared_ptr<PixelFrame> frame = getFrame(true);
62+
std::shared_ptr<PixelFrame> frame = getFrame(true);
6463
const auto& imageFormat = spec.getImageFormat();
6564
const auto& imageFormatStr = spec.getImageFormatAsString();
6665
bool frameValid = false;
@@ -154,11 +153,11 @@ namespace rerun_vrs {
154153
/* } */
155154
}
156155

157-
void RerunFramePlayer::convertFrame(shared_ptr<PixelFrame>& frame) {
156+
void RerunFramePlayer::convertFrame(std::shared_ptr<PixelFrame>& frame) {
158157
if (blankMode_) {
159158
makeBlankFrame(frame);
160159
} else {
161-
shared_ptr<PixelFrame> convertedFrame =
160+
std::shared_ptr<PixelFrame> convertedFrame =
162161
needsConvertedFrame_ ? getFrame(false) : nullptr;
163162
PixelFrame::normalizeFrame(frame, convertedFrame, false);
164163
needsConvertedFrame_ = (frame != convertedFrame); // for next time!
@@ -169,26 +168,28 @@ namespace rerun_vrs {
169168
}
170169
}
171170

172-
void RerunFramePlayer::makeBlankFrame(shared_ptr<PixelFrame>& frame) {
171+
void RerunFramePlayer::makeBlankFrame(std::shared_ptr<PixelFrame>& frame) {
173172
frame->init(vrs::PixelFormat::GREY8, frame->getWidth(), frame->getHeight());
174173
frame->blankFrame();
175174
}
176175

177-
shared_ptr<PixelFrame> RerunFramePlayer::getFrame(bool inputNotConvertedFrame) {
178-
vector<shared_ptr<PixelFrame>>& frames =
176+
std::shared_ptr<PixelFrame> RerunFramePlayer::getFrame(bool inputNotConvertedFrame) {
177+
std::vector<std::shared_ptr<PixelFrame>>& frames =
179178
inputNotConvertedFrame ? inputFrames_ : convertedframes_;
180179
if (frames.empty()) {
181180
return nullptr;
182181
}
183-
shared_ptr<PixelFrame> frame = std::move(frames.back());
182+
std::shared_ptr<PixelFrame> frame = std::move(frames.back());
184183
frames.pop_back();
185184
return frame;
186185
}
187186

188-
void RerunFramePlayer::recycle(shared_ptr<PixelFrame>& frame, bool inputNotConvertedFrame) {
187+
void RerunFramePlayer::recycle(
188+
std::shared_ptr<PixelFrame>& frame, bool inputNotConvertedFrame
189+
) {
189190
if (frame) {
190191
{
191-
vector<shared_ptr<PixelFrame>>& frames =
192+
std::vector<std::shared_ptr<PixelFrame>>& frames =
192193
inputNotConvertedFrame ? inputFrames_ : convertedframes_;
193194
if (frames.size() < 10) {
194195
frames.emplace_back(std::move(frame));
@@ -199,9 +200,9 @@ namespace rerun_vrs {
199200
}
200201

201202
void RerunFramePlayer::imageJobsThreadActivity() {
202-
unique_ptr<ImageJob> job;
203+
std::unique_ptr<ImageJob> job;
203204
while (imageJobs_.waitForJob(job)) {
204-
shared_ptr<PixelFrame> frame = std::move(job->frame);
205+
std::shared_ptr<PixelFrame> frame = std::move(job->frame);
205206
// if we're behind, we just drop images except the last one!
206207
while (imageJobs_.getJob(job)) {
207208
recycle(frame, true);
@@ -213,7 +214,7 @@ namespace rerun_vrs {
213214
frameValid = (frame != nullptr);
214215
} else {
215216
if (!frame) {
216-
frame = make_shared<PixelFrame>();
217+
frame = std::make_shared<PixelFrame>();
217218
}
218219
frameValid = frame->readCompressedFrame(job->buffer, job->imageFormat);
219220
}

0 commit comments

Comments
 (0)