Files
platform-external-webrtc/pc/video_track.cc
Tomas Gunnarsson 97f8a5f7dd Revert partial revert, in order to do a full revert.
This reverts commit f342d6054ad984b7b80df2afe349c3bbb5f1d5b8.
  or "Reland "Use non-proxied source object in VideoTrack.""

Reason for revert: Didn't resolve the downstream issues.

Original change's description:
> Revert "Reland "Use non-proxied source object in VideoTrack.""
>
> This reverts commit 1158bff15f33c467543928dd6a49cb6ad04da1ba.
>
> Reason for revert: This is a partial revert as we're tracking down
> the source of the downstream issues. This CL reverts the use of
> `internal()` for methods that relate to the source sink.
>
> 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}
>
> TBR=tommi@webrtc.org,hta@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com
>
> Change-Id: I4d8e3aced019215b97a6263cafa2a7488cd118be
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:13540
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251661
> Auto-Submit: Tomas Gunnarsson <tommi@webrtc.org>
> Reviewed-by: 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@{#35983}

# Not skipping CQ checks because original CL landed > 1 day ago.

Using "no-try" since a follow-up revert is also needed to get the bots
to turn green.

No-try: true
Bug: webrtc:13540
Change-Id: I361fca6949c01200d9d706749e7e825eb5b4fc1f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/251685
Reviewed-by: Christoffer Jansson <jansson@google.com>
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35991}
2022-02-14 12:35:10 +00:00

135 lines
4.3 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/video_track.h"
#include <string>
#include <utility>
#include <vector>
#include "api/notifier.h"
#include "api/sequence_checker.h"
#include "rtc_base/checks.h"
#include "rtc_base/location.h"
#include "rtc_base/ref_counted_object.h"
namespace webrtc {
VideoTrack::VideoTrack(
const std::string& label,
rtc::scoped_refptr<
VideoTrackSourceProxyWithInternal<VideoTrackSourceInterface>> source,
rtc::Thread* worker_thread)
: MediaStreamTrack<VideoTrackInterface>(label),
worker_thread_(worker_thread),
video_source_(std::move(source)),
content_hint_(ContentHint::kNone) {
RTC_DCHECK_RUN_ON(&signaling_thread_);
// Detach the thread checker for VideoSourceBaseGuarded since we'll make calls
// to VideoSourceBaseGuarded on the worker thread, but we're currently on the
// signaling thread.
source_sequence_.Detach();
video_source_->RegisterObserver(this);
}
VideoTrack::~VideoTrack() {
RTC_DCHECK_RUN_ON(&signaling_thread_);
video_source_->UnregisterObserver(this);
}
std::string VideoTrack::kind() const {
return kVideoKind;
}
// AddOrUpdateSink and RemoveSink should be called on the worker
// thread.
void VideoTrack::AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
const rtc::VideoSinkWants& wants) {
RTC_DCHECK_RUN_ON(worker_thread_);
VideoSourceBaseGuarded::AddOrUpdateSink(sink, wants);
rtc::VideoSinkWants modified_wants = wants;
modified_wants.black_frames = !enabled();
video_source_->internal()->AddOrUpdateSink(sink, modified_wants);
}
void VideoTrack::RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) {
RTC_DCHECK_RUN_ON(worker_thread_);
VideoSourceBaseGuarded::RemoveSink(sink);
video_source_->internal()->RemoveSink(sink);
}
void VideoTrack::RequestRefreshFrame() {
RTC_DCHECK_RUN_ON(worker_thread_);
video_source_->internal()->RequestRefreshFrame();
}
VideoTrackSourceInterface* VideoTrack::GetSource() const {
// Callable from any thread.
return video_source_.get();
}
VideoTrackInterface::ContentHint VideoTrack::content_hint() const {
RTC_DCHECK_RUN_ON(worker_thread_);
return content_hint_;
}
void VideoTrack::set_content_hint(ContentHint hint) {
RTC_DCHECK_RUN_ON(worker_thread_);
if (content_hint_ == hint)
return;
content_hint_ = hint;
Notifier<VideoTrackInterface>::FireOnChanged();
}
bool VideoTrack::set_enabled(bool enable) {
RTC_DCHECK_RUN_ON(worker_thread_);
auto* source = video_source_->internal();
for (auto& sink_pair : sink_pairs()) {
rtc::VideoSinkWants modified_wants = sink_pair.wants;
modified_wants.black_frames = !enable;
source->AddOrUpdateSink(sink_pair.sink, modified_wants);
}
return MediaStreamTrack<VideoTrackInterface>::set_enabled(enable);
}
bool VideoTrack::enabled() const {
RTC_DCHECK_RUN_ON(worker_thread_);
return MediaStreamTrack<VideoTrackInterface>::enabled();
}
MediaStreamTrackInterface::TrackState VideoTrack::state() const {
// TODO(bugs.webrtc.org/13540): Re-enable this DCHECK and update the proxy.
// RTC_DCHECK_RUN_ON(&signaling_thread_);
return MediaStreamTrack<VideoTrackInterface>::state();
}
void VideoTrack::OnChanged() {
RTC_DCHECK_RUN_ON(&signaling_thread_);
rtc::Thread::ScopedDisallowBlockingCalls no_blocking_calls;
auto* source = video_source_->internal();
auto state = source->state();
set_state(state == MediaSourceInterface::kEnded ? kEnded : kLive);
}
rtc::scoped_refptr<VideoTrack> VideoTrack::Create(
const std::string& id,
VideoTrackSourceInterface* source,
rtc::Thread* worker_thread) {
rtc::scoped_refptr<
VideoTrackSourceProxyWithInternal<VideoTrackSourceInterface>>
source_proxy = VideoTrackSourceProxy::Create(rtc::Thread::Current(),
worker_thread, source);
return rtc::make_ref_counted<VideoTrack>(id, std::move(source_proxy),
worker_thread);
}
} // namespace webrtc