content/renderer/media/webrtc/media_stream_track_metrics.h - Issue 1615433002: Roll WebRTC 11523:11548, Libjingle 11522:11545

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

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

« no previous file with comments | « content/renderer/media/webrtc/media_stream_remote_video_source.h ('k') | content/renderer/media/webrtc/media_stream_track_metrics.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_	5 #ifndef CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_

6 #define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_	6 #define CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_

7	7

8 #include <stdint.h>	8 #include <stdint.h>

9	9

10 #include "base/memory/scoped_vector.h"	10 #include "base/memory/scoped_vector.h"

11 #include "base/threading/non_thread_safe.h"	11 #include "base/threading/non_thread_safe.h"

12 #include "content/common/content_export.h"	12 #include "content/common/content_export.h"

13 #include "third_party/libjingle/source/talk/app/webrtc/peerconnectioninterface.h "	13 #include "third_party/webrtc/api/peerconnectioninterface.h"

14	14

15 namespace webrtc {	15 namespace webrtc {

16 class MediaStreamInterface;	16 class MediaStreamInterface;

17 class MediaStreamTrackInterface;	17 class MediaStreamTrackInterface;

18 }	18 }

19	19

20 namespace content {	20 namespace content {

21	21

22 class MediaStreamTrackMetricsObserver;	22 class MediaStreamTrackMetricsObserver;

23 class RTCPeerConnectionHandler;	23 class RTCPeerConnectionHandler;

(...skipping 69 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
93	93

94 typedef ScopedVector<MediaStreamTrackMetricsObserver> ObserverVector;	94 typedef ScopedVector<MediaStreamTrackMetricsObserver> ObserverVector;

95 ObserverVector observers_;	95 ObserverVector observers_;

96	96

97 webrtc::PeerConnectionInterface::IceConnectionState ice_state_;	97 webrtc::PeerConnectionInterface::IceConnectionState ice_state_;

98 };	98 };

99	99

100 } // namespace	100 } // namespace

101	101

102 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_	102 #endif // CONTENT_RENDERER_MEDIA_WEBRTC_MEDIA_STREAM_TRACK_METRICS_H_

OLD	NEW