Skip to content

Commit 4523916

Browse files
committed
WIP to stash
1 parent aa617c3 commit 4523916

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

src/mediapipe_internal/graphqueue.hpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,17 @@ namespace ovms {
4242
class OutputStreamObserverI;
4343
class NullOutputStreamObserver;
4444
struct GraphHelper {
45-
std::shared_ptr<::mediapipe::CalculatorGraph> graph; // TODO FIXME this does not have to be shared_ptr
45+
std::shared_ptr<::mediapipe::CalculatorGraph> graph; // TODO FIXME this does not have to be shared_ptr
4646
std::unordered_map<std::string, std::shared_ptr<OutputStreamObserverI>> outStreamObservers;
47-
::mediapipe::Timestamp currentTimestamp; // TODO FIXME const
47+
::mediapipe::Timestamp currentTimestamp; // TODO FIXME const
4848
// TODO FIXME move constr/=
4949
GraphHelper() = default;
5050
GraphHelper(const GraphHelper&) = delete;
5151
GraphHelper& operator=(const GraphHelper&) = delete;
52-
GraphHelper(GraphHelper&& gh) : graph(std::move(gh.graph)), outStreamObservers(std::move(gh.outStreamObservers)), currentTimestamp(gh.currentTimestamp) {}
52+
GraphHelper(GraphHelper&& gh) :
53+
graph(std::move(gh.graph)),
54+
outStreamObservers(std::move(gh.outStreamObservers)),
55+
currentTimestamp(gh.currentTimestamp) {}
5356
GraphHelper& operator=(GraphHelper&& gh) = default;
5457
};
5558
// we need to keep Graph alive during MP reload hence shared_ptr

src/mediapipe_internal/mediapipegraphexecutor.hpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ class MediapipeGraphExecutor {
144144
SPDLOG_DEBUG("Creating Mediapipe graph outputs name failed for: {}", name);
145145
return StatusCode::MEDIAPIPE_GRAPH_ADD_OUTPUT_STREAM_ERROR;
146146
}
147-
SPDLOG_ERROR("ER XXX Will construct observer for guard:{}, helper:{}, graph:{}", (void*)&this->guard,(void*)this->guard.gh.get(),(void*)&graph);
147+
SPDLOG_ERROR("ER XXX Will construct observer for guard:{}, helper:{}, graph:{}", (void*)&this->guard, (void*)this->guard.gh.get(), (void*)&graph);
148148
guard.gh->outStreamObservers[name] = std::make_shared<MyFunctor<RequestType, ResponseType>>(name, this->outputTypes.at(name), *this, *request, *response); // TODO use at() FIXME
149149
/*
150150
///////////////
@@ -189,7 +189,7 @@ class MediapipeGraphExecutor {
189189
this->pythonBackend,
190190
graph,
191191
this->guard.gh->currentTimestamp,
192-
// this->currentStreamTimestamp,
192+
// this->currentStreamTimestamp,
193193
numberOfPacketsCreated);
194194
SPDLOG_ERROR("Current Timestamp pushed:{}", this->guard.gh->currentTimestamp.Value());
195195
if (!ovms_status.ok()) {

0 commit comments

Comments
 (0)