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

HttpUtil has moved to wpiutil; use it. (#92)

Browse Source
This commit is contained in:
Peter Johnson
2017-08-25 18:10:47 -07:00
committed by GitHub
parent 06636a0e1c
commit 3c88f94b43
7 changed files with 36 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/native/cpp/HttpCameraImpl.h
View File

@@ -19,9 +19,9 @@
#include <llvm/SmallString.h>
#include <llvm/StringMap.h>
#include <support/HttpUtil.h>
#include <support/raw_istream.h>
#include "HttpUtil.h"
#include "SourceImpl.h"
#include "cscore_cpp.h"
@@ -100,13 +100,14 @@ class HttpCameraImpl : public SourceImpl {
void StreamThreadMain();
// Functions used by StreamThreadMain()
HttpConnection* DeviceStreamConnect(llvm::SmallVectorImpl<char>& boundary);
wpi::HttpConnection* DeviceStreamConnect(
llvm::SmallVectorImpl<char>& boundary);
void DeviceStream(wpi::raw_istream& is, llvm::StringRef boundary);
bool DeviceStreamFrame(wpi::raw_istream& is, std::string& imageBuf);
// The camera settings thread
void SettingsThreadMain();
void DeviceSendSettings(HttpRequest& req);
void DeviceSendSettings(wpi::HttpRequest& req);
std::atomic_bool m_connected{false};
std::atomic_bool m_active{true}; // set to false to terminate thread
@@ -118,12 +119,12 @@ class HttpCameraImpl : public SourceImpl {
//
// The camera connections
std::unique_ptr<HttpConnection> m_streamConn;
std::unique_ptr<HttpConnection> m_settingsConn;
std::unique_ptr<wpi::HttpConnection> m_streamConn;
std::unique_ptr<wpi::HttpConnection> m_settingsConn;
CS_HttpCameraKind m_kind;
std::vector<HttpLocation> m_locations;
std::vector<wpi::HttpLocation> m_locations;
size_t m_nextLocation{0};
int m_prefLocation{-1}; // preferred location