816134a8aa
This reverts commit 096ad02c02b4bc6c046282b8793ef84d041dd0d8. Reason for revert: Including a fix for the test issue. Original change's description: > Revert "Fix race between enabled() and set_enabled() in VideoTrack." > > This reverts commit 5ffefe9d2d743c66f8a8bcbc5ad9662a3138840a. > > Reason for revert: Breaks Chromium Android browser tests on fyi bots. > > Original change's description: > > Fix race between enabled() and set_enabled() in VideoTrack. > > > > Along the way I introduced VideoSourceBaseGuarded, which is equivalent > > to VideoSourceBase except that it applies thread checks. I found that > > it's easy to use VideoSourceBase incorrectly and in fact there appear > > to be tests that do this. > > > > I made the source object const in VideoTrack, as it already was in > > AudioTrack, and that allowed for making the GetSource() accessors > > bypass the proxy thread hop and give the caller direct access. > > > > Bug: webrtc:12773, b/188139639, webrtc:12780 > > Change-Id: I022175c4239a1306ef54059c131d81411d5124fe > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219160 > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Andrey Logvin <landrey@webrtc.org> > > Commit-Queue: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#34096} > > TBR=mbonadei@webrtc.org,tommi@webrtc.org,landrey@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com > > Change-Id: I16323d459c76eb6a87cc602a0048f6ee01c81626 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:12773 > Bug: b/188139639 > Bug: webrtc:12780 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219637 > Reviewed-by: Evan Shrubsole <eshr@google.com> > Commit-Queue: Evan Shrubsole <eshr@google.com> > Cr-Commit-Position: refs/heads/master@{#34101} # Not skipping CQ checks because this is a reland. Bug: webrtc:12773 Bug: b/188139639 Bug: webrtc:12780 Change-Id: Ib35fe15a6c43de8f286d60aff02b19df1ab76925 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/219639 Reviewed-by: Tommi <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Andrey Logvin <landrey@webrtc.org> Reviewed-by: Evan Shrubsole <eshr@google.com> Commit-Queue: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#34104}
105 lines
3.1 KiB
C++
105 lines
3.1 KiB
C++
/*
|
|
* Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "media/base/video_source_base.h"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "absl/algorithm/container.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace rtc {
|
|
|
|
VideoSourceBase::VideoSourceBase() = default;
|
|
VideoSourceBase::~VideoSourceBase() = default;
|
|
|
|
void VideoSourceBase::AddOrUpdateSink(
|
|
VideoSinkInterface<webrtc::VideoFrame>* sink,
|
|
const VideoSinkWants& wants) {
|
|
RTC_DCHECK(sink != nullptr);
|
|
|
|
SinkPair* sink_pair = FindSinkPair(sink);
|
|
if (!sink_pair) {
|
|
sinks_.push_back(SinkPair(sink, wants));
|
|
} else {
|
|
sink_pair->wants = wants;
|
|
}
|
|
}
|
|
|
|
void VideoSourceBase::RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) {
|
|
RTC_DCHECK(sink != nullptr);
|
|
RTC_DCHECK(FindSinkPair(sink));
|
|
sinks_.erase(std::remove_if(sinks_.begin(), sinks_.end(),
|
|
[sink](const SinkPair& sink_pair) {
|
|
return sink_pair.sink == sink;
|
|
}),
|
|
sinks_.end());
|
|
}
|
|
|
|
VideoSourceBase::SinkPair* VideoSourceBase::FindSinkPair(
|
|
const VideoSinkInterface<webrtc::VideoFrame>* sink) {
|
|
auto sink_pair_it = absl::c_find_if(
|
|
sinks_,
|
|
[sink](const SinkPair& sink_pair) { return sink_pair.sink == sink; });
|
|
if (sink_pair_it != sinks_.end()) {
|
|
return &*sink_pair_it;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
VideoSourceBaseGuarded::VideoSourceBaseGuarded() = default;
|
|
VideoSourceBaseGuarded::~VideoSourceBaseGuarded() = default;
|
|
|
|
void VideoSourceBaseGuarded::AddOrUpdateSink(
|
|
VideoSinkInterface<webrtc::VideoFrame>* sink,
|
|
const VideoSinkWants& wants) {
|
|
RTC_DCHECK_RUN_ON(&source_sequence_);
|
|
RTC_DCHECK(sink != nullptr);
|
|
|
|
SinkPair* sink_pair = FindSinkPair(sink);
|
|
if (!sink_pair) {
|
|
sinks_.push_back(SinkPair(sink, wants));
|
|
} else {
|
|
sink_pair->wants = wants;
|
|
}
|
|
}
|
|
|
|
void VideoSourceBaseGuarded::RemoveSink(
|
|
VideoSinkInterface<webrtc::VideoFrame>* sink) {
|
|
RTC_DCHECK_RUN_ON(&source_sequence_);
|
|
RTC_DCHECK(sink != nullptr);
|
|
RTC_DCHECK(FindSinkPair(sink));
|
|
sinks_.erase(std::remove_if(sinks_.begin(), sinks_.end(),
|
|
[sink](const SinkPair& sink_pair) {
|
|
return sink_pair.sink == sink;
|
|
}),
|
|
sinks_.end());
|
|
}
|
|
|
|
VideoSourceBaseGuarded::SinkPair* VideoSourceBaseGuarded::FindSinkPair(
|
|
const VideoSinkInterface<webrtc::VideoFrame>* sink) {
|
|
RTC_DCHECK_RUN_ON(&source_sequence_);
|
|
auto sink_pair_it = absl::c_find_if(
|
|
sinks_,
|
|
[sink](const SinkPair& sink_pair) { return sink_pair.sink == sink; });
|
|
if (sink_pair_it != sinks_.end()) {
|
|
return &*sink_pair_it;
|
|
}
|
|
return nullptr;
|
|
}
|
|
|
|
const std::vector<VideoSourceBaseGuarded::SinkPair>&
|
|
VideoSourceBaseGuarded::sink_pairs() const {
|
|
RTC_DCHECK_RUN_ON(&source_sequence_);
|
|
return sinks_;
|
|
}
|
|
|
|
} // namespace rtc
|