From patchwork Tue Mar 22 18:35:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Curtin X-Patchwork-Id: 15510 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 5D57CC0F1B for ; Tue, 22 Mar 2022 18:35:25 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7D4CB604E6; Tue, 22 Mar 2022 19:35:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1647974124; bh=61+S3tsx6cjuVLkB9XT26S5jRFB/IwKVYcZdYzv9R6U=; h=To:Date:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=PXmmWsyOQ3CJkkPInHNup9GynGL9yFHdkGmi1Qa9WqPynL7s598BhgnCcdYbQjj2C s5KdjvBwrQ8ADHfYE0K5C8IXOkqbRiBurwTGrOrNhFJCynXTz3sdDVQwRnftTcrKNd bCI+gjsDjaaNSxByPtk2hEe+XCxzm4Qe0RrJcHIWC2HmgB9HLcuy3GzlCB/7l1t1uq l2gd/X3ntMN2jctZVqWN4xv7DGlss5SlNhQ1z+xgzw7NeJ37i40dtmuBE2Lep78ZuQ mbYkqOOt8wrHm0pewjMvMo9mRdCbDNxlnLBpZJLwblZcOeB/7QjxB0LhVAxod1GFsE aUiHx7VyZWM+w== Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CF743604C5 for ; Tue, 22 Mar 2022 19:35:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="dY2PC8lk"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647974120; 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=+ny5YsFme7mV8wUuvtXAEmz/uJ3BUgDbvqP/Z3fR/Eo=; b=dY2PC8lksK64VPi2krCpHvCiQWoybk7mSOWbybLHd+RQ+6pOAM/PN8hUI5VoNr7lxS8gcI 08FqgCcbYpJUhyax30VgP1gyS4d787X16VAq9uKLxT61BQ+6Ug6zesESmAgS+4rw4xOWgt BRMnRif5hzROm0eRaCIgyla5t98U8c8= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-259-aI50VjDWMCi_jWJCJm0dhA-1; Tue, 22 Mar 2022 14:35:19 -0400 X-MC-Unique: aI50VjDWMCi_jWJCJm0dhA-1 Received: by mail-wm1-f71.google.com with SMTP id z16-20020a05600c0a1000b0038bebbd8548so1784921wmp.3 for ; Tue, 22 Mar 2022 11:35:19 -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=+ny5YsFme7mV8wUuvtXAEmz/uJ3BUgDbvqP/Z3fR/Eo=; b=e6JCVkKD0rM4UeS/94bazM58JGFy5uRa8GfpG+pxhJDIvTPoSoqlTAHC/uaRIXnrQu bhvs9VXkjUjraJv2TxO4l6CwBwXcGOhGHUBaBUzq+BMlJPZh7fXTuOIAVfsf1EaE0kND hIgllo5MsbTMApmm0YxdZzNbWglc6kHhKvCoXZ/+klJpH6a/TKvBL6HyfOQeMYAIZwYF 4hTG1w6oRIqAmOAWRfnw+vzjAYZuE52rvurPx/qh67sDofjA2uSVklH+5gIt8uepNzxX FDrqRu13KnjTKS6WRDBuUxYdh+iUDTLmpDpRYjVmFmMVY2YsN7q8bFepBIx1IqpcSxNg Oksw== X-Gm-Message-State: AOAM531jcz+zt+03ndjq1R8E5IDYF89JboMGEUiKFBIQ+21oi17McRK4 +ZgZQk2ahlN/ksn9dxsBisiZK5TF5t7tSIZ1f1pOVr5mT5pxa7DHCCkPy2+7mI+Afg4V8HUyxlO hU0uFxdoipaqNi4mDOpPBSmbCpFNHya1a8IjMxRtn0WzvkWIPsr2r+5tSr2K9kDU/EkioyAZDDE AjbjO2y/rz X-Received: by 2002:adf:fcce:0:b0:203:dcdb:dd80 with SMTP id f14-20020adffcce000000b00203dcdbdd80mr23846568wrs.455.1647974117903; Tue, 22 Mar 2022 11:35:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw59CggTNl3kUF4S+jxVYxVrk8Eo9DpOJ4AVAWOZn/SK8GbTOAtmai8/74kDtrc5r4gQVR6zg== X-Received: by 2002:adf:fcce:0:b0:203:dcdb:dd80 with SMTP id f14-20020adffcce000000b00203dcdbdd80mr23846544wrs.455.1647974117600; Tue, 22 Mar 2022 11:35:17 -0700 (PDT) Received: from p1.Home ([2001:8a0:6724:4500:a69c:e66f:828e:b340]) by smtp.gmail.com with ESMTPSA id i15-20020a5d584f000000b00204171ba528sm5021688wrf.109.2022.03.22.11.35.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Mar 2022 11:35:17 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Tue, 22 Mar 2022 18:35:14 +0000 Message-Id: <20220322183514.65073-1-ecurtin@redhat.com> X-Mailer: git-send-email 2.35.1 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: Add SDL sink 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 Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This adds more portability to existing cam sinks. You can pass a YUYV camera buffer for example and SDL will handle the pixel buffer conversion, although SDL does not support decompression for pixelformats like MJPEG. This allows cam reference implementation to display images on VMs, Mac M1, Raspberry Pi, etc. This also enables cam reference implementation, to run as a desktop application in wayland or x11. SDL also has support for Android and ChromeOS which I have not tested. Also tested on simpledrm raspberry pi 4 framebuffer successfully where existing kms sink did not work. Signed-off-by: Eric Curtin --- src/cam/camera_session.cpp | 8 +++ src/cam/main.cpp | 6 ++ src/cam/main.h | 1 + src/cam/meson.build | 10 +++ src/cam/sdl_sink.cpp | 125 +++++++++++++++++++++++++++++++++++++ src/cam/sdl_sink.h | 40 ++++++++++++ 6 files changed, 190 insertions(+) create mode 100644 src/cam/sdl_sink.cpp create mode 100644 src/cam/sdl_sink.h diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index 0428b538..30162dbd 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -19,6 +19,9 @@ #ifdef HAVE_KMS #include "kms_sink.h" #endif +#ifdef HAVE_SDL +#include "sdl_sink.h" +#endif #include "main.h" #include "stream_options.h" @@ -187,6 +190,11 @@ int CameraSession::start() sink_ = std::make_unique(options_[OptDisplay].toString()); #endif +#ifdef HAVE_SDL + if (options_.isSet(OptSDL)) + sink_ = std::make_unique(); +#endif + if (options_.isSet(OptFile)) { if (!options_[OptFile].toString().empty()) sink_ = std::make_unique(streamNames_, diff --git a/src/cam/main.cpp b/src/cam/main.cpp index c7f664b9..406d61bc 100644 --- a/src/cam/main.cpp +++ b/src/cam/main.cpp @@ -138,6 +138,12 @@ int CamApp::parseOptions(int argc, char *argv[]) "display", ArgumentOptional, "connector", false, OptCamera); #endif + +#ifdef HAVE_SDL + parser.addOption(OptSDL, OptionNone, + "Display viewfinder through SDL", + "sdl", ArgumentNone, "", false, OptCamera); +#endif parser.addOption(OptFile, OptionString, "Write captured frames to disk\n" "If the file name ends with a '/', it sets the directory in which\n" diff --git a/src/cam/main.h b/src/cam/main.h index 62f7bbc9..a64f95a0 100644 --- a/src/cam/main.h +++ b/src/cam/main.h @@ -11,6 +11,7 @@ enum { OptCamera = 'c', OptCapture = 'C', OptDisplay = 'D', + OptSDL = 'S', OptFile = 'F', OptHelp = 'h', OptInfo = 'I', diff --git a/src/cam/meson.build b/src/cam/meson.build index e8e2ae57..44202ef0 100644 --- a/src/cam/meson.build +++ b/src/cam/meson.build @@ -32,11 +32,21 @@ cam_sources += files([ ]) endif +libsdl2 = dependency('SDL2', required : false) + +if libsdl2.found() +cam_cpp_args += [ '-DHAVE_SDL' ] +cam_sources += files([ + 'sdl_sink.cpp' +]) +endif + cam = executable('cam', cam_sources, dependencies : [ libatomic, libcamera_public, libdrm, + libsdl2, libevent, ], cpp_args : cam_cpp_args, diff --git a/src/cam/sdl_sink.cpp b/src/cam/sdl_sink.cpp new file mode 100644 index 00000000..6de1493b --- /dev/null +++ b/src/cam/sdl_sink.cpp @@ -0,0 +1,125 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * sdl_sink.cpp - SDL Sink + */ + +#include "sdl_sink.h" + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include "image.h" + +using namespace libcamera; + +SDLSink::SDLSink() +{ + memset(&sdlRect_, 0, sizeof(sdlRect_)); +} + +SDLSink::~SDLSink() +{ + SDL_Quit(); +} + +int SDLSink::configure(const libcamera::CameraConfiguration &cfg) +{ + int ret = FrameSink::configure(cfg); + if (ret < 0) + return ret; + + if ((ret = SDL_Init(SDL_INIT_VIDEO))) { + std::cout << "Could not initialize SDL - " << SDL_GetError() << "\n"; + return ret; + } + + const libcamera::StreamConfiguration &sCfg = cfg.at(0); + sdlScreen_ = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED, + SDL_WINDOWPOS_UNDEFINED, sCfg.size.width, + sCfg.size.height, SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE); + if (!sdlScreen_) { + std::cerr << "SDL: could not create window - exiting: " << SDL_GetError() << "\n"; + return -1; + } + + sdlRenderer_ = SDL_CreateRenderer( + sdlScreen_, -1, 0); + if (!sdlRenderer_) { + std::cerr << "SDL_CreateRenderer Error\n"; + return -2; + } + + SDL_RenderSetLogicalSize(sdlRenderer_, sCfg.size.width, + sCfg.size.height); + + SDL_PixelFormatEnum pf = (SDL_PixelFormatEnum)sCfg.pixelFormat.fourcc(); + if (pf == SDL_DEFINE_PIXELFOURCC('Y', 'U', 'Y', 'V')) { + pf = SDL_PIXELFORMAT_YUY2; + } + + if (!(ret = strcmp(SDL_GetPixelFormatName(pf), "SDL_PIXELFORMAT_UNKNOWN"))) { + std::cerr << "error: SDL_PIXELFORMAT_UNKNOWN, no " << sCfg.pixelFormat.toString() << " support\n"; + return -3; + } + + sdlTexture_ = + SDL_CreateTexture(sdlRenderer_, SDL_PIXELFORMAT_YUY2, + SDL_TEXTUREACCESS_STREAMING, sCfg.size.width, + sCfg.size.height); + sdlRect_.w = sCfg.size.width; + sdlRect_.h = sCfg.size.height; + + return 0; +} + +void SDLSink::mapBuffer(FrameBuffer *buffer) +{ + std::unique_ptr image = + Image::fromFrameBuffer(buffer, Image::MapMode::ReadOnly); + assert(image != nullptr); + + mappedBuffers_[buffer] = std::move(image); +} + +bool SDLSink::processRequest(Request *request) +{ + for (auto [stream, buffer] : request->buffers()) + writeBuffer(buffer); + + return true; +} + +void SDLSink::writeBuffer(FrameBuffer *buffer) +{ + Image *image = mappedBuffers_[buffer].get(); + + for (unsigned int i = 0; i < buffer->planes().size(); ++i) { + const FrameMetadata::Plane &meta = buffer->metadata().planes()[i]; + + Span data = image->data(i); + if (meta.bytesused > data.size()) + std::cerr << "payload size " << meta.bytesused + << " larger than plane size " << data.size() + << std::endl; + + SDL_UpdateTexture(sdlTexture_, &sdlRect_, data.data(), sdlRect_.w * 2); + SDL_RenderClear(sdlRenderer_); + SDL_RenderCopy(sdlRenderer_, sdlTexture_, NULL, NULL); + SDL_RenderPresent(sdlRenderer_); + SDL_Event e; + while (SDL_PollEvent(&e)) { + if (e.type == SDL_QUIT) { // click close icon then quit + kill(getpid(), SIGINT); + } + }; + } +} diff --git a/src/cam/sdl_sink.h b/src/cam/sdl_sink.h new file mode 100644 index 00000000..f4f843fa --- /dev/null +++ b/src/cam/sdl_sink.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * sdl_sink.h - SDL Sink + */ + +#pragma once + +#include +#include +#include + +#include + +#include + +#include "frame_sink.h" + +class Image; + +class SDLSink : public FrameSink +{ +public: + SDLSink(); + ~SDLSink(); + + int configure(const libcamera::CameraConfiguration &cfg) override; + + void mapBuffer(libcamera::FrameBuffer *buffer) override; + + bool processRequest(libcamera::Request *request) override; + +private: + void writeBuffer(libcamera::FrameBuffer *buffer); + + std::map> mappedBuffers_; + SDL_Window *sdlScreen_; + SDL_Renderer *sdlRenderer_; + SDL_Texture *sdlTexture_; + SDL_Rect sdlRect_; +};