From patchwork Tue Jul 19 09:17:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Curtin X-Patchwork-Id: 16683 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 104F1BD1F1 for ; Tue, 19 Jul 2022 09:21:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 73A2663313; Tue, 19 Jul 2022 11:21:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1658222486; bh=RT8gB2hjeVHoCQWtYINvKoo4DrCoLSJwJPiyifZet08=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=LWJsueL5C/bjAWlnZ2xnGehNuPQKmGHjkEv9GbwAkUsLakj1ZNwnpM5NJW1R/HeRi HuHOwD5HSDylIsJQpJUu/B3UV76tXUKQWhLUsoJv8r9z8wzVLjRGUcIj1uJYO2dxg+ lbenlp6Z+3BGDqVFBWvdDAv7sX60vLE+QW/1hNvuLQt1rN1ZSr5ZOCs9l/dhhnDr0r 0tTyjg/W2vYKGkoGuGq7lOX9IAA5S1Te8/SCh0vuP396s+B18lSUApu4iObf7guHVE E27xzQGr9VBxi0f5xbyXX7LCeSHyMgrfDIeecHGuRYyJyrsKTSpD2bHq7eeBfdw3QG W7i6Snp8nrpSQ== Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 4674F6330E for ; Tue, 19 Jul 2022 11:21:24 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="ZJaGX/wZ"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1658222483; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2GYsqtW90C1tt3DTmE02NgzuUOLS+3qCtRBtteiIAKk=; b=ZJaGX/wZ+Fgh6VVMeYwgN/7YWSruRwZD0iQRN+lfF6s7Fxvi0iYasLTVPj8wqCcE4AD1hV nZKgqhrF86J+kcQ7ue/VEZ7JFcEjh+br2jOIMo7hvrmZRIK8r11Hi4SvmRLyy037mSolBL Evvj4AHph88xvlFR0MGX+ZPjpiP8JSA= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-442-xmBxOoaHP_6m8oAIvBM-6A-1; Tue, 19 Jul 2022 05:21:16 -0400 X-MC-Unique: xmBxOoaHP_6m8oAIvBM-6A-1 Received: by mail-wm1-f72.google.com with SMTP id bh18-20020a05600c3d1200b003a32044cc9fso1542079wmb.6 for ; Tue, 19 Jul 2022 02:21:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2GYsqtW90C1tt3DTmE02NgzuUOLS+3qCtRBtteiIAKk=; b=5V4iMdidgC7Xf7UuX2EG+MgXIFaxAHr5xsSUCXAha0wxlWYU41wlJHU0wRfoMYfYyw VRCC9MsW5cnVDA3k/asMr1uISH/rUsnioth1uPXSfJt/Gcc4uWX0HTnfp398gohMSewb Jjw0Msm8bMR0ZVflPiXF/SPLIRsnUIlko0S0sba9FeKmfhMBqcf7KqnlC+mZHCmJZ0QC bQMgCkcn9a6+/COYanCuyTonFkZDFO6a/4p0LeClP9piNXKnFFPjoYTwvKV2YnuFGiX5 9Xgrxc18UChmVcP/+GPllKp1bAu4PAa1ghvLIark621XiHr+tuSzDRpuxB91d1IKxey6 0h+Q== X-Gm-Message-State: AJIora+cGblJ3QxKBx1H7oYE8X+USU09asKYRepj3WxoreZYUztU596m l98B2vnZ9zDSTWSnu+46CfFJm2Er2Rn3MgFf6FgEJFw/7EdfmHX15XJMfebWcC4VgUKb9YChOFX SYYFFzHA9C+JNypnJiNrGnEAnX0zwAYRSbP2zc7WKo3QGFEvIetF9Oni8tCQD8ho03BvWpevD7g onsV7C1n6y X-Received: by 2002:a5d:4e04:0:b0:21d:6ec3:38a2 with SMTP id p4-20020a5d4e04000000b0021d6ec338a2mr25944909wrt.362.1658222474821; Tue, 19 Jul 2022 02:21:14 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sI7crGWJrvNsuZO4Dg1y0qr7d3J54L7Xn0pofLE0Va5qgOXm64cPPUggF/V11oNpT+Hik8Mw== X-Received: by 2002:a5d:4e04:0:b0:21d:6ec3:38a2 with SMTP id p4-20020a5d4e04000000b0021d6ec338a2mr25944881wrt.362.1658222474462; Tue, 19 Jul 2022 02:21:14 -0700 (PDT) Received: from p1.Home ([2001:8a0:6724:4500:a69c:e66f:828e:b340]) by smtp.gmail.com with ESMTPSA id z5-20020a5d6405000000b0021b966abc19sm12707826wru.19.2022.07.19.02.21.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Jul 2022 02:21:14 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Tue, 19 Jul 2022 10:17:46 +0100 Message-Id: <20220719091745.8040-1-ecurtin@redhat.com> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ecurtin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [libcamera-devel] [PATCH v4] cam: sdl_sink: Use libjpeg over SDL2_image X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Eric Curtin via libcamera-devel From: Eric Curtin Reply-To: Eric Curtin Cc: Ian Mullins , jozef@mlich.cz Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" We were using the libjpeg functionality of SDL2_image only, instead just use libjpeg directly to reduce our dependancy count, it is a more commonly available library. Signed-off-by: Eric Curtin --- Changes in v4: - decompress function takes a Span& Changes in v3: - create JpegErrorManager struct - change c cast to reinterpret_cast Changes in v2: - alphabetically sorted various orderings - pitch_ is const again - added setjmp logic for error handling in libjpeg - rgbdata_ to unique_ptr and renamed to rgb_ - removed a copy from buffer to rgb_ - removed a destructor --- README.rst | 2 +- src/cam/jpeg_error_manager.cpp | 26 ++++++++++++++++++++ src/cam/jpeg_error_manager.h | 21 ++++++++++++++++ src/cam/meson.build | 9 +++---- src/cam/sdl_sink.cpp | 4 ++-- src/cam/sdl_texture_mjpg.cpp | 44 +++++++++++++++++++++++++++++----- src/cam/sdl_texture_mjpg.h | 6 +++++ 7 files changed, 99 insertions(+), 13 deletions(-) create mode 100644 src/cam/jpeg_error_manager.cpp create mode 100644 src/cam/jpeg_error_manager.h diff --git a/README.rst b/README.rst index b9e72d81..47b914f0 100644 --- a/README.rst +++ b/README.rst @@ -92,8 +92,8 @@ for cam: [optional] tool: - libdrm-dev: Enables the KMS sink + - libjpeg-dev: Enables MJPEG on the SDL sink - libsdl2-dev: Enables the SDL sink - - libsdl2-image-dev: Supports MJPEG on the SDL sink for qcam: [optional] qtbase5-dev libqt5core5a libqt5gui5 libqt5widgets5 qttools5-dev-tools libtiff-dev diff --git a/src/cam/jpeg_error_manager.cpp b/src/cam/jpeg_error_manager.cpp new file mode 100644 index 00000000..7e45e577 --- /dev/null +++ b/src/cam/jpeg_error_manager.cpp @@ -0,0 +1,26 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2022, Ideas on Board Oy + * + * jpeg_error_manager.cpp - JPEG Error Manager + */ + +#include "jpeg_error_manager.h" + +static void errorExit(j_common_ptr cinfo) +{ + JpegErrorManager *self = + reinterpret_cast(cinfo->err); + longjmp(self->escape_, 1); +} + +static void outputMessage([[maybe_unused]] j_common_ptr cinfo) +{ +} + +JpegErrorManager::JpegErrorManager(struct jpeg_decompress_struct &cinfo) +{ + cinfo.err = jpeg_std_error(&errmgr_); + errmgr_.error_exit = errorExit; + errmgr_.output_message = outputMessage; +} diff --git a/src/cam/jpeg_error_manager.h b/src/cam/jpeg_error_manager.h new file mode 100644 index 00000000..0af28da1 --- /dev/null +++ b/src/cam/jpeg_error_manager.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2022, Ideas on Board Oy + * + * jpeg_error_manager.h - JPEG Error Manager + */ + +#pragma once + +#include +#include + +#include + +struct JpegErrorManager { + JpegErrorManager(struct jpeg_decompress_struct &cinfo); + + /* Order very important for reinterpret_cast */ + struct jpeg_error_mgr errmgr_; + jmp_buf escape_; +}; diff --git a/src/cam/meson.build b/src/cam/meson.build index 5957ce14..86cef683 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -24,8 +24,8 @@ cam_sources = files([ cam_cpp_args = [] libdrm = dependency('libdrm', required : false) +libjpeg = dependency('libjpeg', required : false) libsdl2 = dependency('SDL2', required : false) -libsdl2_image = dependency('SDL2_image', required : false) if libdrm.found() cam_cpp_args += [ '-DHAVE_KMS' ] @@ -43,9 +43,10 @@ if libsdl2.found() 'sdl_texture_yuyv.cpp' ]) - if libsdl2_image.found() - cam_cpp_args += ['-DHAVE_SDL_IMAGE'] + if libjpeg.found() + cam_cpp_args += ['-DHAVE_LIBJPEG'] cam_sources += files([ + 'jpeg_error_manager.cpp', 'sdl_texture_mjpg.cpp' ]) endif @@ -57,8 +58,8 @@ cam = executable('cam', cam_sources, libcamera_public, libdrm, libevent, + libjpeg, libsdl2, - libsdl2_image, libyaml, ], cpp_args : cam_cpp_args, diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp index f8e3e95d..19fdfd6d 100644 --- a/src/cam/sdl_sink.cpp +++ b/src/cam/sdl_sink.cpp @@ -21,7 +21,7 @@ #include "event_loop.h" #include "image.h" -#ifdef HAVE_SDL_IMAGE +#ifdef HAVE_LIBJPEG #include "sdl_texture_mjpg.h" #endif #include "sdl_texture_yuyv.h" @@ -62,7 +62,7 @@ int SDLSink::configure(const libcamera::CameraConfiguration &config) rect_.h = cfg.size.height; switch (cfg.pixelFormat) { -#ifdef HAVE_SDL_IMAGE +#ifdef HAVE_LIBJPEG case libcamera::formats::MJPEG: texture_ = std::make_unique(rect_); break; diff --git a/src/cam/sdl_texture_mjpg.cpp b/src/cam/sdl_texture_mjpg.cpp index 69e99ad3..22f570c6 100644 --- a/src/cam/sdl_texture_mjpg.cpp +++ b/src/cam/sdl_texture_mjpg.cpp @@ -7,19 +7,51 @@ #include "sdl_texture_mjpg.h" -#include +#include "jpeg_error_manager.h" + +#include using namespace libcamera; SDLTextureMJPG::SDLTextureMJPG(const SDL_Rect &rect) - : SDLTexture(rect, SDL_PIXELFORMAT_RGB24, 0) + : SDLTexture(rect, SDL_PIXELFORMAT_RGB24, rect.w * 3), + rgb_(std::make_unique(pitch_ * rect.h)) +{ +} + +int SDLTextureMJPG::decompress(const Span &data) { + struct jpeg_decompress_struct cinfo; + JpegErrorManager jpegErrorManager(cinfo); + if (setjmp(jpegErrorManager.escape_)) { + /* libjpeg found an error */ + jpeg_destroy_decompress(&cinfo); + std::cerr << "JPEG decompression error" << std::endl; + return -EINVAL; + } + + jpeg_create_decompress(&cinfo); + + jpeg_mem_src(&cinfo, data.data(), data.size()); + + jpeg_read_header(&cinfo, TRUE); + + jpeg_start_decompress(&cinfo); + + for (int i = 0; cinfo.output_scanline < cinfo.output_height; ++i) { + JSAMPROW rowptr = rgb_.get() + i * pitch_; + jpeg_read_scanlines(&cinfo, &rowptr, 1); + } + + jpeg_finish_decompress(&cinfo); + + jpeg_destroy_decompress(&cinfo); + + return 0; } void SDLTextureMJPG::update(const Span &data) { - SDL_RWops *bufferStream = SDL_RWFromMem(data.data(), data.size()); - SDL_Surface *frame = IMG_Load_RW(bufferStream, 0); - SDL_UpdateTexture(ptr_, nullptr, frame->pixels, frame->pitch); - SDL_FreeSurface(frame); + decompress(data); + SDL_UpdateTexture(ptr_, nullptr, rgb_.get(), pitch_); } diff --git a/src/cam/sdl_texture_mjpg.h b/src/cam/sdl_texture_mjpg.h index b103f801..328c45a9 100644 --- a/src/cam/sdl_texture_mjpg.h +++ b/src/cam/sdl_texture_mjpg.h @@ -13,5 +13,11 @@ class SDLTextureMJPG : public SDLTexture { public: SDLTextureMJPG(const SDL_Rect &rect); + void update(const libcamera::Span &data) override; + +private: + int decompress(const libcamera::Span &data); + + std::unique_ptr rgb_; };