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

Start adding support for non-MJPEG frame types.

Browse Source 
Not yet supported by MJPEGServer.
This commit is contained in:
Peter Johnson
2016-11-10 00:00:20 -08:00
parent 41dd9e4f06
commit 254b88bdbe
7 changed files with 64 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SourceImpl.cpp
View File

@@ -289,8 +289,8 @@ std::vector<VideoMode> SourceImpl::EnumerateVideoModes(
return m_videoModes;
}
void SourceImpl::PutFrame(VideoMode::PixelFormat pixelFormat,
llvm::StringRef data, Frame::Time time) {
void SourceImpl::PutFrame(VideoMode::PixelFormat pixelFormat, int width,
int height, llvm::StringRef data, Frame::Time time) {
std::size_t dataSize = data.size();
// If MJPEG, determine if we need to add DHT to it, and allocate enough space
@@ -343,6 +343,8 @@ done:
frameData->time = time;
frameData->size = dataSize;
frameData->pixelFormat = pixelFormat;
frameData->width = width;
frameData->height = height;
// Copy in image data
DEBUG4("Copying data to " << ((void*)frameData->data) << " from "