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

Merge pull request #4121

Browse Source 
Yuri (1):
      style(video): Simplified ifdefs, made them USING_V4L to be explicit.
This commit is contained in:
sudden6 2017-02-06 15:15:48 +01:00
commit a6bc9db188
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/video/cameradevice.cpp
View File

@ -28,10 +28,12 @@ extern "C" {
#include "cameradevice.h"
#include "src/persistence/settings.h"
#define USING_V4L defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#ifdef Q_OS_WIN
#include "src/platform/camera/directshow.h"
#endif
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
#include "src/platform/camera/v4l2.h"
#endif
#ifdef Q_OS_OSX
@ -150,7 +152,7 @@ CameraDevice* CameraDevice::open(QString devName, VideoMode mode)
AVDictionary* options = nullptr;
if (!iformat);
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
else if (devName.startsWith("x11grab#"))
{
QSize screen;
@ -359,7 +361,7 @@ QVector<QPair<QString, QString>> CameraDevice::getDeviceList()
else if (iformat->name == QString("dshow"))
devices += DirectShow::getDeviceList();
#endif
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
else if (iformat->name == QString("video4linux2,v4l2"))
devices += v4l2::getDeviceList();
#endif
@ -467,7 +469,7 @@ QVector<VideoMode> CameraDevice::getVideoModes(QString devName)
else if (iformat->name == QString("dshow"))
return DirectShow::getDeviceModes(devName);
#endif
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
else if (iformat->name == QString("video4linux2,v4l2"))
return v4l2::getDeviceModes(devName);
#endif
@ -488,7 +490,7 @@ QVector<VideoMode> CameraDevice::getVideoModes(QString devName)
*/
QString CameraDevice::getPixelFormatString(uint32_t pixel_format)
{
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
return v4l2::getPixelFormatString(pixel_format);
#else
return QString("unknown");
@ -504,7 +506,7 @@ QString CameraDevice::getPixelFormatString(uint32_t pixel_format)
*/
bool CameraDevice::betterPixelFormat(uint32_t a, uint32_t b)
{
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
return v4l2::betterPixelFormat(a, b);
#else
return false;
@ -524,7 +526,7 @@ bool CameraDevice::getDefaultInputFormat()
avdevice_register_all();
// Desktop capture input formats
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
idesktopFormat = av_find_input_format("x11grab");
#endif
#ifdef Q_OS_WIN
@ -532,7 +534,7 @@ bool CameraDevice::getDefaultInputFormat()
#endif
// Webcam input formats
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
#if USING_V4L
if ((iformat = av_find_input_format("v4l2")))
return true;
#endif