admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wire-up audio BWE with overhead.

Browse Source 
BUG=webrtc:6638

Review-Url: https://codereview.webrtc.org/2565353002
Cr-Commit-Position: refs/heads/master@{#15632}
This commit is contained in:
michaelt 2016-12-15 06:24:49 -08:00 committed by Commit bot
parent c12cbaf9dd
commit bf65be5435
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/voice_engine/channel.cc
View File

@ -940,6 +940,7 @@ Channel::Channel(int32_t channelId,
RtpRtcp::Configuration configuration;
configuration.audio = true;
configuration.outgoing_transport = this;
configuration.overhead_observer = this;
configuration.receive_statistics = rtp_receive_statistics_.get();
configuration.bandwidth_callback = rtcp_observer_.get();
if (pacing_enabled_) {
@ -2881,6 +2882,14 @@ void Channel::SetTransportOverhead(int transport_overhead_per_packet) {
_rtpRtcpModule->SetTransportOverhead(transport_overhead_per_packet);
}
void Channel::OnOverheadChanged(size_t overhead_bytes_per_packet) {
audio_coding_->ModifyEncoder([&](std::unique_ptr<AudioEncoder>* encoder) {
if (*encoder) {
(*encoder)->OnReceivedOverhead(overhead_bytes_per_packet);
}
});
}
int Channel::RegisterExternalMediaProcessing(ProcessingTypes type,
VoEMediaProcess& processObject) {
WEBRTC_TRACE(kTraceInfo, kTraceVoice, VoEId(_instanceId, _channelId),

7
webrtc/voice_engine/channel.h
View File

@ -144,8 +144,8 @@ class Channel
public AudioPacketizationCallback, // receive encoded packets from the
// ACM
public ACMVADCallback, // receive voice activity from the ACM
public MixerParticipant // supplies output mixer with audio frames
{
public MixerParticipant, // supplies output mixer with audio frames
public OverheadObserver {
public:
friend class VoERtcpObserver;
@ -417,6 +417,9 @@ class Channel
void SetRtcpRttStats(RtcpRttStats* rtcp_rtt_stats);
void SetTransportOverhead(int transport_overhead_per_packet);
// From OverheadObserver in the RTP/RTCP module
void OnOverheadChanged(size_t overhead_bytes_per_packet) override;
protected:
void OnIncomingFractionLoss(int fraction_lost);