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

Fix capture_clock_offset_updater_ data race.

Browse Source 
Change-Id: I1b84810ea19c8bf24ec49d7fb69e954d18759e37
Bug: b/288066973
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/309680
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#40320}
This commit is contained in:
Jeremy Leconte 2023-06-21 08:15:52 +02:00 committed by WebRTC LUCI CQ
parent f80cf81435
commit c4e0254909
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
audio/channel_receive.cc
View File

@ -292,7 +292,8 @@ class ChannelReceive : public ChannelReceiveInterface,
webrtc::AbsoluteCaptureTimeInterpolator absolute_capture_time_interpolator_
RTC_GUARDED_BY(worker_thread_checker_);
webrtc::CaptureClockOffsetUpdater capture_clock_offset_updater_;
webrtc::CaptureClockOffsetUpdater capture_clock_offset_updater_
RTC_GUARDED_BY(ts_stats_lock_);
rtc::scoped_refptr<ChannelReceiveFrameTransformerDelegate>
frame_transformer_delegate_;
@ -474,6 +475,7 @@ AudioMixer::Source::AudioFrameInfo ChannelReceive::GetAudioFrameWithInfo(
for (auto& packet_info : audio_frame->packet_infos_) {
absl::optional<int64_t> local_capture_clock_offset_q32x32;
if (packet_info.absolute_capture_time().has_value()) {
MutexLock lock(&ts_stats_lock_);
local_capture_clock_offset_q32x32 =
capture_clock_offset_updater_.AdjustEstimatedCaptureClockOffset(
packet_info.absolute_capture_time()