StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Don't use tagged init

Browse Source
This commit is contained in:
tux3 2015-06-01 22:07:22 +02:00
parent 8e866b1a5e
commit 3cf10f02a6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/platform/camera/v4l2.cpp
View File

@ -46,7 +46,10 @@ fail:
static QVector<unsigned short> getDeviceModeFramerates(int fd, unsigned w, unsigned h, uint32_t pixelFormat) static QVector<unsigned short> getDeviceModeFramerates(int fd, unsigned w, unsigned h, uint32_t pixelFormat)
{ {
QVector<unsigned short> rates; QVector<unsigned short> rates;
v4l2_frmivalenum vfve = { .pixel_format = pixelFormat, .height = h, .width = w }; v4l2_frmivalenum vfve{};
vfve.pixel_format = pixelFormat;
vfve.height = h;
vfve.width = w;
while(!ioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &vfve)) { while(!ioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &vfve)) {
int rate; int rate;
@ -75,12 +78,14 @@ QVector<VideoMode> v4l2::getDeviceModes(QString devName)
int fd = deviceOpen(devName); int fd = deviceOpen(devName);
if (fd < 0) if (fd < 0)
return modes; return modes;
v4l2_fmtdesc vfd = { .type = V4L2_BUF_TYPE_VIDEO_CAPTURE }; v4l2_fmtdesc vfd{};
vfd.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
while(!ioctl(fd, VIDIOC_ENUM_FMT, &vfd)) { while(!ioctl(fd, VIDIOC_ENUM_FMT, &vfd)) {
vfd.index++; vfd.index++;
v4l2_frmsizeenum vfse = { .pixel_format = vfd.pixelformat }; v4l2_frmsizeenum vfse{};
vfse.pixel_format = vfd.pixelformat;
while(!ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &vfse)) { while(!ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &vfse)) {
VideoMode mode; VideoMode mode;