|
|
|
|
@ -86,7 +86,7 @@ CameraDevice::CameraDevice(const QString& devName_, AVFormatContext* context_)
@@ -86,7 +86,7 @@ CameraDevice::CameraDevice(const QString& devName_, AVFormatContext* context_)
|
|
|
|
|
{ |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
CameraDevice* CameraDevice::open(Settings& settings, QString devName, AVDictionary** options) |
|
|
|
|
CameraDevice* CameraDevice::open(QString devName, AVDictionary** options) |
|
|
|
|
{ |
|
|
|
|
openDeviceLock.lock(); |
|
|
|
|
AVFormatContext* fctx = nullptr; |
|
|
|
|
@ -151,7 +151,7 @@ out:
@@ -151,7 +151,7 @@ out:
|
|
|
|
|
* @param mode Mode of device to open. |
|
|
|
|
* @return CameraDevice if the device could be opened, nullptr otherwise. |
|
|
|
|
*/ |
|
|
|
|
CameraDevice* CameraDevice::open(Settings& settings, QString devName, VideoMode mode) |
|
|
|
|
CameraDevice* CameraDevice::open(QString devName, VideoMode mode) |
|
|
|
|
{ |
|
|
|
|
if (!getDefaultInputFormat()) |
|
|
|
|
return nullptr; |
|
|
|
|
@ -237,7 +237,7 @@ CameraDevice* CameraDevice::open(Settings& settings, QString devName, VideoMode
@@ -237,7 +237,7 @@ CameraDevice* CameraDevice::open(Settings& settings, QString devName, VideoMode
|
|
|
|
|
std::ignore = mode; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
CameraDevice* dev = open(settings, devName, &options); |
|
|
|
|
CameraDevice* dev = open(devName, &options); |
|
|
|
|
if (options) { |
|
|
|
|
av_dict_free(&options); |
|
|
|
|
} |
|
|
|
|
|