Skip to content

Commit 7cef2d8

Browse files
committed
shared_ptr for RecordingStream
1 parent 5be07d7 commit 7cef2d8

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/FramePlayer.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace rerun_vrs {
3232
vrs::AutoDataLayoutEnd endLayout;
3333
};
3434

35-
RerunFramePlayer::RerunFramePlayer(vrs::StreamId id, rerun::RecordingStream& rec)
35+
RerunFramePlayer::RerunFramePlayer(vrs::StreamId id, std::shared_ptr<rerun::RecordingStream> rec)
3636
: id_{id}, rec_{rec}, entityPath_{add_quotes(id.getName())} {}
3737

3838
bool RerunFramePlayer::onDataLayoutRead(
@@ -45,12 +45,12 @@ namespace rerun_vrs {
4545
layout.printLayoutCompact(buffer);
4646
const auto& layout_str = buffer.str();
4747

48-
rec_.set_time_seconds("timestamp", record.timestamp);
48+
rec_->set_time_seconds("timestamp", record.timestamp);
4949

5050
if (record.recordType == vrs::Record::Type::CONFIGURATION) {
5151
// NOTE this is meta data from the sensor that doesn't change over time and only comes
5252
// in once in the beginning
53-
rec_.log_timeless(
53+
rec_->log_timeless(
5454
(entityPath_ + "/configuration").c_str(),
5555
rerun::TextDocument(layout_str)
5656
);
@@ -60,10 +60,10 @@ namespace rerun_vrs {
6060
auto& config = getExpectedLayout<FrameNumberDataLayout>(layout, blockIndex);
6161
uint64_t frame_number;
6262
if (config.frameNumber.get(frame_number))
63-
rec_.set_time_sequence("frame_number", frame_number);
63+
rec_->set_time_sequence("frame_number", frame_number);
6464

6565
// this is meta data per record and changes over time
66-
rec_.log((entityPath_ + "/data").c_str(), rerun::TextDocument(layout_str));
66+
rec_->log((entityPath_ + "/data").c_str(), rerun::TextDocument(layout_str));
6767
}
6868

6969
return true;
@@ -81,7 +81,7 @@ namespace rerun_vrs {
8181
// NOTE Rerun assumes row major ordering for Images (i.e., TensorData) without any stride.
8282
// Right now we don't check this properly, and just assume that there is no extra padding
8383
// per pixel and / or per row.
84-
rec_.log(
84+
rec_->log(
8585
add_quotes(id_.getName()).c_str(),
8686
rerun::Image(
8787
{frame->getHeight(),

src/FramePlayer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@ namespace rerun_vrs {
2828

2929
class RerunFramePlayer : public vrs::utils::VideoRecordFormatStreamPlayer {
3030
public:
31-
explicit RerunFramePlayer(vrs::StreamId id, rerun::RecordingStream& rec);
31+
explicit RerunFramePlayer(vrs::StreamId id, std::shared_ptr<rerun::RecordingStream> rec);
3232

3333
bool onDataLayoutRead(const vrs::CurrentRecord& r, size_t blockIndex, vrs::DataLayout&)
3434
override;
3535
bool onImageRead(const vrs::CurrentRecord& r, size_t blockIndex, const vrs::ContentBlock&)
3636
override;
3737

3838
private:
39-
rerun::RecordingStream& rec_;
39+
std::shared_ptr<rerun::RecordingStream> rec_;
4040
vrs::StreamId id_;
4141
std::string entityPath_;
4242
bool enabled_{true};

src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#include "FramePlayer.h"
1212

1313
int main(int argc, const char* argv[]) {
14-
auto rec = rerun::RecordingStream("rerun_example_vrs");
15-
rec.connect().throw_on_failure();
14+
auto rec = std::make_shared<rerun::RecordingStream>("rerun_example_vrs");
15+
rec->connect().throw_on_failure();
1616

1717
if (argc != 2) {
1818
std::cout << "Usage: ./log_vrs path/to/vrsfile.vrs" << std::endl;

0 commit comments

Comments
 (0)