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

Unified Diff: media/capture/video/fake_video_capture_device.cc

Issue 2613793007: Revert of [Mojo Video Capture] Simplify media::VideoCaptureDevice::Client:Buffer to a struct (Closed)
Patch Set: Created 3 years, 11 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: media/capture/video/fake_video_capture_device.cc
diff --git a/media/capture/video/fake_video_capture_device.cc b/media/capture/video/fake_video_capture_device.cc
index 9c87afc9e415ce8a45420385621c8cdcd04b5d65..8ea60bccc8efd1f1e11626a75de38f7e8bc173bf 100644
--- a/media/capture/video/fake_video_capture_device.cc
+++ b/media/capture/video/fake_video_capture_device.cc
@@ -320,19 +320,16 @@
DCHECK(thread_checker_.CalledOnValidThread());
const int arbitrary_frame_feedback_id = 0;
- VideoCaptureDevice::Client::Buffer capture_buffer =
+ std::unique_ptr<VideoCaptureDevice::Client::Buffer> capture_buffer(
client_->ReserveOutputBuffer(
capture_format_.frame_size, capture_format_.pixel_format,
- capture_format_.pixel_storage, arbitrary_frame_feedback_id);
- DLOG_IF(ERROR, !capture_buffer.is_valid())
- << "Couldn't allocate Capture Buffer";
- auto buffer_access =
- capture_buffer.handle_provider()->GetHandleForInProcessAccess();
- DCHECK(buffer_access->data()) << "Buffer has NO backing memory";
+ capture_format_.pixel_storage, arbitrary_frame_feedback_id));
+ DLOG_IF(ERROR, !capture_buffer) << "Couldn't allocate Capture Buffer";
+ DCHECK(capture_buffer->data()) << "Buffer has NO backing memory";
DCHECK_EQ(PIXEL_STORAGE_CPU, capture_format_.pixel_storage);
- uint8_t* data_ptr = buffer_access->data();
- memset(data_ptr, 0, buffer_access->mapped_size());
+ uint8_t* data_ptr = static_cast<uint8_t*>(capture_buffer->data());
+ memset(data_ptr, 0, capture_buffer->mapped_size());
DrawPacman(capture_format_.pixel_format, data_ptr, elapsed_time_,
fake_capture_rate_, capture_format_.frame_size, current_zoom_);
« no previous file with comments | « media/capture/content/thread_safe_capture_oracle.cc ('k') | media/capture/video/fake_video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698