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

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

Issue 1124723006: VideoCaptureDeviceLinux: Add support for SPLANE+DMABUF V4L2 type capture (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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 b739aca1967fb8176190fb2f9b0c7272d542623d..283aea3ef53cb3a1ccbba4b51bdf371453effd75 100644
--- a/content/browser/renderer_host/media/video_capture_device_client.cc
+++ b/content/browser/renderer_host/media/video_capture_device_client.cc
@@ -120,6 +120,9 @@ class AutoReleaseBuffer : public media::VideoCaptureDevice::Client::Buffer {
gfx::GpuMemoryBufferType GetType() override {
return buffer_handle_->GetType();
}
+ base::PlatformFile AsPlatformFile() const override {
+ return base::PlatformFile();
+ }
ClientBuffer AsClientBuffer() override {
return buffer_handle_->AsClientBuffer();
}
@@ -418,7 +421,8 @@ VideoCaptureDeviceClient::ReserveOutputBuffer(media::VideoPixelFormat format,
const gfx::Size& dimensions) {
DCHECK(format == media::PIXEL_FORMAT_I420 ||
format == media::PIXEL_FORMAT_TEXTURE ||
- format == media::PIXEL_FORMAT_GPUMEMORYBUFFER);
+ format == media::PIXEL_FORMAT_GPUMEMORYBUFFER)
+ << "format " << media::VideoCaptureFormat::PixelFormatToString(format);
DCHECK_GT(dimensions.width(), 0);
DCHECK_GT(dimensions.height(), 0);

Powered by Google App Engine
This is Rietveld 408576698