diff --git a/linphone-desktop/src/components/call/CallModel.cpp b/linphone-desktop/src/components/call/CallModel.cpp index 237b1289d..a4729a313 100644 --- a/linphone-desktop/src/components/call/CallModel.cpp +++ b/linphone-desktop/src/components/call/CallModel.cpp @@ -147,8 +147,8 @@ void CallModel::setPausedByUser (bool status) { } bool CallModel::getVideoInputEnabled () const { - // TODO - return false; + shared_ptr params = m_linphone_call->getRemoteParams(); + return params && params->videoEnabled() && getStatus() == CallStatusConnected; } void CallModel::setVideoInputEnabled (bool status) { @@ -156,8 +156,8 @@ void CallModel::setVideoInputEnabled (bool status) { } bool CallModel::getVideoOutputEnabled () const { - // TODO - return false; + shared_ptr params = m_linphone_call->getCurrentParams(); + return params && params->videoEnabled() && getStatus() == CallStatusConnected; } void CallModel::setVideoOutputEnabled (bool status) { diff --git a/linphone-desktop/src/components/call/CallModel.hpp b/linphone-desktop/src/components/call/CallModel.hpp index ae0280616..8ed51a543 100644 --- a/linphone-desktop/src/components/call/CallModel.hpp +++ b/linphone-desktop/src/components/call/CallModel.hpp @@ -12,12 +12,12 @@ class CallModel : public QObject { Q_PROPERTY(QString sipAddress READ getSipAddress CONSTANT); Q_PROPERTY(CallStatus status READ getStatus NOTIFY statusChanged); Q_PROPERTY(bool isOutgoing READ isOutgoing CONSTANT); - Q_PROPERTY(int duration READ getDuration CONSTANT); - Q_PROPERTY(float quality READ getQuality CONSTANT); + Q_PROPERTY(int duration READ getDuration CONSTANT); // Constant but called with a timer in qml. + Q_PROPERTY(float quality READ getQuality CONSTANT); // Same idea. Q_PROPERTY(bool microMuted READ getMicroMuted WRITE setMicroMuted NOTIFY microMutedChanged); Q_PROPERTY(bool pausedByUser READ getPausedByUser WRITE setPausedByUser NOTIFY statusChanged); - Q_PROPERTY(bool videoInputEnabled READ getVideoInputEnabled WRITE setVideoInputEnabled NOTIFY videoInputEnabled); - Q_PROPERTY(bool videoOutputEnabled READ getVideoOutputEnabled WRITE setVideoOutputEnabled NOTIFY videoOutputEnabled); + Q_PROPERTY(bool videoInputEnabled READ getVideoInputEnabled WRITE setVideoInputEnabled NOTIFY statusChanged); + Q_PROPERTY(bool videoOutputEnabled READ getVideoOutputEnabled WRITE setVideoOutputEnabled NOTIFY statusChanged); public: enum CallStatus { @@ -46,8 +46,6 @@ public: signals: void statusChanged (CallStatus status); void microMutedChanged (bool status); - void videoInputEnabled (bool status); - void videoOutputEnabled (bool status); private: QString getSipAddress () const; diff --git a/linphone-desktop/src/components/camera/Camera.cpp b/linphone-desktop/src/components/camera/Camera.cpp index 258912fc8..546f752b4 100644 --- a/linphone-desktop/src/components/camera/Camera.cpp +++ b/linphone-desktop/src/components/camera/Camera.cpp @@ -42,6 +42,7 @@ CameraRenderer::CameraRenderer (const Camera *camera) : m_camera(camera) {} QOpenGLFramebufferObject *CameraRenderer::createFramebufferObject (const QSize &size) { QOpenGLFramebufferObjectFormat format; format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil); + format.setInternalTextureFormat(GL_RGBA8); format.setSamples(4); ContextInfo *context_info = m_camera->m_context_info; diff --git a/linphone-desktop/ui/views/App/Calls/Incall.qml b/linphone-desktop/ui/views/App/Calls/Incall.qml index ba44f712b..41a029b77 100644 --- a/linphone-desktop/ui/views/App/Calls/Incall.qml +++ b/linphone-desktop/ui/views/App/Calls/Incall.qml @@ -113,7 +113,7 @@ Rectangle { Component.onCompleted: { var updateDuration = function () { - text = Utils .formatElapsedTime(call.duration) + text = Utils.formatElapsedTime(call.duration) Utils.setTimeout(elapsedTime, 1000, updateDuration) } diff --git a/submodules/linphone b/submodules/linphone index 75cd64d0b..9551c9118 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 75cd64d0bc04a8b38dfae2b2b6cdd0299607deef +Subproject commit 9551c9118a660453a3d01f2ffee8ae8750be66be