5b5fa3b9c0
This reverts commit 3eb29c12358930a60134f185cd849e0d12aa9166. Reason for revert: Breaks downstream projects. 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} TBR=tommi@webrtc.org,hta@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com Change-Id: I77395b21c0ef7f17992ae16d296b90bd51eac305 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:13540 TBR: tommi@webrtc.org Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/250668 Auto-Submit: Artem Titarenko <artit@webrtc.org> Owners-Override: Artem Titarenko <artit@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35917}
72 lines
1.9 KiB
C++
72 lines
1.9 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.
|
|
*/
|
|
|
|
#include "pc/audio_track.h"
|
|
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/ref_counted_object.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// static
|
|
rtc::scoped_refptr<AudioTrack> AudioTrack::Create(
|
|
const std::string& id,
|
|
const rtc::scoped_refptr<AudioSourceInterface>& source) {
|
|
return rtc::make_ref_counted<AudioTrack>(id, source);
|
|
}
|
|
|
|
AudioTrack::AudioTrack(const std::string& label,
|
|
const rtc::scoped_refptr<AudioSourceInterface>& source)
|
|
: MediaStreamTrack<AudioTrackInterface>(label), audio_source_(source) {
|
|
if (audio_source_) {
|
|
audio_source_->RegisterObserver(this);
|
|
OnChanged();
|
|
}
|
|
}
|
|
|
|
AudioTrack::~AudioTrack() {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
set_state(MediaStreamTrackInterface::kEnded);
|
|
if (audio_source_)
|
|
audio_source_->UnregisterObserver(this);
|
|
}
|
|
|
|
std::string AudioTrack::kind() const {
|
|
return kAudioKind;
|
|
}
|
|
|
|
AudioSourceInterface* AudioTrack::GetSource() const {
|
|
// Callable from any thread.
|
|
return audio_source_.get();
|
|
}
|
|
|
|
void AudioTrack::AddSink(AudioTrackSinkInterface* sink) {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
if (audio_source_)
|
|
audio_source_->AddSink(sink);
|
|
}
|
|
|
|
void AudioTrack::RemoveSink(AudioTrackSinkInterface* sink) {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
if (audio_source_)
|
|
audio_source_->RemoveSink(sink);
|
|
}
|
|
|
|
void AudioTrack::OnChanged() {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
if (audio_source_->state() == MediaSourceInterface::kEnded) {
|
|
set_state(kEnded);
|
|
} else {
|
|
set_state(kLive);
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|