diff options
| -rw-r--r-- | content/common/media_stream/media_stream_types.h | 14 | ||||
| -rw-r--r-- | content/content_common.gypi | 1 | ||||
| -rw-r--r-- | media/video/capture/video_capture_types.h | 8 |
3 files changed, 18 insertions, 5 deletions
diff --git a/content/common/media_stream/media_stream_types.h b/content/common/media_stream/media_stream_types.h new file mode 100644 index 0000000..b9df68d --- /dev/null +++ b/content/common/media_stream/media_stream_types.h @@ -0,0 +1,14 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_COMMON_MEDIA_STREAM_MEDIA_STREAM_TYPES_H_ +#define CONTENT_COMMON_MEDIA_STREAM_MEDIA_STREAM_TYPES_H_ + +namespace media_stream { + +typedef int MediaCaptureSessionId; + +} // namespace media_stream + +#endif // CONTENT_COMMON_MEDIA_STREAM_MEDIA_STREAM_TYPES_H_ diff --git a/content/content_common.gypi b/content/content_common.gypi index 24ef258..2e61611 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -137,6 +137,7 @@ 'common/json_value_serializer.cc', 'common/json_value_serializer.h', 'common/main_function_params.h', + 'common/media_stream/media_stream_types.h', 'common/message_router.cc', 'common/message_router.h', 'common/mime_registry_messages.h', diff --git a/media/video/capture/video_capture_types.h b/media/video/capture/video_capture_types.h index 4a7651a..ee4e3a4 100644 --- a/media/video/capture/video_capture_types.h +++ b/media/video/capture/video_capture_types.h @@ -5,18 +5,16 @@ #ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_ #define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_ -namespace media { +#include "content/common/media_stream/media_stream_types.h" -// TODO(wjia): this type should be defined in a common place and -// shared with device manager. -typedef int VideoCaptureSessionId; +namespace media { // Parameters for starting video capture and device information. struct VideoCaptureParams { int width; int height; int frame_per_second; - VideoCaptureSessionId session_id; + media_stream::MediaCaptureSessionId session_id; }; } // namespace media |