tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge into develop

Browse Source
This commit is contained in:
John Zhao 2019-03-06 15:58:24 +08:00
commit 1f51ab8fa2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mynteye/api/processor.cc
View File

@ -152,6 +152,8 @@ bool Processor::Process(std::shared_ptr<Object> in) {
std::shared_ptr<Object> Processor::GetOutput() { std::shared_ptr<Object> Processor::GetOutput() {
std::lock_guard<std::mutex> lk(mtx_result_); std::lock_guard<std::mutex> lk(mtx_result_);
return std::shared_ptr<Object>(std::move(output_result_)); return std::shared_ptr<Object>(std::move(output_result_));
// to make sure that one frame can just be get once!
output_result_ = nullptr;
} }
std::uint64_t Processor::GetDroppedCount() { std::uint64_t Processor::GetDroppedCount() {
@ -209,7 +211,6 @@ void Processor::Run() {
} }
bool ok = false; bool ok = false;
try { try {
std::unique_lock<std::mutex> lk(mtx_data_process_unique_);
if (callback_) { if (callback_) {
if (callback_(input_.get(), output_.get(), parent_)) { if (callback_(input_.get(), output_.get(), parent_)) {
ok = true; ok = true;

1
src/mynteye/api/processor.h
View File

@ -103,7 +103,6 @@ class Processor :
bool input_ready_; bool input_ready_;
std::mutex mtx_input_ready_; std::mutex mtx_input_ready_;
std::mutex mtx_data_process_unique_;
std::condition_variable cond_input_ready_; std::condition_variable cond_input_ready_;
bool idle_; bool idle_;