summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/qcam/format_converter.cpp27
-rw-r--r--src/qcam/format_converter.h11
2 files changed, 26 insertions, 12 deletions
diff --git a/src/qcam/format_converter.cpp b/src/qcam/format_converter.cpp
index d9088c38..192767c2 100644
--- a/src/qcam/format_converter.cpp
+++ b/src/qcam/format_converter.cpp
@@ -32,48 +32,48 @@ int FormatConverter::configure(unsigned int format, unsigned int width,
{
switch (format) {
case V4L2_PIX_FMT_BGR24:
- yuv_ = false;
+ formatFamily_ = RGB;
r_pos_ = 2;
g_pos_ = 1;
b_pos_ = 0;
bpp_ = 3;
break;
case V4L2_PIX_FMT_RGB24:
- yuv_ = false;
+ formatFamily_ = RGB;
r_pos_ = 0;
g_pos_ = 1;
b_pos_ = 2;
bpp_ = 3;
break;
case V4L2_PIX_FMT_ARGB32:
- yuv_ = false;
+ formatFamily_ = RGB;
r_pos_ = 1;
g_pos_ = 2;
b_pos_ = 3;
bpp_ = 4;
break;
case V4L2_PIX_FMT_VYUY:
- yuv_ = true;
+ formatFamily_ = YUV;
y_pos_ = 1;
cb_pos_ = 2;
break;
case V4L2_PIX_FMT_YVYU:
- yuv_ = true;
+ formatFamily_ = YUV;
y_pos_ = 0;
cb_pos_ = 3;
break;
case V4L2_PIX_FMT_UYVY:
- yuv_ = true;
+ formatFamily_ = YUV;
y_pos_ = 1;
cb_pos_ = 0;
break;
case V4L2_PIX_FMT_YUYV:
- yuv_ = true;
+ formatFamily_ = YUV;
y_pos_ = 0;
cb_pos_ = 1;
break;
case V4L2_PIX_FMT_MJPEG:
- yuv_ = false;
+ formatFamily_ = MJPEG;
break;
default:
return -EINVAL;
@@ -89,12 +89,17 @@ int FormatConverter::configure(unsigned int format, unsigned int width,
void FormatConverter::convert(const unsigned char *src, size_t size,
QImage *dst)
{
- if (format_ == V4L2_PIX_FMT_MJPEG)
+ switch (formatFamily_) {
+ case MJPEG:
dst->loadFromData(src, size, "JPEG");
- else if (yuv_)
+ break;
+ case YUV:
convertYUV(src, dst->bits());
- else
+ break;
+ case RGB:
convertRGB(src, dst->bits());
+ break;
+ };
}
void FormatConverter::convertRGB(const unsigned char *src, unsigned char *dst)
diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h
index 76cd9f1c..bca44aa3 100644
--- a/src/qcam/format_converter.h
+++ b/src/qcam/format_converter.h
@@ -20,6 +20,12 @@ public:
void convert(const unsigned char *src, size_t size, QImage *dst);
private:
+ enum FormatFamily {
+ MJPEG,
+ RGB,
+ YUV,
+ };
+
void convertRGB(const unsigned char *src, unsigned char *dst);
void convertYUV(const unsigned char *src, unsigned char *dst);
@@ -27,12 +33,15 @@ private:
unsigned int width_;
unsigned int height_;
+ enum FormatFamily formatFamily_;
+
+ /* RGB parameters */
unsigned int bpp_;
unsigned int r_pos_;
unsigned int g_pos_;
unsigned int b_pos_;
- bool yuv_;
+ /* YUV parameters */
unsigned int y_pos_;
unsigned int cb_pos_;
};