Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
7e48e81c
Commit
7e48e81c
authored
Jan 31, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(src/components/camera/Camera): provide values for video input/output
parent
7cc5c65c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
12 deletions
+11
-12
CallModel.cpp
linphone-desktop/src/components/call/CallModel.cpp
+4
-4
CallModel.hpp
linphone-desktop/src/components/call/CallModel.hpp
+4
-6
Camera.cpp
linphone-desktop/src/components/camera/Camera.cpp
+1
-0
Incall.qml
linphone-desktop/ui/views/App/Calls/Incall.qml
+1
-1
linphone
submodules/linphone
+1
-1
No files found.
linphone-desktop/src/components/call/CallModel.cpp
View file @
7e48e81c
...
...
@@ -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
)
{
...
...
linphone-desktop/src/components/call/CallModel.hpp
View file @
7e48e81c
...
...
@@ -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
videoInputEnabl
ed
);
Q_PROPERTY
(
bool
videoOutputEnabled
READ
getVideoOutputEnabled
WRITE
setVideoOutputEnabled
NOTIFY
videoOutputEnabl
ed
);
Q_PROPERTY
(
bool
videoInputEnabled
READ
getVideoInputEnabled
WRITE
setVideoInputEnabled
NOTIFY
statusChang
ed
);
Q_PROPERTY
(
bool
videoOutputEnabled
READ
getVideoOutputEnabled
WRITE
setVideoOutputEnabled
NOTIFY
statusChang
ed
);
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
;
...
...
linphone-desktop/src/components/camera/Camera.cpp
View file @
7e48e81c
...
...
@@ -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
;
...
...
linphone-desktop/ui/views/App/Calls/Incall.qml
View file @
7e48e81c
...
...
@@ -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
)
}
...
...
linphone
@
9551c911
Subproject commit
75cd64d0bc04a8b38dfae2b2b6cdd0299607deef
Subproject commit
9551c9118a660453a3d01f2ffee8ae8750be66be
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment