| Index: webrtc/media/base/fakemediaengine.h
|
| diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
|
| index 130142accb24046839e868e9c3c801e4b9c868ad..6470624061a763da903d6e3ad2b11fef9d18cc55 100644
|
| --- a/webrtc/media/base/fakemediaengine.h
|
| +++ b/webrtc/media/base/fakemediaengine.h
|
| @@ -509,8 +509,8 @@
|
| const std::vector<VideoCodec>& codecs() const { return send_codecs(); }
|
| bool rendering() const { return playout(); }
|
| const VideoOptions& options() const { return options_; }
|
| - const std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*>&
|
| - sinks() const {
|
| + const std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*>& sinks()
|
| + const {
|
| return sinks_;
|
| }
|
| int max_bps() const { return max_bps_; }
|
| @@ -538,7 +538,7 @@
|
| return true;
|
| }
|
| bool SetSink(uint32_t ssrc,
|
| - rtc::VideoSinkInterface<webrtc::VideoFrame>* sink) override {
|
| + rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override {
|
| if (ssrc != 0 && sinks_.find(ssrc) == sinks_.end()) {
|
| return false;
|
| }
|
| @@ -556,7 +556,7 @@
|
| uint32_t ssrc,
|
| bool enable,
|
| const VideoOptions* options,
|
| - rtc::VideoSourceInterface<webrtc::VideoFrame>* source) override {
|
| + rtc::VideoSourceInterface<cricket::VideoFrame>* source) override {
|
| if (!RtpHelper<VideoMediaChannel>::MuteStream(ssrc, !enable)) {
|
| return false;
|
| }
|
| @@ -618,8 +618,8 @@
|
| FakeVideoEngine* engine_;
|
| std::vector<VideoCodec> recv_codecs_;
|
| std::vector<VideoCodec> send_codecs_;
|
| - std::map<uint32_t, rtc::VideoSinkInterface<webrtc::VideoFrame>*> sinks_;
|
| - std::map<uint32_t, rtc::VideoSourceInterface<webrtc::VideoFrame>*> sources_;
|
| + std::map<uint32_t, rtc::VideoSinkInterface<VideoFrame>*> sinks_;
|
| + std::map<uint32_t, rtc::VideoSourceInterface<VideoFrame>*> sources_;
|
| VideoOptions options_;
|
| int max_bps_;
|
| };
|
|
|