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

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

Issue 1016773002: MJPEG acceleration for video capture using VAAPI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: (hide change of base/containers/scoped_ptr_hash_map.h in https://codereview.chromium.org/1099383002… Created 5 years, 8 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_buffer_pool.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.cc b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
index a336a7efc7896563a19f2ec8bf29cad0625f7354..69aae6f5b278e74ba1dd9473af5c3e9afd90b2af 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -43,6 +43,7 @@ class VideoCaptureBufferPool::SharedMemTracker final : public Tracker {
void* storage() override { return shared_memory_.memory(); }
size_t requested_size() override { return shared_memory_.requested_size(); }
size_t mapped_size() override { return shared_memory_.mapped_size(); }
+ base::SharedMemoryHandle handle() override { return shared_memory_.handle(); }
bool ShareToProcess(base::ProcessHandle process_handle,
base::SharedMemoryHandle* new_handle) override {
@@ -107,7 +108,8 @@ base::SharedMemoryHandle VideoCaptureBufferPool::ShareToProcess(
bool VideoCaptureBufferPool::GetBufferInfo(int buffer_id,
void** storage,
- size_t* size) {
+ size_t* size,
+ base::SharedMemoryHandle* handle) {
base::AutoLock lock(lock_);
Tracker* tracker = GetTracker(buffer_id);
@@ -119,6 +121,7 @@ bool VideoCaptureBufferPool::GetBufferInfo(int buffer_id,
DCHECK(tracker->held_by_producer());
*storage = tracker->storage();
*size = tracker->mapped_size();
+ *handle = tracker->handle();
return true;
}

Powered by Google App Engine
This is Rietveld 408576698