status-im
/
qzxing
mirror of https://github.com/status-im/qzxing.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Crop to capture rect directly when converting RGB to grayscale 

This improves the performance since we only need to convert the
actually interesting part of the frame, instead of the full frame.
This commit is contained in:
Milian Wolff 2016-12-19 18:20:47 +01:00
parent c882465649
commit 449a808972
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
examples/QZXingLive/QZXingFilter.cpp
View File

@ -108,24 +108,37 @@ QVideoFrame QZXingFilterRunnable::run(QVideoFrame * input, const QVideoSurfaceFo
static QImage rgbDataToGrayscale(const uchar* data, const int width, const int height, static QImage rgbDataToGrayscale(const uchar* data, const int width, const int height,
const int alpha, const int red, const int alpha, const int red,
const int green, const int blue, const int green, const int blue,
const QRect& captureRect,
const bool isPremultiplied = false) const bool isPremultiplied = false)
{ {
QImage image(width, height, QImage::Format_Grayscale8);
uchar* pixel = image.bits();
uchar* const pixelEnd = pixel + (width * height);
const int stride = (alpha < 0) ? 3 : 4; const int stride = (alpha < 0) ? 3 : 4;
for (; pixel != pixelEnd; ++pixel, data += stride) { const int startX = captureRect.x();
uchar r = data[red]; const int startY = captureRect.y();
uchar g = data[green]; const int targetWidth = captureRect.isNull() ? width : captureRect.width();
uchar b = data[blue]; const int targetHeight = captureRect.isNull() ? height : captureRect.height();
if (isPremultiplied) { const int endX = width - startX - targetWidth;
uchar a = data[alpha]; const int skipX = (endX + startX) * stride;
r = (uint(r) * 255) / a;
g = (uint(g) * 255) / a; QImage image(targetWidth, targetHeight, QImage::Format_Grayscale8);
b = (uint(b) * 255) / a; uchar* pixel = image.bits();
data += (startY * width + startX) * stride;
for (int y = 0; y < targetHeight; ++y) {
for (int x = 0; x < targetWidth; ++x) {
uchar r = data[red];
uchar g = data[green];
uchar b = data[blue];
if (isPremultiplied) {
uchar a = data[alpha];
r = (uint(r) * 255) / a;
g = (uint(g) * 255) / a;
b = (uint(b) * 255) / a;
}
*pixel = gray(r, g, b);
++pixel;
data += stride;
} }
*pixel = gray(r, g, b); data += skipX;
} }
return image; return image;
} }
@ -143,19 +156,19 @@ void QZXingFilterRunnable::processVideoFrameProbed(SimpleVideoFrame & videoFrame
/// Let's try to convert it from RGB formats /// Let's try to convert it from RGB formats
if (videoFrame.pixelFormat == QVideoFrame::Format_RGB32) if (videoFrame.pixelFormat == QVideoFrame::Format_RGB32)
image = rgbDataToGrayscale(data, width, height, -1, 1, 2, 3); image = rgbDataToGrayscale(data, width, height, -1, 1, 2, 3, captureRect);
else if (videoFrame.pixelFormat == QVideoFrame::Format_ARGB32) else if (videoFrame.pixelFormat == QVideoFrame::Format_ARGB32)
image = rgbDataToGrayscale(data, width, height, 0, 1, 2, 3); image = rgbDataToGrayscale(data, width, height, 0, 1, 2, 3, captureRect);
else if (videoFrame.pixelFormat == QVideoFrame::Format_ARGB32_Premultiplied) else if (videoFrame.pixelFormat == QVideoFrame::Format_ARGB32_Premultiplied)
image = rgbDataToGrayscale(data, width, height, 0, 1, 2, 3, true); image = rgbDataToGrayscale(data, width, height, 0, 1, 2, 3, captureRect, true);
else if (videoFrame.pixelFormat == QVideoFrame::Format_BGRA32) else if (videoFrame.pixelFormat == QVideoFrame::Format_BGRA32)
image = rgbDataToGrayscale(data, width, height, 3, 2, 1, 0); image = rgbDataToGrayscale(data, width, height, 3, 2, 1, 0, captureRect);
else if (videoFrame.pixelFormat == QVideoFrame::Format_BGRA32_Premultiplied) else if (videoFrame.pixelFormat == QVideoFrame::Format_BGRA32_Premultiplied)
image = rgbDataToGrayscale(data, width, height, 3, 2, 1, 0, true); image = rgbDataToGrayscale(data, width, height, 3, 2, 1, 0, captureRect, true);
else if (videoFrame.pixelFormat == QVideoFrame::Format_BGR32) else if (videoFrame.pixelFormat == QVideoFrame::Format_BGR32)
image = rgbDataToGrayscale(data, width, height, 3, 2, 1, 0); image = rgbDataToGrayscale(data, width, height, 3, 2, 1, 0, captureRect);
else if (videoFrame.pixelFormat == QVideoFrame::Format_BGR24) else if (videoFrame.pixelFormat == QVideoFrame::Format_BGR24)
image = rgbDataToGrayscale(data, width, height, -1, 2, 1, 0); image = rgbDataToGrayscale(data, width, height, -1, 2, 1, 0, captureRect);
/// This is a forced "conversion", colors end up swapped. /// This is a forced "conversion", colors end up swapped.
if(image.isNull() && videoFrame.pixelFormat == QVideoFrame::Format_BGR555) if(image.isNull() && videoFrame.pixelFormat == QVideoFrame::Format_BGR555)
@ -225,7 +238,7 @@ void QZXingFilterRunnable::processVideoFrameProbed(SimpleVideoFrame & videoFrame
return; return;
} }
if (!captureRect.isEmpty()) if (!captureRect.isEmpty() && image.size() != captureRect.size())
image = image.copy(captureRect); image = image.copy(captureRect);
// qDebug() << "image.size()" << image.size(); // qDebug() << "image.size()" << image.size();