| Index: ppapi/cpp/dev/video_capture_dev.h
|
| diff --git a/ppapi/cpp/dev/video_capture_dev.h b/ppapi/cpp/dev/video_capture_dev.h
|
| index 16c9d2bf5a0beec26d0386d01919fc84e45bc3e2..9ad5287ae147984d3948235d47d7926836969a2b 100644
|
| --- a/ppapi/cpp/dev/video_capture_dev.h
|
| +++ b/ppapi/cpp/dev/video_capture_dev.h
|
| @@ -1,15 +1,19 @@
|
| -// Copyright (c) 2011 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2012 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 PPAPI_CPP_DEV_VIDEO_CAPTURE_DEV_H_
|
| #define PPAPI_CPP_DEV_VIDEO_CAPTURE_DEV_H_
|
|
|
| +#include <vector>
|
| +
|
| #include "ppapi/c/dev/pp_video_capture_dev.h"
|
| #include "ppapi/cpp/resource.h"
|
|
|
| namespace pp {
|
|
|
| +class CompletionCallback;
|
| +class DeviceRef_Dev;
|
| class Instance;
|
|
|
| class VideoCapture_Dev : public Resource {
|
| @@ -21,7 +25,12 @@ class VideoCapture_Dev : public Resource {
|
| // Returns true if the required interface is available.
|
| static bool IsAvailable();
|
|
|
| - int32_t StartCapture(const PP_VideoCaptureDeviceInfo_Dev& requested_info,
|
| + int32_t EnumerateDevices(const CompletionCallback& callback);
|
| + void GetDevices(std::vector<DeviceRef_Dev>* devices);
|
| + // If |device_ref| is null (i.e., is_null() returns true), the default device
|
| + // will be used.
|
| + int32_t StartCapture(const DeviceRef_Dev& device_ref,
|
| + const PP_VideoCaptureDeviceInfo_Dev& requested_info,
|
| uint32_t buffer_count);
|
| int32_t ReuseBuffer(uint32_t buffer);
|
| int32_t StopCapture();
|
|
|