From patchwork Fri Mar 20 08:50:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Show Liu X-Patchwork-Id: 3221 Return-Path: Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 3983F6041A for ; Fri, 20 Mar 2020 09:59:13 +0100 (CET) Received: by mail-pl1-x644.google.com with SMTP id t3so2221025plz.9 for ; Fri, 20 Mar 2020 01:59:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GP09lEr6IVTprj5wjX7qfXaeHlaQMVnk20kyD7nc8AI=; b=Qs4AOTxJ2j29mHHduH/Brm+iJO946+FdyBAjE/iHAnd92mgI/rDv5kvtKgjzBVmoxf Nq3HTO3UV2w2X4GDC+EGSp2uMowzYwRGEE8Ec7MySisLEn/VnDayDby/ylQJoOJyfBOl /ESBtaKIRmAUqRYS1qgGP6LNZsEPiq2xj/y/th63wDmGSb+RbOdFt2RGdRRna7ghek0m SJtl82EtHXRVn2vJ5mAFOWBPwitLX8QRXbWXCepFIPJO9P6k0bAvMO9t7wI0+l6kQvx8 1hpTkerULIOJHZIj35RoRgtDeuGn9jnxVl9lBw9d8x6jxR/Gb6iQLU163Tn1s1gWs1OX DpBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GP09lEr6IVTprj5wjX7qfXaeHlaQMVnk20kyD7nc8AI=; b=YmwztSNe/FcskgttI39d2C58GCZRE6IJlwg+4Xibe8WoQOyYmL6gqRfOP0AnRMt7NA l6fSF/R3qPy2mw3wAXEQEO/SZ9jFfcwOCgqX/gfCA6e475m/WqrzqYgYyVWJUbdT03KT 0z+bbzFEwJMpcWFO2Yteje8usbdm/isvxGSRNOpqDOdu3Tz4Wwf/dTEWmvbdUnrmEjba xwdwP1Wz9phzQtQUFpk5GrRV768Jcc9T2I1I6LimnGO6Slk++j6JA58olXeLzrRtDZNj tx+tRB3IieZgldNuO9diQccjglWYsBc3Jb06xTW4Tshw1kiX/An/+A3/gE3h8oGSLw7T DenA== X-Gm-Message-State: ANhLgQ1e9faHuV31SgISv+HOo7+O0gmsTOf8dtTo4kS0VyvSwwNCZ+/I k/sqOmZYi0EioZqOWtziiinVZP6Wvwa2Xw== X-Google-Smtp-Source: ADFU+vskgTS5yBYsojjTHs8CEAgdDimmBvwpFWGsh/2oWHmNWVjsjdQhiPXVHleso5nhMAALrzeBMQ== X-Received: by 2002:a17:90b:8f:: with SMTP id bb15mr7615946pjb.186.1584694751187; Fri, 20 Mar 2020 01:59:11 -0700 (PDT) Received: from localhost.localdomain (211-20-20-223.HINET-IP.hinet.net. [211.20.20.223]) by smtp.gmail.com with ESMTPSA id 26sm4604653pfp.130.2020.03.20.01.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 01:59:10 -0700 (PDT) From: Show Liu To: libcamera-devel@lists.libcamera.org Date: Fri, 20 Mar 2020 16:50:27 +0800 Message-Id: <20200320085029.17875-2-show.liu@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200320085029.17875-1-show.liu@linaro.org> References: <20200320085029.17875-1-show.liu@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC] [PATCH 1/3] Added statusbar to show the camera stream configuration 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-List-Received-Date: Fri, 20 Mar 2020 08:59:13 -0000 qcam: Added statusbar to show the camera stream information Signed-off-by: Show Liu Reviewed-by: Niklas Söderlund --- src/qcam/main_window.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index ae1760d..98e55ba 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include @@ -238,6 +239,8 @@ int MainWindow::startCapture() return ret; } + statusBar()->showMessage(QString(cfg.toString().c_str())); + adjustSize(); allocator_ = FrameBufferAllocator::create(camera_); @@ -342,6 +345,8 @@ void MainWindow::stopCapture() config_.reset(); + statusBar()->clearMessage(); + titleTimer_.stop(); setWindowTitle(title_); } From patchwork Fri Mar 20 08:50:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Show Liu X-Patchwork-Id: 3222 Return-Path: Received: from mail-pg1-x532.google.com (mail-pg1-x532.google.com [IPv6:2607:f8b0:4864:20::532]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 97D7B6041A for ; Fri, 20 Mar 2020 09:59:16 +0100 (CET) Received: by mail-pg1-x532.google.com with SMTP id 7so2766717pgr.2 for ; Fri, 20 Mar 2020 01:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rfRhXpmVt8wkY3YTvk5qVRhqAyjmzIIu39qdhS0GYd8=; b=vYLT4vU+5ot9yvUb+YTanF6lhMaAfOx5+HUg9ZZjDR//lFmCK0eGXwqGOsTlUSuGtt //dwErJGAv4RVkeWxbSG11b7rHM5JTrUcgMKHs5ED03tjsVjt4CMNbtTlidFoQL9pA9i yAm3HAC6+U/NgpMkyF0bjJLLdgOe9JMjGr4QGimuvdt85+jG7hRCCfM6SDsVKbZOzwTj 00tXSpop/uPtESGCRTK19sLptJC/N+G6uV6XKNxttYzuzQan7iMd97McdviW+UnwAWK3 6VcdVy3h380Csc58bsRHsM3xYMi0DSKlXxsLorU8vMMacyRju76tnGG7U0c8hecYU2uB FTlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rfRhXpmVt8wkY3YTvk5qVRhqAyjmzIIu39qdhS0GYd8=; b=bMk1/7iytvJqRSoyc0OOi3cpoxN1rj2G3JOs2esFQKHlHz0zcbbOEO5Y/Kvmhs6k/A Ey2aqrtcda0quWujJqXjcOhmuaiy3zVSXlT8wYVJ1Khb53n3ricJkdVSOgIz+BBYElJM 952oTJXAjT+M+oJL4OnhClC+22ZWrOhOzwW7edz5BldcbFRiMod7F3TYfFBoR/f8Eecc 5moCm5gFReLgtmoltWLQzfwJBs47tShX9Lcfpv+bL6FPxtVssjX+DbbuQE17hRJS72W8 ImxlgxP1op07V6BoP1wCqqHz7a8e6ENgRAXt0JoHAx/QUZZ//F2qHPBN19oxWNyknvtk amLw== X-Gm-Message-State: ANhLgQ2DW+Ot1qbsrlkhXYClvVRFFm4jlHWaXUB52muaSy1STiKI+kz6 8V06+BTdRGRN3oYt1hP6c38Pj+orZ+Twfg== X-Google-Smtp-Source: ADFU+vvbJLJPjgd6XEdSTZ33mGsizv9RzMeJ+bd/JJ8AYSkPhIUOUH7B2kYnyQXXKB5BbJpA4ZrdUw== X-Received: by 2002:a63:6203:: with SMTP id w3mr7830308pgb.35.1584694754727; Fri, 20 Mar 2020 01:59:14 -0700 (PDT) Received: from localhost.localdomain (211-20-20-223.HINET-IP.hinet.net. [211.20.20.223]) by smtp.gmail.com with ESMTPSA id 26sm4604653pfp.130.2020.03.20.01.59.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 01:59:14 -0700 (PDT) From: Show Liu To: libcamera-devel@lists.libcamera.org Date: Fri, 20 Mar 2020 16:50:28 +0800 Message-Id: <20200320085029.17875-3-show.liu@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200320085029.17875-1-show.liu@linaro.org> References: <20200320085029.17875-1-show.liu@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC] [PATCH 2/3] Added opengl widget class for qcam 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-List-Received-Date: Fri, 20 Mar 2020 08:59:16 -0000 qcam: Added opengl widget class for qcam Signed-off-by: Show Liu --- src/qcam/glwidget.cpp | 213 ++++++++++++++++++++++++++++++++++++++++++ src/qcam/glwidget.h | 76 +++++++++++++++ src/qcam/meson.build | 4 +- 3 files changed, 292 insertions(+), 1 deletion(-) create mode 100644 src/qcam/glwidget.cpp create mode 100644 src/qcam/glwidget.h diff --git a/src/qcam/glwidget.cpp b/src/qcam/glwidget.cpp new file mode 100644 index 0000000..bf6add4 --- /dev/null +++ b/src/qcam/glwidget.cpp @@ -0,0 +1,213 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2020, Linaro + * + * glwidget.cpp - Rendering YUV frame by OpenGL shader + */ + +#include "glwidget.h" +#include + +#define ATTRIB_VERTEX 0 +#define ATTRIB_TEXTURE 1 + +GLWidget::GLWidget(QWidget *parent) + : QOpenGLWidget(parent), + textureY(QOpenGLTexture::Target2D), + textureU(QOpenGLTexture::Target2D), + textureV(QOpenGLTexture::Target2D), + yuvDataPtr(NULL), + glBuffer(QOpenGLBuffer::VertexBuffer) +{ +} + +GLWidget::~GLWidget() +{ + removeShader(); + + textureY.destroy(); + textureU.destroy(); + textureV.destroy(); + + glBuffer.destroy(); +} + +void GLWidget::updateFrame(unsigned char *buffer) +{ + if(buffer) { + yuvDataPtr = buffer; + update(); + } +} + +void GLWidget::setFrameSize(int width, int height) +{ + if(width > 0 && height > 0) { + width_ = width; + height_ = height; + } +} + +int GLWidget::configure(unsigned int format, unsigned int width, + unsigned int height) +{ + switch (format) { + case DRM_FORMAT_NV12: + break; + case DRM_FORMAT_NV21: + break; + default: + return -EINVAL; + }; + format_ = format; + width_ = width; + height_ = height; + + return 0; +} + +void GLWidget::createShader() +{ + bool ret = false; + + QString vsrc = "attribute vec4 vertexIn; \n" + "attribute vec2 textureIn; \n" + "varying vec2 textureOut; \n" + "void main(void) \n" + "{ \n" + "gl_Position = vertexIn; \n" + "textureOut = textureIn; \n" + "} \n"; + + ret = shaderProgram.addShaderFromSourceCode(QOpenGLShader::Vertex, vsrc); + if(!ret) { + qDebug() << __func__ << ":" << shaderProgram.log(); + } + + QString fsrc = "#ifdef GL_ES \n" + "precision highp float; \n" + "#endif \n" + "varying vec2 textureOut; \n" + "uniform sampler2D tex_y; \n" + "uniform sampler2D tex_uv; \n" + "void main(void) \n" + "{ \n" + "vec3 yuv; \n" + "vec3 rgb; \n" + "yuv.x = texture2D(tex_y, textureOut).r - 0.0625; \n" + "yuv.y = texture2D(tex_uv, textureOut).r - 0.5; \n" + "yuv.z = texture2D(tex_uv, textureOut).g - 0.5; \n" + "rgb = mat3( 1.0, 1.0, 1.0, \n" + " 0.0, -0.39465, 2.03211, \n" + " 1.13983, -0.58060, 0.0) * yuv; \n" + "gl_FragColor = vec4(rgb, 1.0); \n" + "}\n"; + ret = shaderProgram.addShaderFromSourceCode(QOpenGLShader::Fragment, fsrc); + if(!ret) { + qDebug() << __func__ << ":" << shaderProgram.log(); + } + + // Link shader pipeline + if (!shaderProgram.link()) { + qDebug() << __func__ << ": shader program link failed.\n" << shaderProgram.log(); + close(); + } + + // Bind shader pipeline for use + if (!shaderProgram.bind()) { + qDebug() << __func__ << ": shader program binding failed.\n" << shaderProgram.log(); + close(); + } + +} + +void GLWidget::configureTexture(unsigned int id) +{ + glBindTexture(GL_TEXTURE_2D, id); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); +} + +void GLWidget::removeShader() +{ + if (shaderProgram.isLinked()) { + shaderProgram.release(); + shaderProgram.removeAllShaders(); + } +} + +void GLWidget::initializeGL() +{ + initializeOpenGLFunctions(); + + + glEnable(GL_TEXTURE_2D); + glDisable(GL_DEPTH_TEST); + + static const GLfloat vertices[] { + -1.0f,-1.0f, + -1.0f,+1.0f, + +1.0f,+1.0f, + +1.0f,-1.0f, + 0.0f,1.0f, + 0.0f,0.0f, + 1.0f,0.0f, + 1.0f,1.0f, + }; + + glBuffer.create(); + glBuffer.bind(); + glBuffer.allocate(vertices,sizeof(vertices)); + + createShader(); + + shaderProgram.enableAttributeArray(ATTRIB_VERTEX); + shaderProgram.enableAttributeArray(ATTRIB_TEXTURE); + + shaderProgram.setAttributeBuffer(ATTRIB_VERTEX,GL_FLOAT,0,2,2*sizeof(GLfloat)); + shaderProgram.setAttributeBuffer(ATTRIB_TEXTURE,GL_FLOAT,8*sizeof(GLfloat),2,2*sizeof(GLfloat)); + + textureUniformY = shaderProgram.uniformLocation("tex_y"); + textureUniformU = shaderProgram.uniformLocation("tex_uv"); + + textureY.create(); + textureU.create(); + + id_y = textureY.textureId(); + id_u = textureU.textureId(); + + configureTexture(id_y); + configureTexture(id_u); + + glClearColor(1.0f, 1.0f, 1.0f, 0.0f); +} + +void GLWidget::paintGL() +{ + if(yuvDataPtr) + { + glClearColor(0.0, 0.0, 0.0, 1.0); + glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT ); + + // activate texture Y + glActiveTexture(GL_TEXTURE0); + glBindTexture(GL_TEXTURE_2D, id_y); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RED, width_, height_, 0, GL_RED, GL_UNSIGNED_BYTE, yuvDataPtr); + glUniform1i(textureUniformY, 0); + + // activate texture UV + glActiveTexture(GL_TEXTURE1); + glBindTexture(GL_TEXTURE_2D, id_u); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RG, width_/2, height_/2, 0, GL_RG, GL_UNSIGNED_BYTE, (char*)yuvDataPtr+width_*height_); + glUniform1i(textureUniformU, 1); + + glDrawArrays(GL_TRIANGLE_FAN, 0, 4); + } +} + +void GLWidget::resizeGL(int w, int h) +{ + glViewport(0,0,w,h); +} diff --git a/src/qcam/glwidget.h b/src/qcam/glwidget.h new file mode 100644 index 0000000..17f71b9 --- /dev/null +++ b/src/qcam/glwidget.h @@ -0,0 +1,76 @@ +#ifndef GLWINDOW_H +#define GLWINDOW_H + +#include +#include +#include +#include +#include +#include + +#include +#include +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* + * Copyright (C) 2020, Linaro + * + * glwidget.h - Rendering YUV frame by OpenGL shader + */ +#include +#include +#include + +#include +#include + +#include + +class GLWidget : public QOpenGLWidget, protected QOpenGLFunctions +{ + Q_OBJECT + +public: + GLWidget(QWidget *parent = 0); + ~GLWidget(); + + void setFrameSize(int width, int height); + void updateFrame(unsigned char *buffer); + + int configure(unsigned int format, unsigned int width, + unsigned int height); + + void createShader(); + +protected: + void initializeGL() Q_DECL_OVERRIDE; + void paintGL() Q_DECL_OVERRIDE; + void resizeGL(int w, int h) Q_DECL_OVERRIDE; + +private: + + void configureTexture(unsigned int id); + void removeShader(); + + QOpenGLShader *pVShader; + QOpenGLShader *pFShader; + QOpenGLShaderProgram shaderProgram; + + GLuint textureUniformY; + GLuint textureUniformU; + GLuint textureUniformV; + GLuint id_y; + GLuint id_u; + GLuint id_v; + QOpenGLTexture textureY; + QOpenGLTexture textureU; + QOpenGLTexture textureV; + + unsigned int format_; + unsigned int width_; + unsigned int height_; + + unsigned char* yuvDataPtr; + + QOpenGLBuffer glBuffer; +}; +#endif // GLWINDOW_H diff --git a/src/qcam/meson.build b/src/qcam/meson.build index 5150631..8bbcfba 100644 --- a/src/qcam/meson.build +++ b/src/qcam/meson.build @@ -5,10 +5,12 @@ qcam_sources = files([ '../cam/options.cpp', 'qt_event_dispatcher.cpp', 'viewfinder.cpp', + 'glwidget.cpp' ]) qcam_moc_headers = files([ 'main_window.h', + 'glwidget.h' ]) qcam_resources = files([ @@ -18,7 +20,7 @@ qcam_resources = files([ qt5 = import('qt5') qt5_dep = dependency('qt5', method : 'pkg-config', - modules : ['Core', 'Gui', 'Widgets'], + modules : ['Core', 'Gui', 'Widgets','OpenGL', 'OpenGLExtensions'], required : false) if qt5_dep.found() From patchwork Fri Mar 20 08:50:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Show Liu X-Patchwork-Id: 3223 Return-Path: Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 36EE46041A for ; Fri, 20 Mar 2020 09:59:19 +0100 (CET) Received: by mail-pl1-x631.google.com with SMTP id t16so2219183plr.8 for ; Fri, 20 Mar 2020 01:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=e8/rrufqMpW38N/W4gbu95fcU3yNy1Ck/MLkXMK1XJA=; b=iS/6QNVgW7BA0K26nJ6t3uJ62xpmBmVSmQ6QxeIFnn++s5y7Q2HwJIH/axJF1nWLcl exwXYgV6jWIiCmUzFijXvx1uYVF97KtmB+zk6ndHYid4eOW8WORPN3zvw0X/mPYtMSAR +WPXFYf6kmP7QeqSbRgsrl6ODgtuBghFo2K3nHYOhUKsXSBbZ2dB6OCmGb2JPcd+t5Ss Pg73e4Vp7Uk5AyYRl3mDvJ0v7AwSX2yQMR41FYOYzjHVwHpDN39dEq7rkVxsicHdZPTK DiYYLMmYGxIQH5Dc9/FYk2qO0QfoDVhgVugd1fTH76sakwepgEjfzNNP6zUJ7/nHDhMS gs5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=e8/rrufqMpW38N/W4gbu95fcU3yNy1Ck/MLkXMK1XJA=; b=C4mVferAIHjl+m/EIow89I9oRPEkq+acjRwnzjv+Jw+iZxAUZkfRtvpJr5njV/pskD i2aEaNSCMtov4Lo7XOYZVRcw8lXfs82MCUPqKw0Vp8kmW1wH04rn1ejpPTEAO/hknKEo WPfavdtKoekaXHdWxKZ0wKclPkbvXZE5LWI89aISTbwQbE2GWAmgpPZhSvU4kA2gBm2w ksw+i0lPw6nlDlMTrW1upBydnSJwrEGYXL25+uH46NCoKseCYPfy/YR08speMbNIHdxC 3GO4KrlS2r86+EihyRFg+4b/5D99bcuVnYIDVBcmeOOJUnilz7z6gw8s5/iCLzplgrSs C79g== X-Gm-Message-State: ANhLgQ1VKRmLF1Dow4mn5I9hBtpV7Qge0OPL8wvauIIoAHTHzG+XH2ep uOptf5JlqjfO0Sh1LqZYB5ixobWInqlSHA== X-Google-Smtp-Source: ADFU+vszhnmXePqTpJi+Jkcj3Np/NlKkI6aocyrN00G5r6vUqbB83qEOUAWqDvjs1EIEmSGMllnk/A== X-Received: by 2002:a17:90b:307:: with SMTP id ay7mr8414606pjb.123.1584694757653; Fri, 20 Mar 2020 01:59:17 -0700 (PDT) Received: from localhost.localdomain (211-20-20-223.HINET-IP.hinet.net. [211.20.20.223]) by smtp.gmail.com with ESMTPSA id 26sm4604653pfp.130.2020.03.20.01.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Mar 2020 01:59:17 -0700 (PDT) From: Show Liu To: libcamera-devel@lists.libcamera.org Date: Fri, 20 Mar 2020 16:50:29 +0800 Message-Id: <20200320085029.17875-4-show.liu@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200320085029.17875-1-show.liu@linaro.org> References: <20200320085029.17875-1-show.liu@linaro.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC] [PATCH 3/3] qcam: added an option to enable rendering via OpenGL shader 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-List-Received-Date: Fri, 20 Mar 2020 08:59:19 -0000 qcam: added an option to enable rendering via OpenGL shader Signed-off-by: Show Liu --- src/qcam/main.cpp | 2 ++ src/qcam/main_window.cpp | 31 ++++++++++++++++++++++++++++--- src/qcam/main_window.h | 3 +++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/qcam/main.cpp b/src/qcam/main.cpp index a7ff5c5..7727a09 100644 --- a/src/qcam/main.cpp +++ b/src/qcam/main.cpp @@ -39,6 +39,8 @@ OptionsParser::Options parseOptions(int argc, char *argv[]) "help"); parser.addOption(OptSize, &sizeParser, "Set the stream size", "size", true); + parser.addOption(OptOpengl, OptionNone, "Enable YUV format via OpenGL shader", + "opengl"); OptionsParser::Options options = parser.parse(argc, argv); if (options.isSet(OptHelp)) diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 98e55ba..5a5bc88 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -28,6 +28,7 @@ #include "main_window.h" #include "viewfinder.h" +#include "glwidget.h" using namespace libcamera; @@ -43,7 +44,14 @@ MainWindow::MainWindow(CameraManager *cm, const OptionsParser::Options &options) connect(&titleTimer_, SIGNAL(timeout()), this, SLOT(updateTitle())); viewfinder_ = new ViewFinder(this); - setCentralWidget(viewfinder_); + glwidget_ = new GLWidget(this); + + if (options_.isSet(OptOpengl)) { + setCentralWidget(glwidget_); + } else { + setCentralWidget(viewfinder_); + } + adjustSize(); ret = openCamera(); @@ -232,6 +240,7 @@ int MainWindow::startCapture() } Stream *stream = cfg.stream(); + ret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width, cfg.size.height); if (ret < 0) { @@ -239,6 +248,11 @@ int MainWindow::startCapture() return ret; } + if (options_.isSet(OptOpengl)) { + glwidget_->setFrameSize(cfg.size.width, cfg.size.height); + glwidget_->setFixedSize(cfg.size.width, cfg.size.height); + } + statusBar()->showMessage(QString(cfg.toString().c_str())); adjustSize(); @@ -353,7 +367,13 @@ void MainWindow::stopCapture() void MainWindow::saveImageAs() { - QImage image = viewfinder_->getCurrentImage(); + QImage image; + if (options_.isSet(OptOpengl)) { + image = glwidget_->grabFramebuffer(); + } else { + image = viewfinder_->getCurrentImage(); + } + QString defaultPath = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation); QString filename = QFileDialog::getSaveFileName(this, "Save Image", defaultPath, @@ -416,7 +436,12 @@ int MainWindow::display(FrameBuffer *buffer) const FrameBuffer::Plane &plane = buffer->planes().front(); void *memory = mappedBuffers_[plane.fd.fd()].first; unsigned char *raw = static_cast(memory); - viewfinder_->display(raw, buffer->metadata().planes[0].bytesused); + + if (options_.isSet(OptOpengl)) { + glwidget_->updateFrame(raw); + } else { + viewfinder_->display(raw, buffer->metadata().planes[0].bytesused); + } return 0; } diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 40aa10a..5501dd1 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -21,6 +21,7 @@ #include #include "../cam/options.h" +#include "glwidget.h" using namespace libcamera; @@ -30,6 +31,7 @@ enum { OptCamera = 'c', OptHelp = 'h', OptSize = 's', + OptOpengl = 'o', }; class MainWindow : public QMainWindow @@ -79,6 +81,7 @@ private: QToolBar *toolbar_; ViewFinder *viewfinder_; + GLWidget *glwidget_; std::map> mappedBuffers_; };