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

android: camera_device: Set Encoder at construction

Browse Source 
Make the CameraStream encoder a private unique pointer and require its
initialization at construction time. This ties the encoder lifetime to
the CameraStream it has been created with, allowing to remove the
CameraStream destructor.

This change dis-allow creating a CameraStream and set the Encoder later,
which shall not happen now that we create CameraStream once we have all
the required information in place.

No functional changes intended but this change aims to make the code
more robust enforcing a stricter CameraStream interface.

Reviewed-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
This commit is contained in:
Jacopo Mondi
2020-09-02 12:11:46 +02:00
parent c82f944399
commit facadb188e
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/android/camera_device.cpp
View File

@@ -169,16 +169,11 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,
}
}
CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i)
: format(f), size(s), jpeg(nullptr), index_(i)
CameraStream::CameraStream(PixelFormat f, Size s, unsigned int i, Encoder *e)
: format(f), size(s), index_(i), encoder_(e)
{
}
CameraStream::~CameraStream()
{
delete jpeg;
};
/*
* \struct Camera3RequestDescriptor
*
@@ -1278,20 +1273,21 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)
}
StreamConfiguration &cfg = config_->at(index);
CameraStream &cameraStream =
streams_.emplace_back(formats::MJPEG, cfg.size, index);
jpegStream->priv = static_cast<void *>(&cameraStream);
/*
* Construct a software encoder for the MJPEG streams from the
* chosen libcamera source stream.
*/
cameraStream.jpeg = new EncoderLibJpeg();
int ret = cameraStream.jpeg->configure(cfg);
Encoder *encoder = new EncoderLibJpeg();
int ret = encoder->configure(cfg);
if (ret) {
LOG(HAL, Error) << "Failed to configure encoder";
delete encoder;
return ret;
}
streams_.emplace_back(formats::MJPEG, cfg.size, index, encoder);
jpegStream->priv = static_cast<void *>(&streams_.back());
}
switch (config_->validate()) {
@@ -1480,7 +1476,7 @@ void CameraDevice::requestComplete(Request *request)
if (cameraStream->format != formats::MJPEG)
continue;
Encoder *encoder = cameraStream->jpeg;
Encoder *encoder = cameraStream->encoder();
if (!encoder) {
LOG(HAL, Error) << "Failed to identify encoder";
continue;