mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00
816134a8aa
This reverts commit096ad02c02. 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 commit5ffefe9d2d. > > 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}
83 lines
2.9 KiB
C++
83 lines
2.9 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.
|
|
*/
|
|
|
|
#ifndef MEDIA_BASE_VIDEO_SOURCE_BASE_H_
|
|
#define MEDIA_BASE_VIDEO_SOURCE_BASE_H_
|
|
|
|
#include <vector>
|
|
|
|
#include "api/sequence_checker.h"
|
|
#include "api/video/video_frame.h"
|
|
#include "api/video/video_sink_interface.h"
|
|
#include "api/video/video_source_interface.h"
|
|
#include "rtc_base/system/no_unique_address.h"
|
|
|
|
namespace rtc {
|
|
|
|
// VideoSourceBase is not thread safe. Before using this class, consider using
|
|
// VideoSourceBaseGuarded below instead, which is an identical implementation
|
|
// but applies a sequence checker to help protect internal state.
|
|
// TODO(bugs.webrtc.org/12780): Delete this class.
|
|
class VideoSourceBase : public VideoSourceInterface<webrtc::VideoFrame> {
|
|
public:
|
|
VideoSourceBase();
|
|
~VideoSourceBase() override;
|
|
void AddOrUpdateSink(VideoSinkInterface<webrtc::VideoFrame>* sink,
|
|
const VideoSinkWants& wants) override;
|
|
void RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) override;
|
|
|
|
protected:
|
|
struct SinkPair {
|
|
SinkPair(VideoSinkInterface<webrtc::VideoFrame>* sink, VideoSinkWants wants)
|
|
: sink(sink), wants(wants) {}
|
|
VideoSinkInterface<webrtc::VideoFrame>* sink;
|
|
VideoSinkWants wants;
|
|
};
|
|
SinkPair* FindSinkPair(const VideoSinkInterface<webrtc::VideoFrame>* sink);
|
|
|
|
const std::vector<SinkPair>& sink_pairs() const { return sinks_; }
|
|
|
|
private:
|
|
std::vector<SinkPair> sinks_;
|
|
};
|
|
|
|
// VideoSourceBaseGuarded assumes that operations related to sinks, occur on the
|
|
// same TQ/thread that the object was constructed on.
|
|
class VideoSourceBaseGuarded : public VideoSourceInterface<webrtc::VideoFrame> {
|
|
public:
|
|
VideoSourceBaseGuarded();
|
|
~VideoSourceBaseGuarded() override;
|
|
|
|
void AddOrUpdateSink(VideoSinkInterface<webrtc::VideoFrame>* sink,
|
|
const VideoSinkWants& wants) override;
|
|
void RemoveSink(VideoSinkInterface<webrtc::VideoFrame>* sink) override;
|
|
|
|
protected:
|
|
struct SinkPair {
|
|
SinkPair(VideoSinkInterface<webrtc::VideoFrame>* sink, VideoSinkWants wants)
|
|
: sink(sink), wants(wants) {}
|
|
VideoSinkInterface<webrtc::VideoFrame>* sink;
|
|
VideoSinkWants wants;
|
|
};
|
|
|
|
SinkPair* FindSinkPair(const VideoSinkInterface<webrtc::VideoFrame>* sink);
|
|
const std::vector<SinkPair>& sink_pairs() const;
|
|
|
|
// Keep the `source_sequence_` checker protected to allow sub classes the
|
|
// ability to call Detach() if/when appropriate.
|
|
RTC_NO_UNIQUE_ADDRESS webrtc::SequenceChecker source_sequence_;
|
|
|
|
private:
|
|
std::vector<SinkPair> sinks_ RTC_GUARDED_BY(&source_sequence_);
|
|
};
|
|
|
|
} // namespace rtc
|
|
|
|
#endif // MEDIA_BASE_VIDEO_SOURCE_BASE_H_
|