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

Unified Diff: content/public/common/media_stream_request.h

Issue 2609863004: Pass camera facing to WebKit (Closed)
Patch Set: change comments Created 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/media/media_stream_messages.h ('k') | content/public/common/media_stream_request.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/media_stream_request.h
diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
index 07a4e1af114d6adf49e2d65b1982c7ac1c1de92c..1ed4d7ee26d8db46b63506c7fd59e3ee22fe4b66 100644
--- a/content/public/common/media_stream_request.h
+++ b/content/public/common/media_stream_request.h
@@ -15,6 +15,7 @@
#include "base/callback_forward.h"
#include "content/common/content_export.h"
#include "media/base/audio_parameters.h"
+#include "media/base/video_facing.h"
#include "ui/gfx/native_widget_types.h"
#include "url/gurl.h"
@@ -48,15 +49,6 @@ enum MediaStreamRequestType {
MEDIA_OPEN_DEVICE_PEPPER_ONLY // Only used in requests made by Pepper.
};
-// Facing mode for video capture.
-enum VideoFacingMode {
- MEDIA_VIDEO_FACING_NONE = 0,
- MEDIA_VIDEO_FACING_USER,
- MEDIA_VIDEO_FACING_ENVIRONMENT,
-
- NUM_MEDIA_VIDEO_FACING_MODE
-};
-
// Elements in this enum should not be deleted or rearranged; the only
// permitted operation is to add new elements before NUM_MEDIA_REQUEST_RESULTS.
enum MediaStreamRequestResult {
@@ -95,6 +87,11 @@ struct CONTENT_EXPORT MediaStreamDevice {
MediaStreamDevice(MediaStreamType type,
const std::string& id,
const std::string& name,
+ media::VideoFacingMode facing);
+
+ MediaStreamDevice(MediaStreamType type,
+ const std::string& id,
+ const std::string& name,
int sample_rate,
int channel_layout,
int frames_per_buffer);
@@ -112,7 +109,7 @@ struct CONTENT_EXPORT MediaStreamDevice {
std::string id;
// The facing mode for video capture device.
- VideoFacingMode video_facing;
+ media::VideoFacingMode video_facing;
// The device id of a matched output device if any (otherwise empty).
// Only applicable to audio devices.
« no previous file with comments | « content/common/media/media_stream_messages.h ('k') | content/public/common/media_stream_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698