fix video settings

src/lib/video/cameradevice.cpp

@@ -542,14 +542,16 @@ QVector<VideoMode> CameraDevice::getScreenModes() {
  * @param devName Device name to get nodes from.
  * @return Vector of available modes for the device.
  */
-QVector<VideoMode> CameraDevice::getVideoModes() {
+QVector<VideoMode> CameraDevice::getVideoModes() const {
 
     auto devName = videoDevice.name;
     auto iformat = getDefaultInputFormat(videoDevice.type);
     if(!iformat){
         return {};
     }
 
+    qDebug() << "format name is" << iformat->name;
+
     //如果是屏幕
     if (isScreen(videoDevice.url))
         return getScreenModes();
@@ -560,7 +562,7 @@ QVector<VideoMode> CameraDevice::getVideoModes() {
 #endif
 #if USING_V4L
     if (iformat->name == QString("video4linux2,v4l2"))
-        return v4l2::getDeviceModes(devName);
+        return v4l2::getDeviceModes(videoDevice.url);
 #endif
 #ifdef Q_OS_OSX
     if (iformat->name == QString("avfoundation"))

src/lib/video/cameradevice.h

@@ -41,7 +41,7 @@ class CameraDevice {
 
     static QVector<VideoDevice> getDeviceList();
 
-    QVector<VideoMode> getVideoModes();
+    QVector<VideoMode> getVideoModes() const;
 
     static QString getPixelFormatString(uint32_t pixel_format);
     static bool betterPixelFormat(uint32_t a, uint32_t b);

src/lib/video/camerasource.cpp

@@ -39,6 +39,9 @@ CameraSource::CameraSource(const VideoDevice &dev)
 {
     qDebug() << __func__;
 
+    // Crate camera device
+    device = new CameraDevice(dev, this);
+
     qRegisterMetaType<VideoMode>("VideoMode");
     deviceThread->setObjectName("Device thread");
     deviceThread->start();
@@ -92,6 +95,11 @@ void CameraSource::setupDefault() {
     setupDevice(deviceName, mode);
 }
 
+void CameraSource::setup(const VideoMode &vm)
+{
+    mode = vm;
+}
+
 void CameraSource::setupDevice(const QString& deviceName_, const VideoMode& Mode) {
 
 }
@@ -139,9 +147,11 @@ void CameraSource::openDevice() {
     auto deviceName = dev.name;
     qDebug() << "Opening device" << deviceName;
 
+    if(!device){
+        // Crate camera device
+        device = new CameraDevice(dev, this);
+    }
 
-    // Crate camera device
-    device = new CameraDevice(dev, this);
     // We need to create a new CameraDevice(Enable camera light)
     bool opened = device->open(mode);
     if (!opened) {

src/lib/video/camerasource.h

@@ -40,6 +40,7 @@ class CameraSource : public VideoSource, public FrameHandler {
 
 
     void setupDefault();
+    void setup(const VideoMode& mode);
 
     // VideoSource interface
     void subscribe() override;

src/lib/video/videomode.cpp

@@ -11,6 +11,8 @@
  */
 
 #include "videomode.h"
+
+#include "cameradevice.h"
 namespace lib::video {
 
 /**
@@ -49,15 +51,21 @@ uint32_t VideoMode::norm(const VideoMode& other) const {
 // 容忍
 uint32_t VideoMode::tolerance() const {
     constexpr uint32_t minTolerance = 300;  // keep wider tolerance for low res cameras
-    constexpr uint32_t toleranceFactor =
-            10;  // video mode must be within 10% to be "close enough" to ideal
+    constexpr uint32_t toleranceFactor = 10;  // video mode must be within 10% to be "close enough" to ideal
     return std::max((width + height) / toleranceFactor, minTolerance);
 }
 
+std::string VideoMode::toString()
+{
+    return std::format("w:{} h:{}, x:{} y:{} FPS:{} format:{}",
+                       width, height, x, y, FPS,
+                       CameraDevice::getPixelFormatString(pixel_format).toStdString());
+}
+
 /**
  * @brief All zeros means a default/unspecified mode
  */
 VideoMode::operator bool() const {
     return width || height || static_cast<int>(FPS);
 }
-}  // namespace lib::video
+}  // namespace lib::video

src/lib/video/videomode.h

@@ -13,9 +13,11 @@
 #ifndef VIDEOMODE_H
 #define VIDEOMODE_H
 
+#include <cstdint>
+#include <format>
 #include <QString>
 #include <QRect>
-#include <cstdint>
+
 
 namespace lib::video {
 
@@ -48,6 +50,8 @@ struct VideoMode {
     bool operator==(const VideoMode& other) const;
     uint32_t norm(const VideoMode& other) const;
     uint32_t tolerance() const;
+
+    std::string toString();
 };
 
 

src/modules/im/src/widget/form/settings/avform.cpp

@@ -174,7 +174,8 @@ void AVForm::open(const QString& devName, const lib::video::VideoMode& mode) {
     QRect rect = mode.toRect();
     videoSettings->setCamVideoRes(rect);
     videoSettings->setCamVideoFPS(static_cast<float>(mode.FPS));
-    camera->setupDevice(devName, mode);
+    camera->setup(mode);
+    camera->openDevice();
 }
 
 void AVForm::trackNewScreenGeometry(QScreen* qScreen) {
@@ -320,15 +321,11 @@ void AVForm::fillCameraModesComboBox() {
 
     for (int i = 0; i < videoModes.size(); ++i) {
         lib::video::VideoMode mode = videoModes[i];
+        qDebug() << mode.toString().c_str();
 
         QString str;
-        std::string pixelFormat =
-                lib::video::CameraDevice::getPixelFormatString(mode.pixel_format).toStdString();
-        qDebug("width: %d, height: %d, FPS: %f, pixel format: %s\n", mode.width, mode.height,
-               mode.FPS, pixelFormat.c_str());
-
         if (mode.height && mode.width) {
-            str += QString("%1p").arg(mode.height);
+            str += QString("%1x%2p").arg(mode.width).arg(mode.height);
         } else {
             str += tr("Default resolution");
         }

src/modules/meet/src/MeetingOptionWidget.cpp

@@ -299,6 +299,11 @@ void CameraVideoOutputWidget::render(const lib::video::VideoDevice& device) {
     is_stop = false;
     if(!_camera){
         _camera = lib::video::CameraSource::CreateInstance(device);
+        auto modes = _camera->getVideoModes();
+        for(auto &m : modes){
+            qDebug() << "mode" << m.toString().c_str();
+        }
+
         connect(_camera.get(), &lib::video::CameraSource::frameAvailable, this,
                 [this](std::shared_ptr<lib::video::VideoFrame> frame) {
                     lastFrame = std::move(frame);