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

Merge branch into develop

Browse Source
This commit is contained in:
John Zhao 2019-01-04 13:29:31 +08:00
commit d505b3b647
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mynteye/device/device.h
View File

@ -265,6 +265,12 @@ class MYNTEYE_API Device {
* Get the latest data of stream. * Get the latest data of stream.
*/ */
device::StreamData GetStreamData(const Stream &stream); device::StreamData GetStreamData(const Stream &stream);
/**
* @deprecated Replaced by GetStreamData(const Stream &stream)
*/
device::StreamData GetLatestStreamData(const Stream &stream);
/** /**
* Get the datas of stream. * Get the datas of stream.
* @note default cache 4 datas at most. * @note default cache 4 datas at most.

4
src/mynteye/device/device.cc
View File

@ -454,6 +454,10 @@ device::StreamData Device::GetStreamData(const Stream &stream) {
return streams_->GetLatestStreamData(stream); return streams_->GetLatestStreamData(stream);
} }
device::StreamData Device::GetLatestStreamData(const Stream &stream) {
GetStreamData(stream);
}
std::vector<device::StreamData> Device::GetStreamDatas(const Stream &stream) { std::vector<device::StreamData> Device::GetStreamDatas(const Stream &stream) {
CHECK(video_streaming_); CHECK(video_streaming_);
CHECK_NOTNULL(streams_); CHECK_NOTNULL(streams_);