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

[cscore] Add support for changing the USB camera path (#2547)

Browse Source
This commit is contained in:
Peter Johnson
2020-07-05 22:09:44 -07:00
committed by GitHub
parent 5b6f68cf72
commit b5a38001dd
13 changed files with 140 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cscore/src/main/native/windows/UsbCameraImpl.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2018-2019 FIRST. All Rights Reserved. */
/* Copyright (c) 2018-2020 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -78,12 +78,14 @@ class UsbCameraImpl : public SourceImpl,
void ProcessFrame(IMFSample* sample, const VideoMode& mode);
void PostRequestNewFrame();
std::string GetPath() { return m_path; }
void SetPath(const wpi::Twine& path, CS_Status* status);
std::string GetPath() const;
// Messages passed to/from camera thread
struct Message {
enum Kind {
kNone = 0,
kCmdSetPath,
kCmdSetMode,
kCmdSetPixelFormat,
kCmdSetResolution,
@@ -171,9 +173,6 @@ class UsbCameraImpl : public SourceImpl,
std::unique_ptr<cs::WindowsMessagePump> m_messagePump;
ComPtr<IMFMediaType> m_currentMode;
//
// Path never changes, so not protected by mutex.
//
std::string m_path;
std::wstring m_widePath;