Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-13 07:19:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

android: camera_stream: Support PostProcessorYuv in CameraStream

Browse source 
CameraStream creates PostProcessorYuv if the destination format
is NV12.

Signed-off-by: Hirokazu Honda <hiroh@chromium.org>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Hirokazu Honda 2021-09-01 17:03:01 +09:00 • committed by Laurent Pinchart
parent 76819971b9
commit 13b76d6209
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/android/camera_device.cpp
View file

@ -1131,12 +1131,12 @@ void CameraDevice::requestComplete(Request *request)
resultMetadata = std::make_unique<CameraMetadata>(0, 0); resultMetadata = std::make_unique<CameraMetadata>(0, 0);
} }
/* Handle any JPEG compression. */ /* Handle post-processing. */
for (camera3_stream_buffer_t &buffer : descriptor.buffers_) { for (camera3_stream_buffer_t &buffer : descriptor.buffers_) {
CameraStream *cameraStream = CameraStream *cameraStream =
static_cast<CameraStream *>(buffer.stream->priv); static_cast<CameraStream *>(buffer.stream->priv);
if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB) if (cameraStream->type() == CameraStream::Type::Direct)
continue; continue;
FrameBuffer *src = request->findBuffer(cameraStream->stream()); FrameBuffer *src = request->findBuffer(cameraStream->stream());

14
src/android/camera_stream.cpp
View file

@ -9,13 +9,15 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <libcamera/formats.h>
#include "jpeg/post_processor_jpeg.h"
#include "yuv/post_processor_yuv.h"
#include "camera_buffer.h" #include "camera_buffer.h"
#include "camera_capabilities.h" #include "camera_capabilities.h"
#include "camera_device.h" #include "camera_device.h"
#include "camera_metadata.h" #include "camera_metadata.h"
#include "jpeg/post_processor_jpeg.h"
#include <libcamera/formats.h>
using namespace libcamera; using namespace libcamera;
@ -67,8 +69,14 @@ int CameraStream::configure()
cameraDevice_->capabilities()->toPixelFormat(camera3Stream_->format); cameraDevice_->capabilities()->toPixelFormat(camera3Stream_->format);
StreamConfiguration output = configuration(); StreamConfiguration output = configuration();
output.pixelFormat = outFormat; output.pixelFormat = outFormat;
output.size.width = camera3Stream_->width;
output.size.height = camera3Stream_->height;
switch (outFormat) { switch (outFormat) {
case formats::NV12:
postProcessor_ = std::make_unique<PostProcessorYuv>();
break;
case formats::MJPEG: case formats::MJPEG:
postProcessor_ = std::make_unique<PostProcessorJpeg>(cameraDevice_); postProcessor_ = std::make_unique<PostProcessorJpeg>(cameraDevice_);
break; break;