video: add black background in previewrenderer and flow optimization

Change-Id: I979dcc7d7a65029a1ee361579e51575ea813f0e7

src/avadapter.cpp

@@ -66,13 +66,19 @@ AvAdapter::populateVideoDeviceContextMenuItem()
 void
 AvAdapter::onVideoContextMenuDeviceItemClicked(const QString& deviceName)
 {
+    auto* convModel = LRCInstance::getCurrentConversationModel();
+    const auto conversation = convModel->getConversationForUID(LRCInstance::getCurrentConvUid());
+    auto call = LRCInstance::getCallInfoForConversation(conversation);
+    if (!call)
+        return;
+
     auto deviceId = LRCInstance::avModel().getDeviceIdFromName(deviceName);
     if (deviceId.isEmpty()) {
         qWarning() << "Couldn't find device: " << deviceName;
         return;
     }
-    LRCInstance::avModel().switchInputTo(deviceId);
     LRCInstance::avModel().setCurrentVideoCaptureDevice(deviceId);
+    LRCInstance::avModel().switchInputTo(deviceId, call->id);
 }
 
 void
@@ -179,8 +185,9 @@ AvAdapter::slotDeviceEvent()
             avModel.switchInputTo({}, callId);
             avModel.stopPreview();
         } else if (deviceEvent == DeviceEvent::RemovedCurrent && currentDeviceListSize > 0) {
-            avModel.switchInputTo(defaultDevice, callId);
+            avModel.setDefaultDevice(defaultDevice);
             avModel.setCurrentVideoCaptureDevice(defaultDevice);
+            avModel.switchInputTo(defaultDevice, callId);
         }
     };
 
@@ -190,14 +197,18 @@ AvAdapter::slotDeviceEvent()
                               [cb] { QtConcurrent::run([cb]() { cb(); }); });
     } else {
         if (deviceEvent == DeviceEvent::Added && currentDeviceListSize == 1) {
-            avModel.switchInputTo(defaultDevice, callId);
+            avModel.setDefaultDevice(defaultDevice);
             avModel.setCurrentVideoCaptureDevice(defaultDevice);
+            if (callId.isEmpty())
+                LRCInstance::renderer()->startPreviewing();
+            else
+                avModel.switchInputTo(defaultDevice, callId);
         } else {
             cb();
         }
     }
 
-    emit videoDeviceListChanged();
+    emit videoDeviceListChanged(currentDeviceListSize == 0);
 
     deviceListSize_ = currentDeviceListSize;
 }

src/avadapter.h

@@ -37,7 +37,7 @@ signals:
     /*
      * Emitted when the size of the video capture device list changes.
      */
-    void videoDeviceListChanged();
+    void videoDeviceListChanged(bool listIsEmpty);
 
 protected:
     void safeInit() override {};

src/mainview/components/VideoCallPage.qml

@@ -244,6 +244,14 @@ Rectangle {
                         }
                     }
 
+                    Connections {
+                        target: AvAdapter
+
+                        function onVideoDeviceListChanged(listIsEmpty) {
+                            previewRenderer.visible = !listIsEmpty
+                        }
+                    }
+
                     width: Math.max(videoCallPageMainRect.width / 5, JamiTheme.minimumPreviewWidth)
                     x: videoCallPageMainRect.width - previewRenderer.width - previewMargin
                     y: videoCallPageMainRect.height - previewRenderer.height - previewMargin - 56 // Avoid overlay

src/previewrenderer.cpp

@@ -32,11 +32,16 @@ PreviewRenderer::PreviewRenderer(QQuickItem* parent)
     previewFrameUpdatedConnection_ = connect(LRCInstance::renderer(),
                                              &RenderManager::previewFrameUpdated,
                                              [this]() { update(QRect(0, 0, width(), height())); });
+
+    previewRenderingStopped_ = connect(LRCInstance::renderer(),
+                                       &RenderManager::previewRenderingStopped,
+                                       [this]() { update(QRect(0, 0, width(), height())); });
 }
 
 PreviewRenderer::~PreviewRenderer()
 {
     disconnect(previewFrameUpdatedConnection_);
+    disconnect(previewRenderingStopped_);
 }
 
 void
