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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler.h

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_RTC_PEER_CONNECTION_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 15 matching lines...) Expand all
26 namespace content { 26 namespace content {
27 27
28 class PeerConnectionDependencyFactory; 28 class PeerConnectionDependencyFactory;
29 class PeerConnectionTracker; 29 class PeerConnectionTracker;
30 class RemoteMediaStreamImpl; 30 class RemoteMediaStreamImpl;
31 class RTCMediaConstraints; 31 class RTCMediaConstraints;
32 class WebRtcMediaStreamAdapter; 32 class WebRtcMediaStreamAdapter;
33 33
34 // Mockable wrapper for blink::WebRTCStatsResponse 34 // Mockable wrapper for blink::WebRTCStatsResponse
35 class CONTENT_EXPORT LocalRTCStatsResponse 35 class CONTENT_EXPORT LocalRTCStatsResponse
36 : public NON_EXPORTED_BASE(talk_base::RefCountInterface) { 36 : public NON_EXPORTED_BASE(rtc::RefCountInterface) {
37 public: 37 public:
38 explicit LocalRTCStatsResponse(const blink::WebRTCStatsResponse& impl) 38 explicit LocalRTCStatsResponse(const blink::WebRTCStatsResponse& impl)
39 : impl_(impl) { 39 : impl_(impl) {
40 } 40 }
41 41
42 virtual blink::WebRTCStatsResponse webKitStatsResponse() const; 42 virtual blink::WebRTCStatsResponse webKitStatsResponse() const;
43 virtual size_t addReport(blink::WebString type, blink::WebString id, 43 virtual size_t addReport(blink::WebString type, blink::WebString id,
44 double timestamp); 44 double timestamp);
45 virtual void addStatistic(size_t report, 45 virtual void addStatistic(size_t report,
46 blink::WebString name, blink::WebString value); 46 blink::WebString name, blink::WebString value);
47 47
48 protected: 48 protected:
49 virtual ~LocalRTCStatsResponse() {} 49 virtual ~LocalRTCStatsResponse() {}
50 // Constructor for creating mocks. 50 // Constructor for creating mocks.
51 LocalRTCStatsResponse() {} 51 LocalRTCStatsResponse() {}
52 52
53 private: 53 private:
54 blink::WebRTCStatsResponse impl_; 54 blink::WebRTCStatsResponse impl_;
55 }; 55 };
56 56
57 // Mockable wrapper for blink::WebRTCStatsRequest 57 // Mockable wrapper for blink::WebRTCStatsRequest
58 class CONTENT_EXPORT LocalRTCStatsRequest 58 class CONTENT_EXPORT LocalRTCStatsRequest
59 : public NON_EXPORTED_BASE(talk_base::RefCountInterface) { 59 : public NON_EXPORTED_BASE(rtc::RefCountInterface) {
60 public: 60 public:
61 explicit LocalRTCStatsRequest(blink::WebRTCStatsRequest impl); 61 explicit LocalRTCStatsRequest(blink::WebRTCStatsRequest impl);
62 // Constructor for testing. 62 // Constructor for testing.
63 LocalRTCStatsRequest(); 63 LocalRTCStatsRequest();
64 64
65 virtual bool hasSelector() const; 65 virtual bool hasSelector() const;
66 virtual blink::WebMediaStreamTrack component() const; 66 virtual blink::WebMediaStreamTrack component() const;
67 virtual void requestSucceeded(const LocalRTCStatsResponse* response); 67 virtual void requestSucceeded(const LocalRTCStatsResponse* response);
68 virtual scoped_refptr<LocalRTCStatsResponse> createResponse(); 68 virtual scoped_refptr<LocalRTCStatsResponse> createResponse();
69 69
70 protected: 70 protected:
71 virtual ~LocalRTCStatsRequest(); 71 virtual ~LocalRTCStatsRequest();
72 72
73 private: 73 private:
74 blink::WebRTCStatsRequest impl_; 74 blink::WebRTCStatsRequest impl_;
75 talk_base::scoped_refptr<LocalRTCStatsResponse> response_; 75 rtc::scoped_refptr<LocalRTCStatsResponse> response_;
76 }; 76 };
77 77
78 // RTCPeerConnectionHandler is a delegate for the RTC PeerConnection API 78 // RTCPeerConnectionHandler is a delegate for the RTC PeerConnection API
79 // messages going between WebKit and native PeerConnection in libjingle. It's 79 // messages going between WebKit and native PeerConnection in libjingle. It's
80 // owned by WebKit. 80 // owned by WebKit.
81 // WebKit calls all of these methods on the main render thread. 81 // WebKit calls all of these methods on the main render thread.
82 // Callbacks to the webrtc::PeerConnectionObserver implementation also occur on 82 // Callbacks to the webrtc::PeerConnectionObserver implementation also occur on
83 // the main render thread. 83 // the main render thread.
84 class CONTENT_EXPORT RTCPeerConnectionHandler 84 class CONTENT_EXPORT RTCPeerConnectionHandler
85 : NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler), 85 : NON_EXPORTED_BASE(public blink::WebRTCPeerConnectionHandler),
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 RemoteStreamMap remote_streams_; 223 RemoteStreamMap remote_streams_;
224 scoped_refptr<webrtc::UMAObserver> uma_observer_; 224 scoped_refptr<webrtc::UMAObserver> uma_observer_;
225 base::TimeTicks ice_connection_checking_start_; 225 base::TimeTicks ice_connection_checking_start_;
226 226
227 DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler); 227 DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
228 }; 228 };
229 229
230 } // namespace content 230 } // namespace content
231 231
232 #endif // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ 232 #endif // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/rtc_data_channel_handler.cc ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698