| Index: media/capture/video/video_capture_system_impl.h
|
| diff --git a/media/capture/video/video_capture_system.h b/media/capture/video/video_capture_system_impl.h
|
| similarity index 54%
|
| copy from media/capture/video/video_capture_system.h
|
| copy to media/capture/video/video_capture_system_impl.h
|
| index f03e3a98236e5d9d47e2f2c91a0341a59da27c12..97cfc697f46451200d927c3f959d211db5461173 100644
|
| --- a/media/capture/video/video_capture_system.h
|
| +++ b/media/capture/video/video_capture_system_impl.h
|
| @@ -2,39 +2,25 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_SYSTEM_H_
|
| -#define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_SYSTEM_H_
|
| +#ifndef MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_SYSTEM_IMPL_H_
|
| +#define MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_SYSTEM_IMPL_H_
|
|
|
| -#include "media/capture/video/video_capture_device_factory.h"
|
| -#include "media/capture/video/video_capture_device_info.h"
|
| +#include "media/capture/video/video_capture_system.h"
|
|
|
| namespace media {
|
|
|
| // Layer on top of VideoCaptureDeviceFactory that translates device descriptors
|
| // to string identifiers and consolidates and caches device descriptors and
|
| // supported formats into VideoCaptureDeviceInfos.
|
| -class CAPTURE_EXPORT VideoCaptureSystem {
|
| +class CAPTURE_EXPORT VideoCaptureSystemImpl : public VideoCaptureSystem {
|
| public:
|
| - using DeviceInfoCallback =
|
| - base::Callback<void(const std::vector<VideoCaptureDeviceInfo>&)>;
|
| -
|
| - explicit VideoCaptureSystem(
|
| + explicit VideoCaptureSystemImpl(
|
| std::unique_ptr<VideoCaptureDeviceFactory> factory);
|
| - ~VideoCaptureSystem();
|
| -
|
| - // The passed-in |result_callback| must have ownership of the called
|
| - // VideoCaptureSystem instance to guarantee that it stays alive during the
|
| - // asynchronous operation.
|
| - void GetDeviceInfosAsync(const DeviceInfoCallback& result_callback);
|
| + ~VideoCaptureSystemImpl() override;
|
|
|
| - // Creates a VideoCaptureDevice object. Returns nullptr if something goes
|
| - // wrong.
|
| + void GetDeviceInfosAsync(const DeviceInfoCallback& result_callback) override;
|
| std::unique_ptr<VideoCaptureDevice> CreateDevice(
|
| - const std::string& device_id);
|
| -
|
| - media::VideoCaptureDeviceFactory* video_capture_device_factory() const {
|
| - return factory_.get();
|
| - }
|
| + const std::string& device_id) override;
|
|
|
| private:
|
| void OnDescriptorsReceived(
|
| @@ -53,4 +39,4 @@ class CAPTURE_EXPORT VideoCaptureSystem {
|
|
|
| } // namespace media
|
|
|
| -#endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_DEVICE_FACTORY_H_
|
| +#endif // MEDIA_CAPTURE_VIDEO_VIDEO_CAPTURE_SYSTEM_IMPL_H_
|
|
|