Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h

Issue 2214533002: move //media/capture to //device/capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
diff --git a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
index 85f94f0348fabe6dc77f1b223c9e9dfead2f45a3..17ad900b9f96a4f535a1146c11f3212234893133 100644
--- a/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
+++ b/content/browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h
@@ -18,7 +18,7 @@
#include "base/single_thread_task_runner.h"
#include "base/threading/thread.h"
#include "content/common/content_export.h"
-#include "media/capture/video/video_capture_device.h"
+#include "device/capture/video/video_capture_device.h"
#include "media/video/jpeg_decode_accelerator.h"
namespace gpu {
@@ -53,7 +53,7 @@ class CONTENT_EXPORT VideoCaptureGpuJpegDecoder
};
typedef base::Callback<void(
- std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>,
+ std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>,
const scoped_refptr<media::VideoFrame>&)>
DecodeDoneCB;
@@ -76,7 +76,7 @@ class CONTENT_EXPORT VideoCaptureGpuJpegDecoder
const media::VideoCaptureFormat& frame_format,
base::TimeTicks reference_time,
base::TimeDelta timestamp,
- std::unique_ptr<media::VideoCaptureDevice::Client::Buffer> out_buffer);
+ std::unique_ptr<device::VideoCaptureDevice::Client::Buffer> out_buffer);
// JpegDecodeAccelerator::Client implementation.
// These will be called on IO thread.

Powered by Google App Engine
This is Rietveld 408576698