Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-20 00:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support per-stream resolution settings.

Browse Source 
The code now automatically resizes as required.

This change also disconnects camera resolution settings from MJPEG
stream connections; setting the camera resolution can now only be done
via code.
This commit is contained in:
Peter Johnson
2016-12-20 20:48:31 -08:00
parent 8501b7c9e2
commit 80abf6bf24
14 changed files with 727 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/SinkImpl.cpp
View File

@@ -81,17 +81,16 @@ void SinkImpl::SetSource(std::shared_ptr<SourceImpl> source) {
std::string SinkImpl::GetError() const {
std::lock_guard<std::mutex> lock(m_mutex);
if (!m_source) return "no source connected";
auto frame = m_source->GetCurFrame();
if (frame) return std::string{}; // no error
return llvm::StringRef{frame};
return m_source->GetCurFrame().GetError();
}
llvm::StringRef SinkImpl::GetError(llvm::SmallVectorImpl<char>& buf) const {
std::lock_guard<std::mutex> lock(m_mutex);
if (!m_source) return "no source connected";
auto frame = m_source->GetCurFrame();
if (frame) return llvm::StringRef{}; // no error
buf.append(frame.data(), frame.data() + frame.size());
// Make a copy as it's shared data
llvm::StringRef error = m_source->GetCurFrame().GetError();
buf.clear();
buf.append(error.data(), error.data() + error.size());
return llvm::StringRef{buf.data(), buf.size()};
}