PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcam: viewfinder_gl: Rename yuvData_ to data_

Browse Source 
In preparation for RGB formats support, rename the pointer to image data
from yuvData_ to data_.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Andrey Konovalov <andrey.konovalov@linaro.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart
2020-10-12 22:02:10 +03:00
parent dfadca6356
commit 819f6172ea
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/qcam/viewfinder_gl.cpp
View File

@@ -32,7 +32,7 @@ static const QList<libcamera::PixelFormat> supportedFormats{
};
ViewFinderGL::ViewFinderGL(QWidget *parent)
: QOpenGLWidget(parent), buffer_(nullptr), yuvData_(nullptr),
: QOpenGLWidget(parent), buffer_(nullptr), data_(nullptr),
vertexBuffer_(QOpenGLBuffer::VertexBuffer),
textureU_(QOpenGLTexture::Target2D),
textureV_(QOpenGLTexture::Target2D),
@@ -101,7 +101,7 @@ void ViewFinderGL::render(libcamera::FrameBuffer *buffer, MappedBuffer *map)
if (buffer_)
renderComplete(buffer_);
yuvData_ = static_cast<unsigned char *>(map->memory);
data_ = static_cast<unsigned char *>(map->memory);
update();
buffer_ = buffer;
}
@@ -346,7 +346,7 @@ void ViewFinderGL::doRender()
0,
GL_RED,
GL_UNSIGNED_BYTE,
yuvData_);
data_);
shaderProgram_.setUniformValue(textureUniformY_, 0);
/* Activate texture UV/VU */
@@ -360,7 +360,7 @@ void ViewFinderGL::doRender()
0,
GL_RG,
GL_UNSIGNED_BYTE,
yuvData_ + size_.width() * size_.height());
data_ + size_.width() * size_.height());
shaderProgram_.setUniformValue(textureUniformU_, 1);
break;
@@ -376,7 +376,7 @@ void ViewFinderGL::doRender()
0,
GL_RED,
GL_UNSIGNED_BYTE,
yuvData_);
data_);
shaderProgram_.setUniformValue(textureUniformY_, 0);
/* Activate texture U */
@@ -390,7 +390,7 @@ void ViewFinderGL::doRender()
0,
GL_RED,
GL_UNSIGNED_BYTE,
yuvData_ + size_.width() * size_.height());
data_ + size_.width() * size_.height());
shaderProgram_.setUniformValue(textureUniformU_, 1);
/* Activate texture V */
@@ -404,7 +404,7 @@ void ViewFinderGL::doRender()
0,
GL_RED,
GL_UNSIGNED_BYTE,
yuvData_ + size_.width() * size_.height() * 5 / 4);
data_ + size_.width() * size_.height() * 5 / 4);
shaderProgram_.setUniformValue(textureUniformV_, 2);
break;
@@ -420,7 +420,7 @@ void ViewFinderGL::doRender()
0,
GL_RED,
GL_UNSIGNED_BYTE,
yuvData_);
data_);
shaderProgram_.setUniformValue(textureUniformY_, 0);
/* Activate texture V */
@@ -434,7 +434,7 @@ void ViewFinderGL::doRender()
0,
GL_RED,
GL_UNSIGNED_BYTE,
yuvData_ + size_.width() * size_.height());
data_ + size_.width() * size_.height());
shaderProgram_.setUniformValue(textureUniformV_, 2);
/* Activate texture U */
@@ -448,7 +448,7 @@ void ViewFinderGL::doRender()
0,
GL_RED,
GL_UNSIGNED_BYTE,
yuvData_ + size_.width() * size_.height() * 5 / 4);
data_ + size_.width() * size_.height() * 5 / 4);
shaderProgram_.setUniformValue(textureUniformU_, 1);
break;
@@ -471,7 +471,7 @@ void ViewFinderGL::doRender()
0,
GL_RGBA,
GL_UNSIGNED_BYTE,
yuvData_);
data_);
shaderProgram_.setUniformValue(textureUniformY_, 0);
/*
@@ -497,7 +497,7 @@ void ViewFinderGL::paintGL()
<< "create fragment shader failed.";
}
if (yuvData_) {
if (data_) {
glClearColor(0.0, 0.0, 0.0, 1.0);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);

2
src/qcam/viewfinder_gl.h
View File

@@ -65,7 +65,7 @@ private:
libcamera::FrameBuffer *buffer_;
libcamera::PixelFormat format_;
QSize size_;
unsigned char *yuvData_;
unsigned char *data_;
/* Shaders */
QOpenGLShaderProgram shaderProgram_;