From patchwork Thu Jul 7 15:53:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Curtin X-Patchwork-Id: 16576 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 9EC3ABE173 for ; Thu, 7 Jul 2022 15:54:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id ECE786043F; Thu, 7 Jul 2022 17:54:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1657209269; bh=8neRmBwpcfSDjY4GgPexpp1pG60zwX1JrtAyc4+VuSQ=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=UmWWLQbY+kLkOKv7vYKVVmMZQZRQNooXOgPx1kXVAAeGmZspvG8tIPQKnYe3JeTsm o3xntG+qfezq64kDP5OMxIIyCvWxmc6bR7SyOLKL3fneQ6DOHMsgaZyUbxp/eegw6W nLt4sDnut+r+mU75DFy3nTHdIQPu30mebDmr2cYNANlVnYPg8xJ4ej+h8bD+4lh8wC B3TnaXRvAwglp/kgpcNjPXIsknyq/z/GQoEjoNR2N+iue8djTt9jkyibOMxOZxQJYk UXTjITJtck1PV1nvzmje+DLJJ9ctk8RqLQLu32tkfEoVnf7AoB2IFPxlX0SToXut+d gi/ReAqpLCi8A== 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 B848660400 for ; Thu, 7 Jul 2022 17:54:26 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="JEgH8591"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657209265; 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=uERE4ERvMh4/idYtIiwu7IhQEtRUq0pijq9BreHoz1A=; b=JEgH8591IkIAaK2riEkQ2ufECsn2uOvTftrDSjtvu42sKC7crYUPOO0+w+CHC3L3qWoYO6 k6XW9vYW34T2ChSUr8jIBp2hfZwn/EK1QkdkV3kxSW44vXcbCtp3SZjI7d1t93E1VATlTh /qn4e50Z++xrV2ONftVmmyrlixaQsug= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-516-TADWGM5fO_6LoUbeKs_sRg-1; Thu, 07 Jul 2022 11:54:24 -0400 X-MC-Unique: TADWGM5fO_6LoUbeKs_sRg-1 Received: by mail-wm1-f69.google.com with SMTP id h186-20020a1c21c3000000b003a2cf5b5aabso937507wmh.8 for ; Thu, 07 Jul 2022 08:54:24 -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=uERE4ERvMh4/idYtIiwu7IhQEtRUq0pijq9BreHoz1A=; b=CyNuHfUSI1DtfJ5k/vDdjep4V/P7Z/W8XXJjGHtbtqMquCrzhawO4wV5uCiwwj1QXF oJR/cafKH0XRGRf9YsytEPAyvEkZYw+N6AFn7ji9KarL3yAQT3Sz4JtENwf4nUsJ/WSJ CGWibVmDJY8vbE3DZv32NVOAzM3DZQr/2G73KYrYxYn13HVJBiaZ3oIpGHKoHbahHufx MUB28IYDkodi5eK7eamN4w0eZKxbDXZse4fakkj3y9N0izcRSgGhMnQc6dRWrV6wFN+F ivJTUI85J18RPWKqBU9rHt/jB3P6YZzPAhydvXKa2KnFviGgikI1bvDRHUrFqMS/HDh6 UMvQ== X-Gm-Message-State: AJIora+8+b57LGyFIbV3j7JFj0JPJbbikXg2REzyMxQAZtwRyv9ZK8ue txbmlM5Znb2WgipvStM3m6AzNm0FLtgTDvebu0nsqLwAbbPByiYvYCk8O/BS9H1NMipT37V+Gcp EBT/e92KyvON1Am8toGVLcbGRomQ5j4zLvmd3Arej66K7tkXKlUEEqF455G5m1a0kuTynN1CmNS T2a90V4VT2 X-Received: by 2002:adf:d1c1:0:b0:21b:a5e9:b7b2 with SMTP id b1-20020adfd1c1000000b0021ba5e9b7b2mr45671754wrd.405.1657209262705; Thu, 07 Jul 2022 08:54:22 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uapbr/2YHCoewFawlzd6v7W10cXj3X2JKrXIcCXnl1xc9lHmT8adqvJnCPW+DCEpraj8hDLA== X-Received: by 2002:adf:d1c1:0:b0:21b:a5e9:b7b2 with SMTP id b1-20020adfd1c1000000b0021ba5e9b7b2mr45671721wrd.405.1657209262242; Thu, 07 Jul 2022 08:54:22 -0700 (PDT) Received: from p1.Home ([2001:8a0:6724:4500:a69c:e66f:828e:b340]) by smtp.gmail.com with ESMTPSA id p17-20020a5d48d1000000b0021d63da245bsm14671644wrs.97.2022.07.07.08.54.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 08:54:21 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Thu, 7 Jul 2022 16:53:13 +0100 Message-Id: <20220707155312.45807-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] 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: martijn@brixit.nl, 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 --- README.rst | 2 +- src/cam/meson.build | 8 +++---- src/cam/sdl_sink.cpp | 4 ++-- src/cam/sdl_texture.h | 2 +- src/cam/sdl_texture_mjpg.cpp | 43 +++++++++++++++++++++++++++++++----- src/cam/sdl_texture_mjpg.h | 5 +++++ 6 files changed, 51 insertions(+), 13 deletions(-) diff --git a/README.rst b/README.rst index b9e72d81..5e8bc1cc 100644 --- a/README.rst +++ b/README.rst @@ -93,7 +93,7 @@ for cam: [optional] - libdrm-dev: Enables the KMS sink - libsdl2-dev: Enables the SDL sink - - libsdl2-image-dev: Supports MJPEG on the SDL sink + - libjpeg-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/meson.build b/src/cam/meson.build index 5957ce14..27cbd0de 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -25,7 +25,7 @@ cam_cpp_args = [] libdrm = dependency('libdrm', required : false) libsdl2 = dependency('SDL2', required : false) -libsdl2_image = dependency('SDL2_image', required : false) +libjpeg = dependency('libjpeg', required : false) if libdrm.found() cam_cpp_args += [ '-DHAVE_KMS' ] @@ -43,8 +43,8 @@ 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([ 'sdl_texture_mjpg.cpp' ]) @@ -58,7 +58,7 @@ cam = executable('cam', cam_sources, libdrm, libevent, libsdl2, - libsdl2_image, + libjpeg, 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.h b/src/cam/sdl_texture.h index 90974798..42c906f2 100644 --- a/src/cam/sdl_texture.h +++ b/src/cam/sdl_texture.h @@ -25,5 +25,5 @@ protected: SDL_Texture *ptr_; const SDL_Rect rect_; const SDL_PixelFormatEnum pixelFormat_; - const int pitch_; + int pitch_; }; diff --git a/src/cam/sdl_texture_mjpg.cpp b/src/cam/sdl_texture_mjpg.cpp index 69e99ad3..232af673 100644 --- a/src/cam/sdl_texture_mjpg.cpp +++ b/src/cam/sdl_texture_mjpg.cpp @@ -7,19 +7,52 @@ #include "sdl_texture_mjpg.h" -#include +#include using namespace libcamera; SDLTextureMJPG::SDLTextureMJPG(const SDL_Rect &rect) : SDLTexture(rect, SDL_PIXELFORMAT_RGB24, 0) { + pitch_ = rect_.w * 3; + rgbdata_ = (unsigned char *)malloc(pitch_ * rect_.h); +} + +SDLTextureMJPG::~SDLTextureMJPG() +{ + free(rgbdata_); +} + +void SDLTextureMJPG::decompress(const unsigned char *jpeg, + unsigned long jpeg_size) +{ + struct jpeg_error_mgr jerr; + struct jpeg_decompress_struct cinfo; + cinfo.err = jpeg_std_error(&jerr); + + jpeg_create_decompress(&cinfo); + + jpeg_mem_src(&cinfo, jpeg, jpeg_size); + + jpeg_read_header(&cinfo, TRUE); + + jpeg_start_decompress(&cinfo); + + int row_stride = cinfo.output_width * cinfo.output_components; + unsigned char *buffer = (unsigned char *)malloc(row_stride); + for (int i = 0; cinfo.output_scanline < cinfo.output_height; ++i) { + jpeg_read_scanlines(&cinfo, &buffer, 1); + memcpy(rgbdata_ + i * pitch_, buffer, row_stride); + } + + free(buffer); + jpeg_finish_decompress(&cinfo); + + jpeg_destroy_decompress(&cinfo); } 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.data(), data.size()); + SDL_UpdateTexture(ptr_, nullptr, rgbdata_, pitch_); } diff --git a/src/cam/sdl_texture_mjpg.h b/src/cam/sdl_texture_mjpg.h index b103f801..73c7fb68 100644 --- a/src/cam/sdl_texture_mjpg.h +++ b/src/cam/sdl_texture_mjpg.h @@ -13,5 +13,10 @@ class SDLTextureMJPG : public SDLTexture { public: SDLTextureMJPG(const SDL_Rect &rect); + virtual ~SDLTextureMJPG(); void update(const libcamera::Span &data) override; + +private: + unsigned char *rgbdata_ = 0; + void decompress(const unsigned char *jpeg, unsigned long jpeg_size); };