From 5cc051db24e150f0d9ed8a93610c9d07512236a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 29 Feb 2016 14:50:26 -0500
Subject: [PATCH] media_video: reduce default resolution from 720p to 640p
Change-Id: I3d3cf3e11625ef52beedf514e903a997648ce74a
Tuleap: #430
---
src/media/video/video_device.h | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/media/video/video_device.h b/src/media/video/video_device.h
index 125538adfd..eca344e7a6 100644
--- a/src/media/video/video_device.h
+++ b/src/media/video/video_device.h
@@ -90,11 +90,14 @@ public:
}
/* Default setting is found by using following rules:
- * - frame height <= 720 pixels
+ * - frame height <= 640 pixels
* - frame rate >= 10 fps
*/
VideoSettings getDefaultSettings() const {
auto settings = getSettings();
+ auto channels = getChannelList();
+ if (channels.empty())
+ return {};
settings.channel = getChannelList().front();
VideoSize max_size {0, 0};
@@ -102,7 +105,7 @@ public:
auto sizes = getSizeList(settings.channel);
for (auto& s : sizes) {
- if (s.second > 720)
+ if (s.second > 640)
continue;
auto rates = getRateList(settings.channel, s);
if (rates.empty())
--
GitLab