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

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

Issue 2620763003: Reland [Mojo Video Capture] Simplify media::VideoCaptureDevice::Client:Buffer to a struct (Closed)
Patch Set: Merge-in changes from upstream 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: content/browser/renderer_host/media/video_capture_manager.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc
index 24880a5759a4fb77c265057242bd5fb93c51fed1..007fae8d034143bd019b28d18fa6ea52b26a205f 100644
--- a/content/browser/renderer_host/media/video_capture_manager.cc
+++ b/content/browser/renderer_host/media/video_capture_manager.cc
@@ -231,10 +231,6 @@ class BufferPoolFrameBufferPool : public media::FrameBufferPool {
buffer_pool_->RelinquishConsumerHold(buffer_id, 1);
}
- mojo::ScopedSharedBufferHandle GetHandleForTransit(int buffer_id) override {
- return buffer_pool_->GetHandleForTransit(buffer_id);
- }
-
private:
scoped_refptr<media::VideoCaptureBufferPool> buffer_pool_;
};
@@ -757,7 +753,7 @@ void VideoCaptureManager::StartCaptureForClient(
// Run the callback first, as AddClient() may trigger OnFrameInfo().
done_cb.Run(entry->video_capture_controller.GetWeakPtrForIOThread());
entry->video_capture_controller.AddClient(client_id, client_handler,
- session_id, params);
+ session_id, params);
}
void VideoCaptureManager::StopCaptureForClient(

Powered by Google App Engine
This is Rietveld 408576698