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

SetNegotiatedHeaderExtensions_w: Set list synchronously.

Browse Source 
SetNegotiatedHeaderExtensions_w queued a task to update the list
of negotiated header extensions on the signal thread from the
worker thread, in belief that a later call to
GetNegotiatedHeaderExtensions() would happen on the WebRTC proxies,
leading to the update happening before the readout. In downstream
project, this is not always the case.

Fix this by synchronously updating the list of negotiated header
extensions.

Bug: chromium:1051821
Change-Id: I3266292e7508bb7a22a3f7d871e82c12f60cfc83
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/201728
Reviewed-by: Henrik Boström <hbos@webrtc.org>
Commit-Queue: Markus Handell <handellm@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32977}
This commit is contained in:
Markus Handell
2021-01-14 14:00:40 +01:00
committed by Commit Bot
parent c12f625938
commit 1921708141
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pc/channel.cc
View File

@ -30,6 +30,7 @@
#include "rtc_base/logging.h"
#include "rtc_base/network_route.h"
#include "rtc_base/strings/string_builder.h"
#include "rtc_base/synchronization/mutex.h"
#include "rtc_base/synchronization/sequence_checker.h"
#include "rtc_base/trace_event.h"
@ -839,17 +840,14 @@ void BaseChannel::SignalSentPacket_n(const rtc::SentPacket& sent_packet) {
void BaseChannel::SetNegotiatedHeaderExtensions_w(
const RtpHeaderExtensions& extensions) {
TRACE_EVENT0("webrtc", __func__);
RtpHeaderExtensions extensions_copy = extensions;
invoker_.AsyncInvoke<void>(
RTC_FROM_HERE, signaling_thread(),
[this, extensions_copy = std::move(extensions_copy)] {
RTC_DCHECK_RUN_ON(signaling_thread());
negotiated_header_extensions_ = std::move(extensions_copy);
});
RTC_DCHECK_RUN_ON(worker_thread());
webrtc::MutexLock lock(&negotiated_header_extensions_lock_);
negotiated_header_extensions_ = extensions;
}
RtpHeaderExtensions BaseChannel::GetNegotiatedRtpHeaderExtensions() const {
RTC_DCHECK_RUN_ON(signaling_thread());
webrtc::MutexLock lock(&negotiated_header_extensions_lock_);
return negotiated_header_extensions_;
}

7
pc/channel.h
View File

@ -381,8 +381,13 @@ class BaseChannel : public ChannelInterface,
// This object is not owned by the channel so it must outlive it.
rtc::UniqueRandomIdGenerator* const ssrc_generator_;
// |negotiated_header_extensions_| is read on the signaling thread, but
// written on the worker thread while being sync-invoked from the signal
// thread in SdpOfferAnswerHandler::PushdownMediaDescription(). Hence the lock
// isn't strictly needed, but it's anyway placed here for future safeness.
mutable webrtc::Mutex negotiated_header_extensions_lock_;
RtpHeaderExtensions negotiated_header_extensions_
RTC_GUARDED_BY(signaling_thread());
RTC_GUARDED_BY(negotiated_header_extensions_lock_);
};
// VoiceChannel is a specialization that adds support for early media, DTMF,