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

Optimize streams

Browse Source
This commit is contained in:
John Zhao 2018-05-31 23:41:32 +08:00
parent f447739488
commit 1da095f5c3
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/internal/streams.cc
View File

@ -197,26 +197,26 @@ std::size_t Streams::GetStreamDataMaxSize(const Stream &stream) const {
Streams::stream_datas_t Streams::GetStreamDatas(const Stream &stream) { Streams::stream_datas_t Streams::GetStreamDatas(const Stream &stream) {
std::unique_lock<std::mutex> lock(mtx_); std::unique_lock<std::mutex> lock(mtx_);
if (!HasStreamDatas(stream) || stream_datas_map_.at(stream).empty()) { if (!HasStreamDatas(stream)) {
LOG(WARNING) << "There are no stream datas of " << stream LOG(WARNING) << "There are no stream datas of " << stream
<< ". Did you call WaitForStreams() before this?"; << ". Did you call WaitForStreams() before this?";
return {}; return {};
} }
stream_datas_t datas = stream_datas_map_.at(stream); auto datas = stream_datas_map_.at(stream);
stream_datas_map_[stream].clear(); stream_datas_map_[stream].clear();
return datas; return datas;
} }
Streams::stream_data_t Streams::GetLatestStreamData(const Stream &stream) { Streams::stream_data_t Streams::GetLatestStreamData(const Stream &stream) {
std::unique_lock<std::mutex> lock(mtx_); std::unique_lock<std::mutex> lock(mtx_);
if (!HasStreamDatas(stream) || stream_datas_map_.at(stream).empty()) { if (!HasStreamDatas(stream)) {
LOG(WARNING) << "There are no stream datas of " << stream LOG(WARNING) << "There are no stream datas of " << stream
<< ". Did you call WaitForStreams() before this?"; << ". Did you call WaitForStreams() before this?";
return {}; return {};
} }
stream_datas_t datas = stream_datas_map_.at(stream); auto data = stream_datas_map_.at(stream).back();
stream_datas_map_[stream].clear(); stream_datas_map_[stream].clear();
return datas.back(); return data;
} }
const Streams::stream_datas_t &Streams::stream_datas(const Stream &stream) { const Streams::stream_datas_t &Streams::stream_datas(const Stream &stream) {
@ -247,7 +247,8 @@ const StreamRequest &Streams::GetStreamConfigRequest(
} }
bool Streams::HasStreamDatas(const Stream &stream) const { bool Streams::HasStreamDatas(const Stream &stream) const {
return stream_datas_map_.find(stream) != stream_datas_map_.end(); return stream_datas_map_.find(stream) != stream_datas_map_.end() &&
!stream_datas_map_.at(stream).empty();
} }
void Streams::AllocStreamData( void Streams::AllocStreamData(
@ -263,22 +264,27 @@ void Streams::AllocStreamData(
} else { } else {
data.img = nullptr; data.img = nullptr;
} }
data.frame = if (HasStreamDatas(stream)) {
std::make_shared<frame_t>(request.width, request.height, format, nullptr); // If cached equal to limits_max, drop the oldest one.
stream_datas_map_[stream].push_back(data); if (stream_datas_map_.at(stream).size() == GetStreamDataMaxSize(stream)) {
// If cached more then limits_max, drop the oldest one. auto &&datas = stream_datas_map_[stream];
if (stream_datas_map_.at(stream).size() > GetStreamDataMaxSize(stream)) { data.frame = datas.front().frame; // reuse this frame
auto &&datas = stream_datas_map_[stream]; datas.erase(datas.begin());
datas.erase(datas.begin()); VLOG(2) << "Stream data of " << stream << " is dropped as out of limits";
VLOG(2) << "Stream data of " << stream << " is dropped as out of limits"; }
} }
if (!data.frame) {
data.frame = std::make_shared<frame_t>(
request.width, request.height, format, nullptr);
}
stream_datas_map_[stream].push_back(data);
} }
void Streams::DiscardStreamData(const Stream &stream) { void Streams::DiscardStreamData(const Stream &stream) {
// Must discard after alloc, otherwise at will out of range when no this key. // Must discard after alloc, otherwise at will out of range when no this key.
if (stream_datas_map_.at(stream).size() > 0) { if (stream_datas_map_.at(stream).size() > 0) {
auto &&datas = stream_datas_map_[stream]; auto &&datas = stream_datas_map_[stream];
datas.erase(datas.end() - 1); datas.pop_back();
} else { } else {
VLOG(2) << "Stream data of " << stream << " is empty, could not discard"; VLOG(2) << "Stream data of " << stream << " is empty, could not discard";
} }
@ -288,8 +294,6 @@ bool Streams::HasKeyStreamDatas() const {
for (auto &&s : key_streams_) { for (auto &&s : key_streams_) {
if (!HasStreamDatas(s)) if (!HasStreamDatas(s))
return false; return false;
if (stream_datas_map_.at(s).empty())
return false;
} }
return true; return true;
} }