zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove video-codec max bitrate from TMMBN.

Browse Source 
TMMBN was capped by configured max bitrate for no apparent reason.
Removing this to not require payload-type reconfiguration on new
video-codec settings. Actual removal of payload-type reconfiguration
will happen in a pending CL.

BUG=webrtc:5494
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1702043002 .

Cr-Commit-Position: refs/heads/master@{#11639}
This commit is contained in:
Peter Boström
2016-02-16 17:59:27 +01:00
parent d20327c7d7
commit 9d0c43242b
11 changed files with 14 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -250,11 +250,8 @@ int32_t ModuleRtpRtcpImpl::RegisterSendPayload(
int32_t ModuleRtpRtcpImpl::RegisterSendPayload(const VideoCodec& video_codec) {
send_video_codec_ = video_codec;
return rtp_sender_.RegisterPayload(video_codec.plName,
video_codec.plType,
90000,
0,
video_codec.maxBitrate);
return rtp_sender_.RegisterPayload(video_codec.plName, video_codec.plType,
90000, 0, 0);
}
int32_t ModuleRtpRtcpImpl::DeRegisterSendPayload(const int8_t payload_type) {
@ -674,9 +671,7 @@ void ModuleRtpRtcpImpl::SetTMMBRStatus(const bool enable) {
}
int32_t ModuleRtpRtcpImpl::SetTMMBN(const TMMBRSet* bounding_set) {
uint32_t max_bitrate_kbit =
rtp_sender_.MaxConfiguredBitrateVideo() / 1000;
return rtcp_sender_.SetTMMBN(bounding_set, max_bitrate_kbit);
return rtcp_sender_.SetTMMBN(bounding_set);
}
// Returns the currently configured retransmission mode.