NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

android: camera_stream: Retrieve Stream and Configuration

Browse source 
It's a common pattern to access the libcamera::Stream and
libcamera::StreamConfiguration using the CameraStream instance's
index.

Add two methods to the CameraStream to shorten access to the
two fields. This allows removing the index() method from the class
interface.

Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi 2020-10-03 11:36:41 +02:00
parent 9e95d5e453
commit 216030aa9d
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/android/camera_device.cpp
View file

@ -1292,7 +1292,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
for (unsigned int i = 0; i < stream_list->num_streams; ++i) { for (unsigned int i = 0; i < stream_list->num_streams; ++i) {
camera3_stream_t *stream = stream_list->streams[i]; camera3_stream_t *stream = stream_list->streams[i];
CameraStream *cameraStream = static_cast<CameraStream *>(stream->priv); CameraStream *cameraStream = static_cast<CameraStream *>(stream->priv);
StreamConfiguration &cfg = config_->at(cameraStream->index()); const StreamConfiguration &cfg = cameraStream->configuration();
int ret = cameraStream->configure(cfg); int ret = cameraStream->configure(cfg);
if (ret) if (ret)
@ -1413,10 +1413,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques
} }
descriptor->frameBuffers.emplace_back(buffer); descriptor->frameBuffers.emplace_back(buffer);
StreamConfiguration *streamConfiguration = &config_->at(cameraStream->index()); request->addBuffer(cameraStream->stream(), buffer);
Stream *stream = streamConfiguration->stream();
request->addBuffer(stream, buffer);
} }
int ret = camera_->queueRequest(request); int ret = camera_->queueRequest(request);
@ -1462,9 +1459,7 @@ void CameraDevice::requestComplete(Request *request)
if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB) if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB)
continue; continue;
StreamConfiguration *streamConfiguration = &config_->at(cameraStream->index()); FrameBuffer *buffer = request->findBuffer(cameraStream->stream());
Stream *stream = streamConfiguration->stream();
FrameBuffer *buffer = request->findBuffer(stream);
if (!buffer) { if (!buffer) {
LOG(HAL, Error) << "Failed to find a source stream buffer"; LOG(HAL, Error) << "Failed to find a source stream buffer";
continue; continue;

10
src/android/camera_stream.cpp
View file

@ -33,6 +33,16 @@ CameraStream::CameraStream(CameraDevice *cameraDevice,
encoder_ = std::make_unique<EncoderLibJpeg>(); encoder_ = std::make_unique<EncoderLibJpeg>();
} }
const StreamConfiguration &CameraStream::configuration() const
{
return config_->at(index_);
}
Stream *CameraStream::stream() const
{
return configuration().stream();
}
int CameraStream::configure(const libcamera::StreamConfiguration &cfg) int CameraStream::configure(const libcamera::StreamConfiguration &cfg)
{ {
if (encoder_) if (encoder_)

4
src/android/camera_stream.h
View file

@ -115,7 +115,9 @@ public:
const libcamera::PixelFormat &format() const { return format_; } const libcamera::PixelFormat &format() const { return format_; }
const libcamera::Size &size() const { return size_; } const libcamera::Size &size() const { return size_; }
Type type() const { return type_; } Type type() const { return type_; }
unsigned int index() const { return index_; }
const libcamera::StreamConfiguration &configuration() const;
libcamera::Stream *stream() const;
int configure(const libcamera::StreamConfiguration &cfg); int configure(const libcamera::StreamConfiguration &cfg);
int process(const libcamera::FrameBuffer &source, int process(const libcamera::FrameBuffer &source,