Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-04 03:11:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix property handles (and allocate more bits to the property index).

Browse Source
This commit is contained in:
Peter Johnson
2016-09-19 22:03:47 -07:00
parent 6eba04ed8e
commit 80eb056432
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cameraserver_oo.cpp
View File

@@ -10,21 +10,23 @@
using namespace cs;
std::vector<VideoProperty> VideoSource::EnumerateProperties() const {
std::vector<VideoProperty> properties;
llvm::SmallVector<CS_Property, 32> handles;
llvm::SmallVector<CS_Property, 32> handles_buf;
CS_Status status = 0;
EnumerateSourceProperties(m_handle, handles, &status);
auto handles = EnumerateSourceProperties(m_handle, handles_buf, &status);
std::vector<VideoProperty> properties;
properties.reserve(handles.size());
for (int handle : handles)
for (CS_Property handle : handles)
properties.emplace_back(VideoProperty{handle});
return properties;
}
std::vector<VideoSource> VideoSource::EnumerateSources() {
std::vector<VideoSource> sources;
llvm::SmallVector<CS_Source, 16> handles;
llvm::SmallVector<CS_Source, 16> handles_buf;
CS_Status status = 0;
::cs::EnumerateSourceHandles(handles, &status);
auto handles = ::cs::EnumerateSourceHandles(handles_buf, &status);
std::vector<VideoSource> sources;
sources.reserve(handles.size());
for (int handle : handles)
sources.emplace_back(VideoSource{handle});
@@ -32,10 +34,11 @@ std::vector<VideoSource> VideoSource::EnumerateSources() {
}
std::vector<VideoSink> VideoSink::EnumerateSinks() {
std::vector<VideoSink> sinks;
llvm::SmallVector<CS_Sink, 16> handles;
llvm::SmallVector<CS_Sink, 16> handles_buf;
CS_Status status = 0;
::cs::EnumerateSinkHandles(handles, &status);
auto handles = ::cs::EnumerateSinkHandles(handles_buf, &status);
std::vector<VideoSink> sinks;
sinks.reserve(handles.size());
for (int handle : handles)
sinks.emplace_back(VideoSink{handle});