Merge branch into develop

This commit is contained in:
John Zhao
2019-01-04 13:29:31 +08:00
2 changed files with 10 additions and 0 deletions

View File

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