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

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

Issue 8480028: support video device enumeration from renderer process. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: code review Created 8 years, 11 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_MEDIA_STREAM_IMPL_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 6 #define CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
7 7
8 #include <list> 8 #include <list>
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 const std::string& label, 97 const std::string& label,
98 const media_stream::StreamDeviceInfoArray& audio_array, 98 const media_stream::StreamDeviceInfoArray& audio_array,
99 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE; 99 const media_stream::StreamDeviceInfoArray& video_array) OVERRIDE;
100 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE; 100 virtual void OnStreamGenerationFailed(int request_id) OVERRIDE;
101 virtual void OnVideoDeviceFailed( 101 virtual void OnVideoDeviceFailed(
102 const std::string& label, 102 const std::string& label,
103 int index) OVERRIDE; 103 int index) OVERRIDE;
104 virtual void OnAudioDeviceFailed( 104 virtual void OnAudioDeviceFailed(
105 const std::string& label, 105 const std::string& label,
106 int index) OVERRIDE; 106 int index) OVERRIDE;
107 virtual void OnDevicesEnumerated(
108 int request_id,
109 const media_stream::StreamDeviceInfoArray& device_array) OVERRIDE;
110 virtual void OnDevicesEnumerationFailed(int request_id) OVERRIDE;
111 virtual void OnDeviceOpened(
112 int request_id,
113 const std::string& label,
114 const media_stream::StreamDeviceInfo& device_info) OVERRIDE;
115 virtual void OnDeviceOpenFailed(int request_id) OVERRIDE;
107 116
108 private: 117 private:
109 FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, Basic); 118 FRIEND_TEST_ALL_PREFIXES(MediaStreamImplTest, Basic);
110 119
111 void InitializeWorkerThread( 120 void InitializeWorkerThread(
112 talk_base::Thread** thread, 121 talk_base::Thread** thread,
113 base::WaitableEvent* event); 122 base::WaitableEvent* event);
114 void DeleteIpcNetworkManager(); 123 void DeleteIpcNetworkManager();
115 124
116 scoped_ptr<MediaStreamDependencyFactory> dependency_factory_; 125 scoped_ptr<MediaStreamDependencyFactory> dependency_factory_;
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 // temporary and will be handled differently when several PeerConnections 168 // temporary and will be handled differently when several PeerConnections
160 // and/or streams is supported. 169 // and/or streams is supported.
161 // TODO(grunell): This shall be removed or changed when native PeerConnection 170 // TODO(grunell): This shall be removed or changed when native PeerConnection
162 // has been updated to closer follow the specification. 171 // has been updated to closer follow the specification.
163 bool vcm_created_; 172 bool vcm_created_;
164 173
165 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl); 174 DISALLOW_COPY_AND_ASSIGN(MediaStreamImpl);
166 }; 175 };
167 176
168 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_ 177 #endif // CONTENT_RENDERER_MEDIA_MEDIA_STREAM_IMPL_H_
OLDNEW
« no previous file with comments | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/media/media_stream_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698