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

Side by Side Diff: content/public/common/media_stream_request.h

Issue 15906019: Hook up EncodedVideoSource on the browser side (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@screencast_cl_6
Patch Set: 516738a8 IPC/struct changes, courtesy hshi@ Created 7 years, 6 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_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 6 #define CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 14 matching lines...) Expand all
25 MEDIA_DEVICE_AUDIO_CAPTURE, 25 MEDIA_DEVICE_AUDIO_CAPTURE,
26 MEDIA_DEVICE_VIDEO_CAPTURE, 26 MEDIA_DEVICE_VIDEO_CAPTURE,
27 27
28 // Mirroring of a browser tab. 28 // Mirroring of a browser tab.
29 MEDIA_TAB_AUDIO_CAPTURE, 29 MEDIA_TAB_AUDIO_CAPTURE,
30 MEDIA_TAB_VIDEO_CAPTURE, 30 MEDIA_TAB_VIDEO_CAPTURE,
31 31
32 // Capture content of the screen. 32 // Capture content of the screen.
33 MEDIA_SCREEN_VIDEO_CAPTURE, 33 MEDIA_SCREEN_VIDEO_CAPTURE,
34 34
35 // Capture content of the screen, as an encoded video.
36 MEDIA_SCREEN_ENCODED_VIDEO_CAPTURE,
37
35 NUM_MEDIA_TYPES 38 NUM_MEDIA_TYPES
36 }; 39 };
37 40
38 // Types of media stream requests that can be made to the media controller. 41 // Types of media stream requests that can be made to the media controller.
39 enum MediaStreamRequestType { 42 enum MediaStreamRequestType {
40 MEDIA_DEVICE_ACCESS = 0, 43 MEDIA_DEVICE_ACCESS = 0,
41 MEDIA_GENERATE_STREAM, 44 MEDIA_GENERATE_STREAM,
42 MEDIA_ENUMERATE_DEVICES, 45 MEDIA_ENUMERATE_DEVICES,
43 MEDIA_OPEN_DEVICE 46 MEDIA_OPEN_DEVICE
44 }; 47 };
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 }; 149 };
147 150
148 // Callback used return results of media access requests. 151 // Callback used return results of media access requests.
149 typedef base::Callback<void( 152 typedef base::Callback<void(
150 const MediaStreamDevices& devices, 153 const MediaStreamDevices& devices,
151 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback; 154 scoped_ptr<MediaStreamUI> ui)> MediaResponseCallback;
152 155
153 } // namespace content 156 } // namespace content
154 157
155 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_ 158 #endif // CONTENT_PUBLIC_COMMON_MEDIA_STREAM_REQUEST_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698