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

24
src/CvSourceImpl.cpp
View File

@@ -24,18 +24,11 @@ CvSourceImpl::CvSourceImpl(llvm::StringRef name, const VideoMode& mode)
: SourceImpl{name} {
m_mode = mode;
m_videoModes.push_back(m_mode);
// Create jpeg quality property
m_compressionParams.push_back(CV_IMWRITE_JPEG_QUALITY);
m_compressionParams.push_back(80);
}
CvSourceImpl::~CvSourceImpl() {}
void CvSourceImpl::Start() {
m_qualityProperty =
CreateProperty("jpeg_quality", CS_PROP_INTEGER, 0, 100, 1, 80, 80);
}
void CvSourceImpl::Start() {}
bool CvSourceImpl::CacheProperties(CS_Status* status) const {
// Doesn't need to do anything.
@@ -93,17 +86,10 @@ void CvSourceImpl::NumSinksEnabledChanged() {
}
void CvSourceImpl::PutFrame(cv::Mat& image) {
std::unique_lock<std::mutex> lock(m_mutex);
if (auto prop = GetProperty(m_qualityProperty)) {
if (prop->value >= 0 && prop->value <= 100)
m_compressionParams[1] = prop->value;
}
cv::imencode(".jpg", image, m_jpegBuf, m_compressionParams);
SourceImpl::PutFrame(
VideoMode::kMJPEG, image.cols, image.rows,
llvm::StringRef(reinterpret_cast<const char*>(m_jpegBuf.data()),
m_jpegBuf.size()),
wpi::Now());
auto dest = AllocImage(VideoMode::kBGR, image.cols, image.rows,
image.total() * image.elemSize());
image.copyTo(dest->AsMat());
SourceImpl::PutFrame(std::move(dest), wpi::Now());
}
void CvSourceImpl::NotifyError(llvm::StringRef msg) {