mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-12 21:30:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix post-merge errors

Browse source
This commit is contained in:
Rashad Sookram 2023-02-17 12:21:00 -05:00
parent 03ddb5df82
commit 50481294cf
2 changed files with 5 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pc/channel.cc
View file

@ -938,7 +938,7 @@ bool VoiceChannel::SetRemoteContent_w(const MediaContentDescription* content,
// RingRTC change to configure OPUS
void VoiceChannel::ConfigureEncoders(const webrtc::AudioEncoder::Config& config) {
worker_thread()->BlockingCall([this, &config] {
media_channel()->ConfigureEncoders(config);
voice_media_send_channel()->ConfigureEncoders(config);
});
}
@ -949,7 +949,7 @@ void VoiceChannel::GetAudioLevels(
size_t received_out_size,
size_t* received_size_out) {
worker_thread()->BlockingCall([this, captured_out, received_out, received_out_size, received_size_out] {
media_channel()->GetAudioLevels(captured_out, received_out, received_out_size, received_size_out);
voice_media_receive_channel()->GetAudioLevels(captured_out, received_out, received_out_size, received_size_out);
});
}

18
ringrtc/rffi/src/stats_observer.cc
View file

@ -110,13 +110,7 @@ void StatsObserverRffi::OnStatsDelivered(const rtc::scoped_refptr<const RTCStats
audio_receiver.packets_lost = stat->packets_lost.ValueOrDefault(0);
audio_receiver.bytes_received = stat->bytes_received.ValueOrDefault(0);
audio_receiver.jitter = stat->jitter.ValueOrDefault(0.0);
if (stat->track_id.is_defined()) {
auto track_stat = report->GetAs<RTCMediaStreamTrackStats>(*stat->track_id);
if (track_stat) {
audio_receiver.total_audio_energy = track_stat->total_audio_energy.ValueOrDefault(0.0);
}
}
audio_receiver.total_audio_energy = stat->total_audio_energy.ValueOrDefault(0.0);
this->audio_receiver_statistics_.push_back(audio_receiver);
} else if (*stat->kind == "video") {
@ -129,14 +123,8 @@ void StatsObserverRffi::OnStatsDelivered(const rtc::scoped_refptr<const RTCStats
video_receiver.frames_decoded = stat->frames_decoded.ValueOrDefault(0);
video_receiver.key_frames_decoded = stat->key_frames_decoded.ValueOrDefault(0);
video_receiver.total_decode_time = stat->total_decode_time.ValueOrDefault(0.0);
if (stat->track_id.is_defined()) {
auto track_stat = report->GetAs<RTCMediaStreamTrackStats>(*stat->track_id);
if (track_stat) {
video_receiver.frame_width = track_stat->frame_width.ValueOrDefault(0);
video_receiver.frame_height = track_stat->frame_height.ValueOrDefault(0);
}
}
video_receiver.frame_width = stat->frame_width.ValueOrDefault(0);
video_receiver.frame_height = stat->frame_height.ValueOrDefault(0);
this->video_receiver_statistics_.push_back(video_receiver);
}