Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: webrtc/media/base/fakemediaengine.h

Issue 2046173002: Use VoiceChannel/VideoChannel directly from RtpSender/RtpReceiver. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/media/base/fakemediaengine.h
diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
index 883b474a49051d571a5be20f7291504c733de7f4..8e6c323a1e6b0e46d86fd83a9ed9019db0ea1c52 100644
--- a/webrtc/media/base/fakemediaengine.h
+++ b/webrtc/media/base/fakemediaengine.h
@@ -339,6 +339,11 @@ class FakeVoiceMediaChannel : public RtpHelper<VoiceMediaChannel> {
}
return true;
}
+
+ bool HasSource(uint32_t ssrc) const {
+ return local_sinks_.find(ssrc) != local_sinks_.end();
+ }
+
virtual bool AddRecvStream(const StreamParams& sp) {
if (!RtpHelper<VoiceMediaChannel>::AddRecvStream(sp))
return false;
@@ -545,6 +550,9 @@ class FakeVideoMediaChannel : public RtpHelper<VideoMediaChannel> {
}
return true;
}
+ bool HasSink(uint32_t ssrc) const {
+ return sinks_.find(ssrc) != sinks_.end() && sinks_.at(ssrc) != nullptr;
+ }
bool SetSend(bool send) override { return set_sending(send); }
bool SetVideoSend(
@@ -556,14 +564,17 @@ class FakeVideoMediaChannel : public RtpHelper<VideoMediaChannel> {
return false;
}
if (enable && options) {
- return SetOptions(*options);
+ if (!SetOptions(*options)) {
+ return false;
+ }
}
sources_[ssrc] = source;
return true;
}
bool HasSource(uint32_t ssrc) const {
- return sources_.find(ssrc) != sources_.end();
+ return sources_.find(ssrc) != sources_.end() &&
+ sources_.at(ssrc) != nullptr;
}
bool AddRecvStream(const StreamParams& sp) override {
if (!RtpHelper<VideoMediaChannel>::AddRecvStream(sp))
« webrtc/api/rtpsenderreceiver_unittest.cc ('K') | « webrtc/api/webrtcsession_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698