Index: media/video/capture/video_capture_types.h |
=================================================================== |
--- media/video/capture/video_capture_types.h (revision 84887) |
+++ media/video/capture/video_capture_types.h (working copy) |
@@ -5,18 +5,16 @@ |
#ifndef MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_ |
#define MEDIA_VIDEO_CAPTURE_VIDEO_CAPTURE_TYPES_H_ |
+#include "media/base/media_stream_types.h" |
+ |
namespace media { |
-// TODO(wjia): this type should be defined in a common place and |
-// shared with device manager. |
-typedef int VideoCaptureSessionId; |
- |
// Parameters for starting video capture and device information. |
struct VideoCaptureParams { |
int width; |
int height; |
int frame_per_second; |
- VideoCaptureSessionId session_id; |
+ MediaCaptureSessionId session_id; |
}; |
} // namespace media |