10bd1716fb
This reverts commit 2c47235b0ef1c7bc1aeadc7d0e3aed18e131b3c7. Reason for revert: Downstream issue still doesn't seem to be resolved. Original change's description: > Reland "Use non-proxied source object in VideoTrack." > > This is a reland of 3eb29c12358930a60134f185cd849e0d12aa9166 > > This reland doesn't contain the AudioTrack changes (see original > description) that got triggered in some cases and needs to be > addressed separately. > > Original change's description: > > Use non-proxied source object in VideoTrack. > > > > Use the internal representation of the video source object from the > > track. Before there were implicit thread hops due to use of the proxy. > > > > Also, override AudioTrack's enabled methods to enforce thread > > expectations. > > > > Bug: webrtc:13540 > > Change-Id: I4bc7aca96d6fc24f31ade45e47f52599f1cc2f97 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/250180 > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#35911} > > Bug: webrtc:13540 > Change-Id: I59997be174cc9278e3e5910d493efd5352e6de68 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/250940 > Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#35924} TBR=tommi@webrtc.org,hta@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: Ib9a76db660c5d18203c13b4feaf5b47f56d7e930 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:13540 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251082 Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35930}
70 lines
2.3 KiB
C++
70 lines
2.3 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::VideoSourceBaseGuarded,
|
|
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;
|
|
void RequestRefreshFrame() override;
|
|
VideoTrackSourceInterface* GetSource() const override;
|
|
|
|
ContentHint content_hint() const override;
|
|
void set_content_hint(ContentHint hint) override;
|
|
bool set_enabled(bool enable) override;
|
|
bool enabled() const override;
|
|
MediaStreamTrackInterface::TrackState state() const 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_NO_UNIQUE_ADDRESS webrtc::SequenceChecker signaling_thread_;
|
|
rtc::Thread* const worker_thread_;
|
|
const rtc::scoped_refptr<VideoTrackSourceInterface> video_source_;
|
|
ContentHint content_hint_ RTC_GUARDED_BY(worker_thread_);
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_VIDEO_TRACK_H_
|