PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: Remove dead code after switch to FrameBuffer

Browse Source 
Delete all dead code after switching to the FrameBuffer interface.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund
2019-12-18 17:38:38 +01:00
parent 66d4929c73
commit 164fbf17ff
5 changed files with 2 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/libcamera/buffer.h
-61
View File
@@ -7,7 +7,6 @@
#ifndef __LIBCAMERA_BUFFER_H__
#define __LIBCAMERA_BUFFER_H__
#include <array>
#include <stdint.h>
#include <vector>
@@ -16,7 +15,6 @@
namespace libcamera {
class Request;
class Stream;
struct FrameMetadata {
enum Status {
@@ -71,65 +69,6 @@ private:
unsigned int cookie_;
};
class BufferMemory final
{
public:
const std::vector<FrameBuffer::Plane> &planes() const { return planes_; }
std::vector<FrameBuffer::Plane> &planes() { return planes_; }
private:
std::vector<FrameBuffer::Plane> planes_;
};
class BufferPool final
{
public:
~BufferPool();
void createBuffers(unsigned int count);
void destroyBuffers();
unsigned int count() const { return buffers_.size(); }
std::vector<BufferMemory> &buffers() { return buffers_; }
private:
std::vector<BufferMemory> buffers_;
};
class Buffer final
{
public:
Buffer(unsigned int index = -1, const Buffer *metadata = nullptr);
Buffer(const Buffer &) = delete;
Buffer &operator=(const Buffer &) = delete;
unsigned int index() const { return index_; }
const std::array<int, 3> &dmabufs() const { return dmabuf_; }
BufferMemory *mem() { return mem_; }
const FrameMetadata &metadata() const { return metadata_; };
Request *request() const { return request_; }
Stream *stream() const { return stream_; }
private:
friend class Camera;
friend class Request;
friend class Stream;
friend class V4L2VideoDevice;
void cancel();
unsigned int index_;
std::array<int, 3> dmabuf_;
BufferMemory *mem_;
FrameMetadata metadata_;
Request *request_;
Stream *stream_;
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_BUFFER_H__ */
include/libcamera/stream.h
-23
View File
@@ -36,11 +36,6 @@ private:
std::map<PixelFormat, std::vector<SizeRange>> formats_;
};
enum MemoryType {
InternalMemory,
ExternalMemory,
};
struct StreamConfiguration {
StreamConfiguration();
StreamConfiguration(const StreamFormats &formats);
@@ -48,7 +43,6 @@ struct StreamConfiguration {
PixelFormat pixelFormat;
Size size;
MemoryType memoryType;
unsigned int bufferCount;
Stream *stream() const { return stream_; }
@@ -75,29 +69,12 @@ class Stream
public:
Stream();
std::unique_ptr<Buffer> createBuffer(unsigned int index);
std::unique_ptr<Buffer> createBuffer(const std::array<int, 3> &fds);
BufferPool &bufferPool() { return bufferPool_; }
std::vector<BufferMemory> &buffers() { return bufferPool_.buffers(); }
const StreamConfiguration &configuration() const { return configuration_; }
MemoryType memoryType() const { return memoryType_; }
protected:
friend class Camera;
int mapBuffer(const Buffer *buffer);
void unmapBuffer(const Buffer *buffer);
void createBuffers(MemoryType memory, unsigned int count);
void destroyBuffers();
BufferPool bufferPool_;
StreamConfiguration configuration_;
MemoryType memoryType_;
private:
std::vector<std::pair<std::array<int, 3>, unsigned int>> bufferCache_;
};
} /* namespace libcamera */