From f9e7f55f3b2cdee93a51cf7f39a2e72b4c453e00 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Fri, 23 Oct 2020 11:01:49 +0530 Subject: android: jpeg: Drop "libcamera::" namespace from functions' arguments Drop "libcamera::" from functions' arguments for *.cpp files as they have using namespace libcamera; directive in the beginning. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/android/jpeg/encoder_libjpeg.cpp | 9 ++++----- src/android/jpeg/post_processor_jpeg.cpp | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/android/jpeg') diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index 5a2f88fb..4bea10cf 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -104,7 +104,7 @@ int EncoderLibJpeg::configure(const StreamConfiguration &cfg) return 0; } -void EncoderLibJpeg::compressRGB(const libcamera::MappedBuffer *frame) +void EncoderLibJpeg::compressRGB(const MappedBuffer *frame) { unsigned char *src = static_cast(frame->maps()[0].data()); /* \todo Stride information should come from buffer configuration. */ @@ -122,7 +122,7 @@ void EncoderLibJpeg::compressRGB(const libcamera::MappedBuffer *frame) * Compress the incoming buffer from a supported NV format. * This naively unpacks the semi-planar NV12 to a YUV888 format for libjpeg. */ -void EncoderLibJpeg::compressNV(const libcamera::MappedBuffer *frame) +void EncoderLibJpeg::compressNV(const MappedBuffer *frame) { uint8_t tmprowbuf[compress_.image_width * 3]; @@ -179,9 +179,8 @@ void EncoderLibJpeg::compressNV(const libcamera::MappedBuffer *frame) } } -int EncoderLibJpeg::encode(const FrameBuffer &source, - libcamera::Span dest, - const libcamera::Span &exifData) +int EncoderLibJpeg::encode(const FrameBuffer &source, Span dest, + const Span &exifData) { MappedFrameBuffer frame(&source, PROT_READ); if (!frame.isValid()) { diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp index fd1c7bec..93acfe52 100644 --- a/src/android/jpeg/post_processor_jpeg.cpp +++ b/src/android/jpeg/post_processor_jpeg.cpp @@ -44,8 +44,8 @@ int PostProcessorJpeg::configure(const StreamConfiguration &inCfg, return encoder_->configure(inCfg); } -int PostProcessorJpeg::process(const libcamera::FrameBuffer &source, - libcamera::Span destination, +int PostProcessorJpeg::process(const FrameBuffer &source, + Span destination, CameraMetadata *metadata) { if (!encoder_) -- cgit v1.2.1