会议模块设置分辨率

okstar-org · Feb 4, 2025 · 07c720d · 07c720d
1 parent 72b5159
commit 07c720d
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/src/lib/backend/BaseService.cpp b/src/lib/backend/BaseService.cpp
@@ -28,4 +28,14 @@ BaseService::BaseService(const QString& baseUrl, QObject* parent)  //
 
 BaseService::~BaseService() {}
 
+void BaseService::setHeader(const QString& k, const QString& v)
+{
+    http->setHeader(k, v);
+}
+
+void BaseService::setLanguage(const QString &lang)
+{
+    http->setLanguage(lang);
+}
+
 }  // namespace lib::backend
diff --git a/src/lib/backend/BaseService.h b/src/lib/backend/BaseService.h
@@ -20,7 +20,7 @@
 #include <QString>
 #include <QList>
 
-#include "BaseService.h"
+#include "base/basic_types.h"
 #include "base/r.h"
 
 namespace lib::network {
@@ -179,13 +179,13 @@ class BaseService : public QObject {
 
     [[maybe_unused]] inline const QString& baseUrl() const { return _baseUrl; }
 
-    inline void setHeader(QString k, QString v) { http->setHeader(k, v); }
+    void setHeader(const QString &k, const QString &v);
 
-    inline void setLanguage(const QString& lang) { http->setLanguage(lang); }
+    void setLanguage(const QString& lang) ;
 
 protected:
     QString _baseUrl;
-    std::unique_ptr<lib::network::NetworkHttp> http;
+    std::unique_ptr<network::NetworkHttp> http;
 };
 
-}  // namespace ok::backend
+}  // namespace lib::backend
diff --git a/src/lib/backend/OkCloudService.h b/src/lib/backend/OkCloudService.h
@@ -14,7 +14,8 @@
 
 #include <QObject>
 
-#include <lib/backend/BaseService.h>
+#include "BaseService.h"
+#include "lib/network/NetworkHttp.h"
 #include "base/jsons.h"
 
 namespace lib::backend {

diff --git a/src/lib/backend/PassportService.h b/src/lib/backend/PassportService.h
@@ -18,9 +18,9 @@
 #include <memory>
 #include <string>
 
-#include <base/basic_types.h>
-
-#include <lib/backend/BaseService.h>
+#include "base/basic_types.h"
+#include "lib/network/NetworkHttp.h"
+#include "BaseService.h"
 
 namespace lib::backend {
 

diff --git a/src/modules/meet/src/MeetingOptionWidget.cpp b/src/modules/meet/src/MeetingOptionWidget.cpp
@@ -299,11 +299,6 @@ void CameraVideoOutputWidget::render(const lib::video::VideoDevice& device) {
 
     if(!_camera){
         _camera = lib::video::CameraSource::CreateInstance(device);
-        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) {
@@ -319,6 +314,12 @@ void CameraVideoOutputWidget::render(const lib::video::VideoDevice& device) {
     }
     // todo: 既然是单例，怎么保证多个订阅方选不同设备
     // lib::video::VideoMode mode{200, 400, 0, 0, 30};
+
+    modes = _camera->getVideoModes();
+    for(auto &m : modes){
+        qDebug() << "mode:" << m.toString().c_str();
+    }
+    _camera->setup(modes.front());
     _camera->openDevice();
     // _camera->subscribe();
 }

diff --git a/src/modules/platform/src/Backend.h b/src/modules/platform/src/Backend.h
@@ -15,8 +15,9 @@
 //
 #pragma once
 
-#include <base/jsons.h>
 #include <QObject>
+#include "base/jsons.h"
+#include "lib/network/NetworkHttp.h"
 #include "lib/backend/BaseService.h"
 
 namespace module::platform {