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

Take out callback that modifies voice receive codec based on send codec

Browse Source 
No functionality that depends on this information has been identified; no tests break when it is taken out.

Bug: webrtc:15224
Change-Id: I37298479c6b8a4acb82f59d32130c105371936b4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/324760
Reviewed-by: Florent Castelli <orphis@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41037}
This commit is contained in:
Harald Alvestrand 2023-10-24 09:04:31 +00:00 committed by WebRTC LUCI CQ
parent 7b6f996318
commit ecc38d8d29
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pc/channel.cc
View File

@ -844,19 +844,6 @@ VoiceChannel::~VoiceChannel() {
DisableMedia_w();
}
void VoiceChannel::InitCallback() {
RTC_DCHECK_RUN_ON(worker_thread());
// TODO(bugs.webrtc.org/13931): Remove when values are set
// in a more sensible fashion
send_channel()->SetSendCodecChangedCallback([this]() {
RTC_DCHECK_RUN_ON(worker_thread());
// Adjust receive streams based on send codec.
receive_channel()->SetReceiveNackEnabled(
send_channel()->SendCodecHasNack());
receive_channel()->SetReceiveNonSenderRttEnabled(
send_channel()->SenderNonSenderRttEnabled());
});
}
void VoiceChannel::UpdateMediaSendRecvState_w() {
// Render incoming data if we're the active call, and we have the local
// content. We receive data on the default channel and multiplexed streams.

1
pc/channel.h
View File

@ -414,7 +414,6 @@ class VoiceChannel : public BaseChannel {
}
private:
void InitCallback();
// overrides from BaseChannel
void UpdateMediaSendRecvState_w() RTC_RUN_ON(worker_thread()) override;
bool SetLocalContent_w(const MediaContentDescription* content,

6
rtc_base/system/file_wrapper.cc
View File

@ -10,15 +10,19 @@
#include "rtc_base/system/file_wrapper.h"
#include <stddef.h>
#include <cerrno>
#include <cstdint>
#include <string>
#include "absl/strings/string_view.h"
#include "rtc_base/checks.h"
#include "rtc_base/numerics/safe_conversions.h"
#ifdef _WIN32
#include <Windows.h>
#else
#include <string.h>
#endif
#include <utility>