| Index: device/capture/content/video_capture_oracle.h
|
| diff --git a/media/capture/content/video_capture_oracle.h b/device/capture/content/video_capture_oracle.h
|
| similarity index 93%
|
| rename from media/capture/content/video_capture_oracle.h
|
| rename to device/capture/content/video_capture_oracle.h
|
| index 82898f905a56d89a3f434561656e1a55010e707b..17005915897aef7fbe0307c9ae5d51cac1b44e04 100644
|
| --- a/media/capture/content/video_capture_oracle.h
|
| +++ b/device/capture/content/video_capture_oracle.h
|
| @@ -2,19 +2,19 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef MEDIA_CAPTURE_CONTENT_VIDEO_CAPTURE_ORACLE_H_
|
| -#define MEDIA_CAPTURE_CONTENT_VIDEO_CAPTURE_ORACLE_H_
|
| +#ifndef DEVICE_CAPTURE_CONTENT_VIDEO_CAPTURE_ORACLE_H_
|
| +#define DEVICE_CAPTURE_CONTENT_VIDEO_CAPTURE_ORACLE_H_
|
|
|
| #include "base/callback_forward.h"
|
| #include "base/time/time.h"
|
| +#include "device/capture/capture_export.h"
|
| +#include "device/capture/content/animated_content_sampler.h"
|
| +#include "device/capture/content/capture_resolution_chooser.h"
|
| +#include "device/capture/content/smooth_event_sampler.h"
|
| #include "media/base/feedback_signal_accumulator.h"
|
| -#include "media/capture/capture_export.h"
|
| -#include "media/capture/content/animated_content_sampler.h"
|
| -#include "media/capture/content/capture_resolution_chooser.h"
|
| -#include "media/capture/content/smooth_event_sampler.h"
|
| #include "ui/gfx/geometry/rect.h"
|
|
|
| -namespace media {
|
| +namespace device {
|
|
|
| // VideoCaptureOracle manages the producer-side throttling of captured frames
|
| // from a video capture device. It is informed of every update by the device;
|
| @@ -180,13 +180,13 @@ class CAPTURE_EXPORT VideoCaptureOracle {
|
| base::TimeTicks frame_timestamps_[kMaxFrameTimestamps];
|
|
|
| // Recent average buffer pool utilization for capture.
|
| - FeedbackSignalAccumulator<base::TimeTicks> buffer_pool_utilization_;
|
| + media::FeedbackSignalAccumulator<base::TimeTicks> buffer_pool_utilization_;
|
|
|
| // Estimated maximum frame area that currently can be handled by the consumer,
|
| // in number of pixels per frame. This is used to adjust the capture size up
|
| // or down to a data volume the consumer can handle. Note that some consumers
|
| // do not provide feedback, and the analysis logic should account for that.
|
| - FeedbackSignalAccumulator<base::TimeTicks> estimated_capable_area_;
|
| + media::FeedbackSignalAccumulator<base::TimeTicks> estimated_capable_area_;
|
|
|
| // The time of the first analysis which concluded the end-to-end system was
|
| // under-utilized. If null, the system is not currently under-utilized. This
|
| @@ -200,6 +200,6 @@ class CAPTURE_EXPORT VideoCaptureOracle {
|
| base::TimeTicks last_time_animation_was_detected_;
|
| };
|
|
|
| -} // namespace media
|
| +} // namespace device
|
|
|
| -#endif // MEDIA_CAPTURE_CONTENT_VIDEO_CAPTURE_ORACLE_H_
|
| +#endif // DEVICE_CAPTURE_CONTENT_VIDEO_CAPTURE_ORACLE_H_
|
|
|