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

Unified Diff: content/renderer/media/peer_connection_tracker.cc

Issue 675013005: Split libjingle's signaling thread from the UI thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update tests, remove circular dependency Created 6 years, 1 month 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 | « content/renderer/media/peer_connection_tracker.h ('k') | content/renderer/media/remote_media_stream_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/peer_connection_tracker.cc
diff --git a/content/renderer/media/peer_connection_tracker.cc b/content/renderer/media/peer_connection_tracker.cc
index 2f2b584f41908598b3d91d51e8b4933238b502a6..25f1b2df9aadb8585bc2482a29dbd37992065448 100644
--- a/content/renderer/media/peer_connection_tracker.cc
+++ b/content/renderer/media/peer_connection_tracker.cc
@@ -304,15 +304,17 @@ bool PeerConnectionTracker::OnControlMessageReceived(
void PeerConnectionTracker::OnGetAllStats() {
DCHECK(main_thread_.CalledOnValidThread());
+ const std::string empty_track_id;
for (PeerConnectionIdMap::iterator it = peer_connection_id_map_.begin();
it != peer_connection_id_map_.end(); ++it) {
rtc::scoped_refptr<InternalStatsObserver> observer(
new rtc::RefCountedObject<InternalStatsObserver>(it->second));
+ // The last type parameter is ignored when the track id is empty.
it->first->GetStats(
observer,
- NULL,
- webrtc::PeerConnectionInterface::kStatsOutputLevelDebug);
+ webrtc::PeerConnectionInterface::kStatsOutputLevelDebug,
+ empty_track_id, blink::WebMediaStreamSource::TypeAudio);
}
}
@@ -388,12 +390,8 @@ void PeerConnectionTracker::TrackCreateAnswer(
void PeerConnectionTracker::TrackSetSessionDescription(
RTCPeerConnectionHandler* pc_handler,
- const blink::WebRTCSessionDescription& desc,
- Source source) {
+ const std::string& sdp, const std::string& type, Source source) {
DCHECK(main_thread_.CalledOnValidThread());
- string sdp = base::UTF16ToUTF8(desc.sdp());
- string type = base::UTF16ToUTF8(desc.type());
-
string value = "type: " + type + ", sdp: " + sdp;
SendPeerConnectionUpdate(
pc_handler,
« no previous file with comments | « content/renderer/media/peer_connection_tracker.h ('k') | content/renderer/media/remote_media_stream_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698