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

Added annotation for BaseChannel members.

Browse Source 
The thread access problems have been resolved.
Also removing unnecessary accessor for was_ever_writable_.

Bug: webrtc:12230
Change-Id: I4b4d2304f0c8ff5eea31da3734b0d492b2a8516f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/244080
Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Commit-Queue: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35607}
This commit is contained in:
Tomas Gunnarsson
2022-01-02 15:15:08 +00:00
committed by WebRTC LUCI CQ
parent e5e7ce766b
commit f1ea4170ea
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pc/channel.cc
View File

@ -319,7 +319,7 @@ bool BaseChannel::IsReadyToSendMedia_w() const {
return enabled_ && return enabled_ &&
webrtc::RtpTransceiverDirectionHasRecv(remote_content_direction_) && webrtc::RtpTransceiverDirectionHasRecv(remote_content_direction_) &&
webrtc::RtpTransceiverDirectionHasSend(local_content_direction_) && webrtc::RtpTransceiverDirectionHasSend(local_content_direction_) &&
was_ever_writable(); was_ever_writable_;
} }
bool BaseChannel::SendPacket(rtc::CopyOnWriteBuffer* packet, bool BaseChannel::SendPacket(rtc::CopyOnWriteBuffer* packet,

15
pc/channel.h
View File

@ -192,10 +192,6 @@ class BaseChannel : public ChannelInterface,
} }
protected: protected:
bool was_ever_writable() const {
RTC_DCHECK_RUN_ON(worker_thread());
return was_ever_writable_;
}
void set_local_content_direction(webrtc::RtpTransceiverDirection direction) { void set_local_content_direction(webrtc::RtpTransceiverDirection direction) {
RTC_DCHECK_RUN_ON(worker_thread()); RTC_DCHECK_RUN_ON(worker_thread());
local_content_direction_ = direction; local_content_direction_ = direction;
@ -358,13 +354,10 @@ class BaseChannel : public ChannelInterface,
bool payload_type_demuxing_enabled_ RTC_GUARDED_BY(worker_thread()) = true; bool payload_type_demuxing_enabled_ RTC_GUARDED_BY(worker_thread()) = true;
std::vector<StreamParams> local_streams_ RTC_GUARDED_BY(worker_thread()); std::vector<StreamParams> local_streams_ RTC_GUARDED_BY(worker_thread());
std::vector<StreamParams> remote_streams_ RTC_GUARDED_BY(worker_thread()); std::vector<StreamParams> remote_streams_ RTC_GUARDED_BY(worker_thread());
// TODO(bugs.webrtc.org/12230): local_content_direction and webrtc::RtpTransceiverDirection local_content_direction_ RTC_GUARDED_BY(
// remote_content_direction are set on the worker thread, but accessed on the worker_thread()) = webrtc::RtpTransceiverDirection::kInactive;
// network thread. webrtc::RtpTransceiverDirection remote_content_direction_ RTC_GUARDED_BY(
webrtc::RtpTransceiverDirection local_content_direction_ = worker_thread()) = webrtc::RtpTransceiverDirection::kInactive;
webrtc::RtpTransceiverDirection::kInactive;
webrtc::RtpTransceiverDirection remote_content_direction_ =
webrtc::RtpTransceiverDirection::kInactive;
// Cached list of payload types, used if payload type demuxing is re-enabled. // Cached list of payload types, used if payload type demuxing is re-enabled.
std::set<uint8_t> payload_types_ RTC_GUARDED_BY(worker_thread()); std::set<uint8_t> payload_types_ RTC_GUARDED_BY(worker_thread());