@@ -63,11 +68,23 @@ PreviewRenderer::paint(QPainter* painter)
         scaledPreview = previewImage->scaled(size().toSize(), Qt::KeepAspectRatio);
         painter->drawImage(QRect(0, 0, scaledPreview.width(), scaledPreview.height()),
                            scaledPreview);
+    } else {
+        paintBackground(painter);
     }
 }
 
+void
+PreviewRenderer::paintBackground(QPainter* painter)
+{
+    QBrush brush(Qt::black);
+    QPainterPath path;
+    path.addRect(QRect(0, 0, width(), height()));
+    painter->fillPath(path, brush);
+}
+
 VideoCallPreviewRenderer::VideoCallPreviewRenderer(QQuickItem* parent)
-    : PreviewRenderer(parent) {
+    : PreviewRenderer(parent)
+{
     setProperty("previewImageScalingFactor", 1.0);
 }
 
@@ -79,7 +96,7 @@ VideoCallPreviewRenderer::paint(QPainter* painter)
     auto previewImage = LRCInstance::renderer()->getPreviewFrame();
     if (previewImage) {
         auto scalingFactor = static_cast<qreal>(previewImage->height())
-                / static_cast<qreal>(previewImage->width());
+                             / static_cast<qreal>(previewImage->width());
         setProperty("previewImageScalingFactor", scalingFactor);
         QImage scaledPreview;
         scaledPreview = previewImage->scaled(size().toSize(), Qt::KeepAspectRatio);

src/previewrenderer.h

@@ -34,16 +34,18 @@ public:
 
 protected:
     void paint(QPainter* painter) override;
+    void paintBackground(QPainter* painter);
 
 private:
     QMetaObject::Connection previewFrameUpdatedConnection_;
+    QMetaObject::Connection previewRenderingStopped_;
 };
 
 class VideoCallPreviewRenderer : public PreviewRenderer
 {
     Q_OBJECT
-    Q_PROPERTY(qreal previewImageScalingFactor MEMBER previewImageScalingFactor_
+    Q_PROPERTY(qreal previewImageScalingFactor MEMBER previewImageScalingFactor_ NOTIFY
-               NOTIFY previewImageScalingFactorChanged)
+                   previewImageScalingFactorChanged)
 public:
     explicit VideoCallPreviewRenderer(QQuickItem* parent = 0);
     virtual ~VideoCallPreviewRenderer();

src/settingsview/components/VideoSettings.qml

@@ -49,10 +49,18 @@ ColumnLayout {
     function populateVideoSettings() {
         deviceComboBoxSetting.comboModel.reset()
 
-        var count = deviceComboBoxSetting.comboModel.deviceCount() > 0
+        var count = deviceComboBoxSetting.comboModel.deviceCount()
-        deviceComboBoxSetting.setEnabled(count)
+        var deviceListIsEmpty = count === 0
-        resolutionComboBoxSetting.setEnabled(count)
+
-        fpsComboBoxSetting.setEnabled(count)
+        previewWidget.visible = count > 0
+        deviceComboBoxSetting.setEnabled(count > 0)
+        resolutionComboBoxSetting.setEnabled(count > 0)
+        fpsComboBoxSetting.setEnabled(count > 0)
+
+        if (deviceListIsEmpty) {
+            resolutionComboBoxSetting.comboModel.reset()
+            fpsComboBoxSetting.comboModel.reset()
+        }
 
         deviceComboBoxSetting.setCurrentIndex(
                     deviceComboBoxSetting.comboModel.getCurrentSettingIndex(), true)
@@ -71,8 +79,11 @@ ColumnLayout {
                 return
             }
 
-            AVModel.setCurrentVideoCaptureDevice(deviceId)
+            if (AVModel.getCurrentVideoCaptureDevice() !== deviceId) {
-            AVModel.setDefaultDevice(deviceId)
+                AVModel.setCurrentVideoCaptureDevice(deviceId)
+                AVModel.setDefaultDevice(deviceId)
+            }
+
             setFormatListForCurrentDevice()
             startPreviewing()
         } catch(err){ console.warn(err.message) }
@@ -99,6 +110,7 @@ ColumnLayout {
         var resolution
         var rate
         if(isResolutionIndex) {
+            fpsComboBoxSetting.comboModel.reset()
             resolution = resolutionComboBoxSetting.comboModel.data(
                         resolutionComboBoxSetting.comboModel.index(index, 0),
                         VideoFormatResolutionModel.Resolution)