7341ab8e25
Reason for revert: Breaks chrome, see https://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/19019/steps/compile/logs/stdio Analysis: Chrome uses cricket::VideoFrame, without explicitly including webrtc/media/base/videoframe.h, and breaks when that file is no longer included by any other webrtc headers. Will reland after updating Chrome. Original issue's description: > Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. > > Replaced with webrtc::VideoFrame. > > TBR=mflodman@webrtc.org > BUG=webrtc:5682 > > Committed: https://crrev.com/45c8b8940042bd2574c39920804ade8343cefdba > Cr-Commit-Position: refs/heads/master@{#14885} TBR=perkj@webrtc.org,pthatcher@webrtc.org,tkchin@webrtc.org,mflodman@webrtc.org,stefan@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5682 Review-Url: https://codereview.webrtc.org/2471783002 Cr-Commit-Position: refs/heads/master@{#14886}
60 lines
2.2 KiB
C++
60 lines
2.2 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 WEBRTC_API_MEDIASTREAMTRACKPROXY_H_
|
|
#define WEBRTC_API_MEDIASTREAMTRACKPROXY_H_
|
|
|
|
#include "webrtc/api/mediastreaminterface.h"
|
|
#include "webrtc/api/proxy.h"
|
|
|
|
namespace webrtc {
|
|
|
|
BEGIN_SIGNALING_PROXY_MAP(AudioTrack)
|
|
PROXY_CONSTMETHOD0(std::string, kind)
|
|
PROXY_CONSTMETHOD0(std::string, id)
|
|
PROXY_CONSTMETHOD0(TrackState, state)
|
|
PROXY_CONSTMETHOD0(bool, enabled)
|
|
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_SIGNALING_PROXY()
|
|
|
|
BEGIN_PROXY_MAP(VideoTrack)
|
|
PROXY_CONSTMETHOD0(std::string, kind)
|
|
PROXY_CONSTMETHOD0(std::string, id)
|
|
PROXY_CONSTMETHOD0(TrackState, state)
|
|
PROXY_CONSTMETHOD0(bool, enabled)
|
|
PROXY_METHOD1(bool, set_enabled, bool)
|
|
PROXY_WORKER_METHOD2(void,
|
|
AddOrUpdateSink,
|
|
rtc::VideoSinkInterface<cricket::VideoFrame>*,
|
|
const rtc::VideoSinkWants&)
|
|
PROXY_WORKER_METHOD1(void,
|
|
RemoveSink,
|
|
rtc::VideoSinkInterface<cricket::VideoFrame>*)
|
|
PROXY_CONSTMETHOD0(VideoTrackSourceInterface*, GetSource)
|
|
|
|
PROXY_METHOD1(void, RegisterObserver, ObserverInterface*)
|
|
PROXY_METHOD1(void, UnregisterObserver, ObserverInterface*)
|
|
END_PROXY()
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_API_MEDIASTREAMTRACKPROXY_H_
|