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

Side by Side Diff: content/renderer/media/webrtc/media_stream_track_metrics.cc

Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545 (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rolling to webrtc@11548 instead to pull in a fix Created 4 years, 10 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webrtc/media_stream_track_metrics.h" 5 #include "content/renderer/media/webrtc/media_stream_track_metrics.h"
6 6
7 #include <inttypes.h> 7 #include <inttypes.h>
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "base/md5.h" 11 #include "base/md5.h"
12 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
13 #include "content/common/media/media_stream_track_metrics_host_messages.h" 13 #include "content/common/media/media_stream_track_metrics_host_messages.h"
14 #include "content/renderer/render_thread_impl.h" 14 #include "content/renderer/render_thread_impl.h"
15 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h" 15 #include "third_party/webrtc/api/mediastreaminterface.h"
16 16
17 using webrtc::AudioTrackVector; 17 using webrtc::AudioTrackVector;
18 using webrtc::MediaStreamInterface; 18 using webrtc::MediaStreamInterface;
19 using webrtc::MediaStreamTrackInterface; 19 using webrtc::MediaStreamTrackInterface;
20 using webrtc::PeerConnectionInterface; 20 using webrtc::PeerConnectionInterface;
21 using webrtc::VideoTrackVector; 21 using webrtc::VideoTrackVector;
22 22
23 namespace content { 23 namespace content {
24 namespace { 24 namespace {
25 typedef std::set<std::string> IdSet; 25 typedef std::set<std::string> IdSet;
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 } 394 }
395 395
396 uint64_t MediaStreamTrackMetrics::MakeUniqueId(const std::string& track_id, 396 uint64_t MediaStreamTrackMetrics::MakeUniqueId(const std::string& track_id,
397 StreamType stream_type) { 397 StreamType stream_type) {
398 return MakeUniqueIdImpl( 398 return MakeUniqueIdImpl(
399 reinterpret_cast<uint64_t>(reinterpret_cast<void*>(this)), track_id, 399 reinterpret_cast<uint64_t>(reinterpret_cast<void*>(this)), track_id,
400 stream_type); 400 stream_type);
401 } 401 }
402 402
403 } // namespace content 403 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698