Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
3e87dad8
Commit
3e87dad8
authored
5 years ago
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
video_rtp_session: check videoLocal_, cleanup
Change-Id: I4eae6ca5a1725ca2a754b743954c3bc43603aaf0
parent
c6d8b696
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/media/video/video_rtp_session.cpp
+10
-12
10 additions, 12 deletions
src/media/video/video_rtp_session.cpp
with
10 additions
and
12 deletions
src/media/video/video_rtp_session.cpp
+
10
−
12
View file @
3e87dad8
...
@@ -520,7 +520,7 @@ VideoRtpSession::setNewBitrate(unsigned int newBR)
...
@@ -520,7 +520,7 @@ VideoRtpSession::setNewBitrate(unsigned int newBR)
storeVideoBitrateInfo
();
storeVideoBitrateInfo
();
#if __ANDROID__
#if __ANDROID__
auto
input_device
=
std
::
stat
ic_pointer_cast
<
VideoInput
>
(
videoLocal_
)
;
if
(
auto
input_device
=
std
::
dynam
ic_pointer_cast
<
VideoInput
>
(
videoLocal_
)
)
emitSignal
<
DRing
::
VideoSignal
::
SetBitrate
>
(
input_device
->
getParams
().
name
,
(
int
)
newBR
);
emitSignal
<
DRing
::
VideoSignal
::
SetBitrate
>
(
input_device
->
getParams
().
name
,
(
int
)
newBR
);
#endif
#endif
...
@@ -555,9 +555,7 @@ VideoRtpSession::setupVideoBitrateInfo() {
...
@@ -555,9 +555,7 @@ VideoRtpSession::setupVideoBitrateInfo() {
void
void
VideoRtpSession
::
storeVideoBitrateInfo
()
{
VideoRtpSession
::
storeVideoBitrateInfo
()
{
auto
codecVideo
=
std
::
static_pointer_cast
<
jami
::
AccountVideoCodecInfo
>
(
send_
.
codec
);
if
(
auto
codecVideo
=
std
::
static_pointer_cast
<
jami
::
AccountVideoCodecInfo
>
(
send_
.
codec
))
{
if
(
codecVideo
)
{
codecVideo
->
setCodecSpecifications
({
codecVideo
->
setCodecSpecifications
({
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
BITRATE
,
std
::
to_string
(
videoBitrateInfo_
.
videoBitrateCurrent
)},
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
BITRATE
,
std
::
to_string
(
videoBitrateInfo_
.
videoBitrateCurrent
)},
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
MIN_BITRATE
,
std
::
to_string
(
videoBitrateInfo_
.
videoBitrateMin
)},
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
MIN_BITRATE
,
std
::
to_string
(
videoBitrateInfo_
.
videoBitrateMin
)},
...
@@ -566,6 +564,7 @@ VideoRtpSession::storeVideoBitrateInfo() {
...
@@ -566,6 +564,7 @@ VideoRtpSession::storeVideoBitrateInfo() {
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
MIN_QUALITY
,
std
::
to_string
(
videoBitrateInfo_
.
videoQualityMin
)},
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
MIN_QUALITY
,
std
::
to_string
(
videoBitrateInfo_
.
videoQualityMin
)},
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
MAX_QUALITY
,
std
::
to_string
(
videoBitrateInfo_
.
videoQualityMax
)}
{
DRing
::
Account
::
ConfProperties
::
CodecInfo
::
MAX_QUALITY
,
std
::
to_string
(
videoBitrateInfo_
.
videoQualityMax
)}
});
});
}
if
(
histoQuality_
.
size
()
>
MAX_SIZE_HISTO_QUALITY
)
if
(
histoQuality_
.
size
()
>
MAX_SIZE_HISTO_QUALITY
)
histoQuality_
.
pop_front
();
histoQuality_
.
pop_front
();
...
@@ -576,7 +575,6 @@ VideoRtpSession::storeVideoBitrateInfo() {
...
@@ -576,7 +575,6 @@ VideoRtpSession::storeVideoBitrateInfo() {
histoQuality_
.
push_back
(
videoBitrateInfo_
.
videoQualityCurrent
);
histoQuality_
.
push_back
(
videoBitrateInfo_
.
videoQualityCurrent
);
histoBitrate_
.
push_back
(
videoBitrateInfo_
.
videoBitrateCurrent
);
histoBitrate_
.
push_back
(
videoBitrateInfo_
.
videoBitrateCurrent
);
}
}
}
void
void
VideoRtpSession
::
processRtcpChecker
()
VideoRtpSession
::
processRtcpChecker
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment