e7b4c137cc
This reverts commit 1158bff15f33c467543928dd6a49cb6ad04da1ba. Reason for revert: Downstream issues unresolved (2nd of two reverts) 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. > > Another change in this re-land is that instead of the `state` property > of the VideoTrack be marshalled to the signaling thread, it's readable > from the calling thread. Previously this was marshalled to the worker > and the original changed that to the signaling thread (same as for > AudioTrack) - but in case that's causing downstream problems this reland > uses BYPASS_PROXY_CONSTMETHOD0 for the `state()` accessor of the > VideoTrack proxy. > > 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: Icb3e165f07240ae10730a316d3a8a3b2b9167d82 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251387 > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#35979} # Not skipping CQ checks because original CL landed > 1 day ago. Using "No-Try" to not have to wait for the win chromium bot to unblock (currently takes hours). No-Try: true Bug: webrtc:13540 Change-Id: I8f34536bf472a6d069344e84d889864f195c93f6 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251686 Reviewed-by: Christoffer Jansson <jansson@google.com> Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35993}
62 lines
1.7 KiB
C++
62 lines
1.7 KiB
C++
/*
|
|
* Copyright 2011 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_AUDIO_TRACK_H_
|
|
#define PC_AUDIO_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"
|
|
|
|
namespace webrtc {
|
|
|
|
class AudioTrack : public MediaStreamTrack<AudioTrackInterface>,
|
|
public ObserverInterface {
|
|
protected:
|
|
// Protected ctor to force use of factory method.
|
|
AudioTrack(const std::string& label,
|
|
const rtc::scoped_refptr<AudioSourceInterface>& source);
|
|
|
|
AudioTrack() = delete;
|
|
AudioTrack(const AudioTrack&) = delete;
|
|
AudioTrack& operator=(const AudioTrack&) = delete;
|
|
|
|
~AudioTrack() override;
|
|
|
|
public:
|
|
static rtc::scoped_refptr<AudioTrack> Create(
|
|
const std::string& id,
|
|
const rtc::scoped_refptr<AudioSourceInterface>& source);
|
|
|
|
// MediaStreamTrack implementation.
|
|
std::string kind() const override;
|
|
|
|
// AudioTrackInterface implementation.
|
|
AudioSourceInterface* GetSource() const override;
|
|
|
|
void AddSink(AudioTrackSinkInterface* sink) override;
|
|
void RemoveSink(AudioTrackSinkInterface* sink) override;
|
|
|
|
private:
|
|
// ObserverInterface implementation.
|
|
void OnChanged() override;
|
|
|
|
private:
|
|
const rtc::scoped_refptr<AudioSourceInterface> audio_source_;
|
|
SequenceChecker thread_checker_;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_AUDIO_TRACK_H_
|