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

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

Issue 2972003002: RTCPeerConnection.ontrack event added. (Closed)
Patch Set: Le merge Created 3 years, 5 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 (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_REMOTE_MEDIA_STREAM_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
(...skipping 24 matching lines...) Expand all
35 35
36 RemoteMediaStreamImpl( 36 RemoteMediaStreamImpl(
37 const scoped_refptr<base::SingleThreadTaskRunner>& main_thread, 37 const scoped_refptr<base::SingleThreadTaskRunner>& main_thread,
38 const scoped_refptr<WebRtcMediaStreamTrackAdapterMap>& track_adapter_map, 38 const scoped_refptr<WebRtcMediaStreamTrackAdapterMap>& track_adapter_map,
39 webrtc::MediaStreamInterface* webrtc_stream); 39 webrtc::MediaStreamInterface* webrtc_stream);
40 ~RemoteMediaStreamImpl(); 40 ~RemoteMediaStreamImpl();
41 41
42 const blink::WebMediaStream& webkit_stream() { return webkit_stream_; } 42 const blink::WebMediaStream& webkit_stream() { return webkit_stream_; }
43 const scoped_refptr<webrtc::MediaStreamInterface>& webrtc_stream(); 43 const scoped_refptr<webrtc::MediaStreamInterface>& webrtc_stream();
44 44
45 void CheckAdapterRef();
46
45 private: 47 private:
46 class Observer; 48 class Observer;
47 49
48 void InitializeOnMainThread(const std::string& label, 50 void InitializeOnMainThread(const std::string& label,
49 AdapterRefMap track_adapter_refs, 51 AdapterRefMap track_adapter_refs,
50 size_t audio_track_count, 52 size_t audio_track_count,
51 size_t video_track_count); 53 size_t video_track_count);
52 54
53 void OnChanged(AdapterRefMap new_adapter_refs); 55 void OnChanged(AdapterRefMap new_adapter_refs);
54 56
(...skipping 13 matching lines...) Expand all
68 AdapterRefMap adapter_refs_; 70 AdapterRefMap adapter_refs_;
69 71
70 base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_; 72 base::WeakPtrFactory<RemoteMediaStreamImpl> weak_factory_;
71 73
72 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl); 74 DISALLOW_COPY_AND_ASSIGN(RemoteMediaStreamImpl);
73 }; 75 };
74 76
75 } // namespace content 77 } // namespace content
76 78
77 #endif // CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_ 79 #endif // CONTENT_RENDERER_MEDIA_REMOTE_MEDIA_STREAM_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698