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

Unified Diff: webrtc/pc/channel.cc

Issue 2854123003: Build WebRTC with data channel only. (Closed)
Patch Set: Rebase. Created 3 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
« no previous file with comments | « webrtc/pc/channel.h ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/pc/channel.cc
diff --git a/webrtc/pc/channel.cc b/webrtc/pc/channel.cc
index cc4588a1cf86b1d76f4dc18c54d65fa8f18588dc..00f78b36c981e7440ed369b76b1f8ae69d3d5a9a 100644
--- a/webrtc/pc/channel.cc
+++ b/webrtc/pc/channel.cc
@@ -23,7 +23,9 @@
#include "webrtc/base/trace_event.h"
#include "webrtc/media/base/mediaconstants.h"
#include "webrtc/media/base/rtputils.h"
-#include "webrtc/media/engine/webrtcvoiceengine.h"
+// Adding 'nogncheck' to disable the gn include headers check to support modular
+// WebRTC build targets.
+#include "webrtc/media/engine/webrtcvoiceengine.h" // nogncheck
#include "webrtc/p2p/base/packettransportinternal.h"
#include "webrtc/pc/channelmanager.h"
@@ -1575,9 +1577,12 @@ bool VoiceChannel::GetStats(VoiceMediaInfo* stats) {
std::vector<webrtc::RtpSource> VoiceChannel::GetSources(uint32_t ssrc) const {
return worker_thread()->Invoke<std::vector<webrtc::RtpSource>>(
- RTC_FROM_HERE,
- Bind(&WebRtcVoiceMediaChannel::GetSources,
- static_cast<WebRtcVoiceMediaChannel*>(media_channel()), ssrc));
+ RTC_FROM_HERE, Bind(&VoiceChannel::GetSources_w, this, ssrc));
+}
+
+std::vector<webrtc::RtpSource> VoiceChannel::GetSources_w(uint32_t ssrc) const {
+ RTC_DCHECK(worker_thread()->IsCurrent());
+ return media_channel()->GetSources(ssrc);
}
void VoiceChannel::StartMediaMonitor(int cms) {
« no previous file with comments | « webrtc/pc/channel.h ('k') | webrtc/pc/channelmanager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698