mirror of
https://github.com/Lime3DS/Lime3DS
synced 2024-12-27 01:22:37 -06:00
QtMultimediaCamera: fix invalid settings
This commit is contained in:
parent
7c48160beb
commit
a15e4e80c6
1 changed files with 5 additions and 2 deletions
|
@ -93,9 +93,11 @@ void QtMultimediaCamera::SetFrameRate(Service::CAM::FrameRate frame_rate) {
|
||||||
|
|
||||||
auto framerate = FrameRateList[static_cast<int>(frame_rate)];
|
auto framerate = FrameRateList[static_cast<int>(frame_rate)];
|
||||||
|
|
||||||
|
if (handler->camera->supportedViewfinderFrameRateRanges().contains(framerate)) {
|
||||||
handler->settings.setMinimumFrameRate(framerate.minimumFrameRate);
|
handler->settings.setMinimumFrameRate(framerate.minimumFrameRate);
|
||||||
handler->settings.setMaximumFrameRate(framerate.maximumFrameRate);
|
handler->settings.setMaximumFrameRate(framerate.maximumFrameRate);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
QImage QtMultimediaCamera::QtReceiveFrame() {
|
QImage QtMultimediaCamera::QtReceiveFrame() {
|
||||||
QMutexLocker locker(&handler->camera_surface.mutex);
|
QMutexLocker locker(&handler->camera_surface.mutex);
|
||||||
|
@ -171,6 +173,7 @@ void QtMultimediaCameraHandler::CreateCamera(const std::string& camera_name) {
|
||||||
settings.setMinimumFrameRate(30);
|
settings.setMinimumFrameRate(30);
|
||||||
settings.setMaximumFrameRate(30);
|
settings.setMaximumFrameRate(30);
|
||||||
camera->setViewfinder(&camera_surface);
|
camera->setViewfinder(&camera_surface);
|
||||||
|
camera->load();
|
||||||
}
|
}
|
||||||
|
|
||||||
void QtMultimediaCameraHandler::StopCamera() {
|
void QtMultimediaCameraHandler::StopCamera() {
|
||||||
|
|
Loading…
Reference in a new issue