1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #5494

Teemu Ikonen (1):
      fix(video): support UYVY camera pixel format
This commit is contained in:
Anthony Bilinski 2019-01-16 03:01:23 -08:00
commit 67ddd849f0
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C

View File

@ -43,6 +43,7 @@ static std::map<uint32_t, uint8_t> createPixFmtToQuality()
m[V4L2_PIX_FMT_H264] = 3; m[V4L2_PIX_FMT_H264] = 3;
m[V4L2_PIX_FMT_MJPEG] = 2; m[V4L2_PIX_FMT_MJPEG] = 2;
m[V4L2_PIX_FMT_YUYV] = 1; m[V4L2_PIX_FMT_YUYV] = 1;
m[V4L2_PIX_FMT_UYVY] = 1;
return m; return m;
} }
const std::map<uint32_t, uint8_t> pixFmtToQuality = createPixFmtToQuality(); const std::map<uint32_t, uint8_t> pixFmtToQuality = createPixFmtToQuality();
@ -53,6 +54,7 @@ static std::map<uint32_t, QString> createPixFmtToName()
m[V4L2_PIX_FMT_H264] = QString("h264"); m[V4L2_PIX_FMT_H264] = QString("h264");
m[V4L2_PIX_FMT_MJPEG] = QString("mjpeg"); m[V4L2_PIX_FMT_MJPEG] = QString("mjpeg");
m[V4L2_PIX_FMT_YUYV] = QString("yuyv422"); m[V4L2_PIX_FMT_YUYV] = QString("yuyv422");
m[V4L2_PIX_FMT_UYVY] = QString("uyvy422");
return m; return m;
} }
const std::map<uint32_t, QString> pixFmtToName = createPixFmtToName(); const std::map<uint32_t, QString> pixFmtToName = createPixFmtToName();