096ad02c02
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}
69 lines
2.2 KiB
C++
69 lines
2.2 KiB
C++
/*
|
|
* Copyright 2012 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 PC_VIDEO_TRACK_H_
|
|
#define PC_VIDEO_TRACK_H_
|
|
|
|
#include <string>
|
|
|
|
#include "api/media_stream_interface.h"
|
|
#include "api/media_stream_track.h"
|
|
#include "api/scoped_refptr.h"
|
|
#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 "media/base/video_source_base.h"
|
|
#include "rtc_base/thread.h"
|
|
#include "rtc_base/thread_annotations.h"
|
|
|
|
namespace webrtc {
|
|
|
|
class VideoTrack : public MediaStreamTrack<VideoTrackInterface>,
|
|
public rtc::VideoSourceBase,
|
|
public ObserverInterface {
|
|
public:
|
|
static rtc::scoped_refptr<VideoTrack> Create(
|
|
const std::string& label,
|
|
VideoTrackSourceInterface* source,
|
|
rtc::Thread* worker_thread);
|
|
|
|
void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
|
|
const rtc::VideoSinkWants& wants) override;
|
|
void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
|
|
|
|
VideoTrackSourceInterface* GetSource() const override {
|
|
return video_source_.get();
|
|
}
|
|
ContentHint content_hint() const override;
|
|
void set_content_hint(ContentHint hint) override;
|
|
bool set_enabled(bool enable) override;
|
|
std::string kind() const override;
|
|
|
|
protected:
|
|
VideoTrack(const std::string& id,
|
|
VideoTrackSourceInterface* video_source,
|
|
rtc::Thread* worker_thread);
|
|
~VideoTrack();
|
|
|
|
private:
|
|
// Implements ObserverInterface. Observes |video_source_| state.
|
|
void OnChanged() override;
|
|
|
|
rtc::Thread* const worker_thread_;
|
|
SequenceChecker signaling_thread_checker_;
|
|
rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
|
|
ContentHint content_hint_ RTC_GUARDED_BY(signaling_thread_checker_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_VIDEO_TRACK_H_
|