summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 21:03:22 +0000
committerwjia@google.com <wjia@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 21:03:22 +0000
commit493b4afd5563f63d86ba8c5531c2ce8de8542559 (patch)
tree406b69c5e1e801f29be13aed4ef875fee943501a /media
parent006975ac7d11cdc234c4776318d7735ef6e578d9 (diff)
downloadchromium_src-493b4afd5563f63d86ba8c5531c2ce8de8542559.zip
chromium_src-493b4afd5563f63d86ba8c5531c2ce8de8542559.tar.gz
chromium_src-493b4afd5563f63d86ba8c5531c2ce8de8542559.tar.bz2
Adding a new file for media stream types that will be used by future Chrome changes to support video capture devices and the media stream api.
Review URL: http://codereview.chromium.org/6980019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/video/capture/video_capture_types.h8
1 files changed, 3 insertions, 5 deletions
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