mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-31 02:49:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(src/components/camera/Camera): provide values for video input/output

Browse source
This commit is contained in:
Ronan Abhamon 2017-01-31 15:18:28 +01:00
parent 7cc5c65c46
commit 7e48e81c70
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linphone-desktop/src/components/call/CallModel.cpp
View file

@ -147,8 +147,8 @@ void CallModel::setPausedByUser (bool status) {
}
bool CallModel::getVideoInputEnabled () const {
// TODO
return false;
shared_ptr<linphone::CallParams> 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<linphone::CallParams> params = m_linphone_call->getCurrentParams();
return params && params->videoEnabled() && getStatus() == CallStatusConnected;
}
void CallModel::setVideoOutputEnabled (bool status) {

10
linphone-desktop/src/components/call/CallModel.hpp
View file

@ -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;

1
linphone-desktop/src/components/camera/Camera.cpp
View file

@ -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;

2
linphone-desktop/ui/views/App/Calls/Incall.qml
View file

@ -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)
}

2
submodules/linphone

@ -1 +1 @@
Subproject commit 75cd64d0bc04a8b38dfae2b2b6cdd0299607deef
Subproject commit 9551c9118a660453a3d01f2ffee8ae8750be66be