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}
66 lines
2.5 KiB
C++
66 lines
2.5 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.
|
|
*/
|
|
|
|
// This file includes proxy classes for tracks. The purpose is
|
|
// to make sure tracks are only accessed from the signaling thread.
|
|
|
|
#ifndef PC_MEDIA_STREAM_TRACK_PROXY_H_
|
|
#define PC_MEDIA_STREAM_TRACK_PROXY_H_
|
|
|
|
#include <string>
|
|
|
|
#include "api/media_stream_interface.h"
|
|
#include "pc/proxy.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// TODO(deadbeef): Move this to .cc file. What threads methods are called on is
|
|
// an implementation detail.
|
|
BEGIN_PRIMARY_PROXY_MAP(AudioTrack)
|
|
PROXY_PRIMARY_THREAD_DESTRUCTOR()
|
|
BYPASS_PROXY_CONSTMETHOD0(std::string, kind)
|
|
BYPASS_PROXY_CONSTMETHOD0(std::string, id)
|
|
PROXY_CONSTMETHOD0(TrackState, state)
|
|
PROXY_CONSTMETHOD0(bool, enabled)
|
|
BYPASS_PROXY_CONSTMETHOD0(AudioSourceInterface*, GetSource)
|
|
PROXY_METHOD1(void, AddSink, AudioTrackSinkInterface*)
|
|
PROXY_METHOD1(void, RemoveSink, AudioTrackSinkInterface*)
|
|
PROXY_METHOD1(bool, GetSignalLevel, int*)
|
|
PROXY_METHOD0(rtc::scoped_refptr<AudioProcessorInterface>, GetAudioProcessor)
|
|
PROXY_METHOD1(bool, set_enabled, bool)
|
|
PROXY_METHOD1(void, RegisterObserver, ObserverInterface*)
|
|
PROXY_METHOD1(void, UnregisterObserver, ObserverInterface*)
|
|
END_PROXY_MAP(AudioTrack)
|
|
|
|
BEGIN_PROXY_MAP(VideoTrack)
|
|
PROXY_PRIMARY_THREAD_DESTRUCTOR()
|
|
BYPASS_PROXY_CONSTMETHOD0(std::string, kind)
|
|
BYPASS_PROXY_CONSTMETHOD0(std::string, id)
|
|
PROXY_SECONDARY_CONSTMETHOD0(TrackState, state)
|
|
PROXY_SECONDARY_CONSTMETHOD0(bool, enabled)
|
|
PROXY_SECONDARY_METHOD1(bool, set_enabled, bool)
|
|
PROXY_SECONDARY_CONSTMETHOD0(ContentHint, content_hint)
|
|
PROXY_SECONDARY_METHOD1(void, set_content_hint, ContentHint)
|
|
PROXY_SECONDARY_METHOD2(void,
|
|
AddOrUpdateSink,
|
|
rtc::VideoSinkInterface<VideoFrame>*,
|
|
const rtc::VideoSinkWants&)
|
|
PROXY_SECONDARY_METHOD1(void, RemoveSink, rtc::VideoSinkInterface<VideoFrame>*)
|
|
PROXY_SECONDARY_METHOD0(void, RequestRefreshFrame)
|
|
BYPASS_PROXY_CONSTMETHOD0(VideoTrackSourceInterface*, GetSource)
|
|
|
|
PROXY_METHOD1(void, RegisterObserver, ObserverInterface*)
|
|
PROXY_METHOD1(void, UnregisterObserver, ObserverInterface*)
|
|
END_PROXY_MAP(VideoTrack)
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // PC_MEDIA_STREAM_TRACK_PROXY_H_
|