Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
mediastreamer2
Commits
65325093
Commit
65325093
authored
May 21, 2014
by
Gautier Pelloux-Prayer
Browse files
rebase on master
parent
a6d87ce6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
src/voip/bitratecontrol.c
src/voip/bitratecontrol.c
+1
-1
src/voip/bitratedriver.c
src/voip/bitratedriver.c
+2
-0
No files found.
src/voip/bitratecontrol.c
View file @
65325093
...
...
@@ -150,6 +150,6 @@ MSBitrateController *ms_av_bitrate_controller_new(RtpSession *asession, MSFilter
MSBitrateController
*
ms_bandwidth_bitrate_controller_new
(
RtpSession
*
asession
,
MSFilter
*
aenc
,
RtpSession
*
vsession
,
MSFilter
*
venc
){
return
ms_bitrate_controller_new
(
ms_stateful_qos_analyser_new
(
vsession
),
ms_bandwidth_bitrate_driver_new
(
a
enc
,
venc
));
ms_bandwidth_bitrate_driver_new
(
a
session
,
aenc
,
vsession
,
venc
));
}
src/voip/bitratedriver.c
View file @
65325093
...
...
@@ -320,6 +320,7 @@ static int bandwidth_dec_video_bitrate(MSBandwidthBitrateDriver *obj, const MSRa
ms_message
(
"MSBandwidthBitrateDriver: targeting %i bps for video encoder."
,
new_br
);
ms_filter_call_method
(
obj
->
venc
,
MS_FILTER_SET_BITRATE
,
&
new_br
);
obj
->
cur_bitrate
=
new_br
;
rtp_session_set_target_upload_bandwidth
(
obj
->
vsession
,
obj
->
cur_bitrate
);
return
new_br
==
min_video_bitrate
?
-
1
:
0
;
}
...
...
@@ -339,6 +340,7 @@ static int bandwidth_inc_video_bitrate(MSBandwidthBitrateDriver *obj, const MSRa
}
ms_message
(
"MSBandwidthBitrateDriver: increasing bitrate from %i to %i bps for video encoder."
,
obj
->
cur_bitrate
,
newbr
);
obj
->
cur_bitrate
=
newbr
;
rtp_session_set_target_upload_bandwidth
(
obj
->
vsession
,
obj
->
cur_bitrate
);
ms_filter_call_method
(
obj
->
venc
,
MS_FILTER_SET_BITRATE
,
&
obj
->
cur_bitrate
);
return
ret
;
}
...
...
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