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

SourceImpl: Refactor frame allocation into AllocFrame.

Browse Source
This commit is contained in:
Peter Johnson
2016-11-12 01:58:59 -08:00
parent 5ae1162378
commit 7e0e8286eb
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/SourceImpl.cpp
View File

@@ -251,8 +251,9 @@ std::vector<VideoMode> SourceImpl::EnumerateVideoModes(
return m_videoModes;
}
void SourceImpl::PutFrame(VideoMode::PixelFormat pixelFormat, int width,
int height, llvm::StringRef data, Frame::Time time) {
std::unique_ptr<Frame::Data> SourceImpl::AllocFrame(
VideoMode::PixelFormat pixelFormat, int width, int height, std::size_t size,
Frame::Time time) {
std::unique_ptr<Frame::Data> frameData;
{
std::lock_guard<std::mutex> lock{m_poolMutex};
@@ -260,7 +261,7 @@ void SourceImpl::PutFrame(VideoMode::PixelFormat pixelFormat, int width,
int found = -1;
for (std::size_t i = 0; i < m_framesAvail.size(); ++i) {
// is it big enough?
if (m_framesAvail[i] && m_framesAvail[i]->capacity >= data.size()) {
if (m_framesAvail[i] && m_framesAvail[i]->capacity >= size) {
// is it smaller than the last found?
if (found < 0 ||
m_framesAvail[i]->capacity < m_framesAvail[found]->capacity) {
@@ -272,7 +273,7 @@ void SourceImpl::PutFrame(VideoMode::PixelFormat pixelFormat, int width,
// if nothing found, allocate a new buffer
if (found < 0)
frameData.reset(new Frame::Data{data.size()});
frameData.reset(new Frame::Data{size});
else
frameData = std::move(m_framesAvail[found]);
}
@@ -280,11 +281,19 @@ void SourceImpl::PutFrame(VideoMode::PixelFormat pixelFormat, int width,
// Initialize frame data
frameData->refcount = 0;
frameData->time = time;
frameData->size = data.size();
frameData->size = size;
frameData->pixelFormat = pixelFormat;
frameData->width = width;
frameData->height = height;
return frameData;
}
void SourceImpl::PutFrame(VideoMode::PixelFormat pixelFormat, int width,
int height, llvm::StringRef data, Frame::Time time) {
std::unique_ptr<Frame::Data> frameData =
AllocFrame(pixelFormat, width, height, data.size(), time);
// Copy in image data
DEBUG4("Copying data to " << ((void*)frameData->data) << " from "
<< ((void*)data.data()) << " (" << data.size()