Display webcam pixel format in wizard

[kdenlive] / src / v4l / v4lcapture.cpp

diff --git a/src/v4l/v4lcapture.cpp b/src/v4l/v4lcapture.cpp
index 013a7c80c79dacc4b9b908b103a541afb78413cf..c067a3a2bb766dd8fe95c0dc366157526c37a3fe 100644 (file)
--- a/src/v4l/v4lcapture.cpp
+++ b/src/v4l/v4lcapture.cpp
@@ -96,7 +96,7 @@ V4lCaptureHandler::V4lCaptureHandler(QVBoxLayout *lay, QWidget *parent):
     lay->addWidget(m_display);
 }
 
-QString V4lCaptureHandler::getDeviceName(QString input, int *width, int *height)
+QStringList V4lCaptureHandler::getDeviceName(QString input)
 {
     fswebcam_config_t *config;
     /* Prepare the configuration structure. */
@@ -104,7 +104,7 @@ QString V4lCaptureHandler::getDeviceName(QString input, int *width, int *height)
     if (!config) {
         /*WARN("Out of memory.");*/
         fprintf(stderr, "Out of MEM....");
-        return input;
+        return QStringList() << input;
     }
 
     /* Set the defaults. */
@@ -154,9 +154,13 @@ QString V4lCaptureHandler::getDeviceName(QString input, int *width, int *height)
     v4lsrc.fps        = config->fps;
     v4lsrc.option     = config->option;
     char *source = config->device;
-    QString deviceName = src_query(&v4lsrc, source, width, height);
-    kDebug() << "DEVIE NAME: " << deviceName << ".";
-    return deviceName.isEmpty() ? input : deviceName;
+    int width = 0;
+    int height = 0;
+    char *pixelformat;
+    QString deviceName = src_query(&v4lsrc, source, &width, &height, &pixelformat);
+    QStringList result;
+    result << (deviceName.isEmpty() ? input : deviceName) << (width == 0 ? QString() : QString("%1x%2").arg(width).arg(height)) << QString(pixelformat);
+    return result;
 }
 
 void V4lCaptureHandler::startPreview(int /*deviceId*/, int /*captureMode*/, bool)