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

Unified Diff: content/browser/renderer_host/media/video_capture_device_client.cc

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_device_client.cc
diff --git a/content/browser/renderer_host/media/video_capture_device_client.cc b/content/browser/renderer_host/media/video_capture_device_client.cc
index cd39c5fa750dc48da1fc151b6c00d2f4b628e120..fd5d5d69b942052fb0e396a0d21893b33ef0352d 100644
--- a/content/browser/renderer_host/media/video_capture_device_client.cc
+++ b/content/browser/renderer_host/media/video_capture_device_client.cc
@@ -32,7 +32,7 @@ namespace content {
// Class combining a Client::Buffer interface implementation and a pool buffer
// implementation to guarantee proper cleanup on destruction on our side.
-class AutoReleaseBuffer : public media::VideoCaptureDevice::Client::Buffer {
+class AutoReleaseBuffer : public device::VideoCaptureDevice::Client::Buffer {
public:
AutoReleaseBuffer(const scoped_refptr<VideoCaptureBufferPool>& pool,
int buffer_id)
@@ -264,7 +264,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
timestamp);
}
-std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>
+std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>
VideoCaptureDeviceClient::ReserveOutputBuffer(
const gfx::Size& frame_size,
media::VideoPixelFormat pixel_format,
@@ -342,7 +342,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedVideoFrame(
controller_, base::Passed(&buffer), frame));
}
-std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>
+std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>
VideoCaptureDeviceClient::ResurrectLastOutputBuffer(
const gfx::Size& dimensions,
media::VideoPixelFormat format,
@@ -382,7 +382,7 @@ double VideoCaptureDeviceClient::GetBufferPoolUtilization() const {
return buffer_pool_->GetBufferPoolUtilization();
}
-std::unique_ptr<media::VideoCaptureDevice::Client::Buffer>
+std::unique_ptr<device::VideoCaptureDevice::Client::Buffer>
VideoCaptureDeviceClient::ReserveI420OutputBuffer(
const gfx::Size& dimensions,
media::VideoPixelStorage storage,

Powered by Google App Engine
This is Rietveld 408576698