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

Side by Side Diff: content/browser/renderer_host/media/video_capture_buffer_pool.cc

Issue 1132683004: MJPEG acceleration for video capture, browser part (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mjpeg-2-gpu
Patch Set: add flag --enable-accelerated-mjpeg-decode 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h" 5 #include "content/browser/renderer_host/media/video_capture_buffer_pool.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h" 10 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 return format_pair.storage_type; 54 return format_pair.storage_type;
55 } 55 }
56 LOG(ERROR) << "Unsupported VideoPixelFormat " 56 LOG(ERROR) << "Unsupported VideoPixelFormat "
57 << media::VideoCaptureFormat::PixelFormatToString(pixel_format); 57 << media::VideoCaptureFormat::PixelFormatToString(pixel_format);
58 return VideoFrame::STORAGE_UNKNOWN; 58 return VideoFrame::STORAGE_UNKNOWN;
59 } 59 }
60 60
61 // A simple holder of a memory-backed buffer and accesors to it. 61 // A simple holder of a memory-backed buffer and accesors to it.
62 class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle { 62 class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
63 public: 63 public:
64 SimpleBufferHandle(void* data, size_t size) : data_(data), size_(size) {} 64 SimpleBufferHandle(void* data, size_t size, base::SharedMemoryHandle handle)
65 : data_(data), size_(size), handle_(handle) {}
65 ~SimpleBufferHandle() override {} 66 ~SimpleBufferHandle() override {}
66 67
67 size_t size() const override { return size_; } 68 size_t size() const override { return size_; }
68 void* data() override { return data_; } 69 void* data() override { return data_; }
69 gfx::GpuMemoryBufferType GetType() override { 70 gfx::GpuMemoryBufferType GetType() override {
70 return gfx::SHARED_MEMORY_BUFFER; 71 return gfx::SHARED_MEMORY_BUFFER;
71 } 72 }
72 ClientBuffer AsClientBuffer() override { return nullptr; } 73 ClientBuffer AsClientBuffer() override { return nullptr; }
74 base::PlatformFile AsPlatformHandle() override {
75 #if defined(OS_POSIX)
76 return handle_.fd;
77 #else
78 return handle_;
79 #endif
80 }
73 81
74 private: 82 private:
75 void* const data_; 83 void* const data_;
76 const size_t size_; 84 const size_t size_;
85 const base::SharedMemoryHandle handle_;
77 }; 86 };
78 87
79 // A holder of a GpuMemoryBuffer-backed buffer, Map()ed on ctor and Unmap()ed on 88 // A holder of a GpuMemoryBuffer-backed buffer, Map()ed on ctor and Unmap()ed on
80 // dtor. Holds a weak reference to its GpuMemoryBuffer. 89 // dtor. Holds a weak reference to its GpuMemoryBuffer.
81 // TODO(mcasas) Map()ed on ctor, or on first use? 90 // TODO(mcasas) Map()ed on ctor, or on first use?
82 class GpuMemoryBufferBufferHandle 91 class GpuMemoryBufferBufferHandle
83 final : public VideoCaptureBufferPool::BufferHandle { 92 final : public VideoCaptureBufferPool::BufferHandle {
84 public: 93 public:
85 GpuMemoryBufferBufferHandle(gfx::GpuMemoryBuffer* gmb, size_t size) 94 GpuMemoryBufferBufferHandle(gfx::GpuMemoryBuffer* gmb, size_t size)
86 : gmb_(gmb), 95 : gmb_(gmb),
87 data_(new void* [GpuMemoryBufferImpl:: 96 data_(new void* [GpuMemoryBufferImpl::
88 NumberOfPlanesForGpuMemoryBufferFormat( 97 NumberOfPlanesForGpuMemoryBufferFormat(
89 gmb_->GetFormat())]), 98 gmb_->GetFormat())]),
90 size_(size) { 99 size_(size) {
91 DCHECK(gmb && !gmb_->IsMapped()); 100 DCHECK(gmb && !gmb_->IsMapped());
92 gmb_->Map(data_.get()); 101 gmb_->Map(data_.get());
93 } 102 }
94 ~GpuMemoryBufferBufferHandle() override { gmb_->Unmap(); } 103 ~GpuMemoryBufferBufferHandle() override { gmb_->Unmap(); }
95 104
96 size_t size() const override { return size_; } 105 size_t size() const override { return size_; }
97 void* data() override { return data_[0]; } 106 void* data() override { return data_[0]; }
98 gfx::GpuMemoryBufferType GetType() override { 107 gfx::GpuMemoryBufferType GetType() override {
99 return gmb_->GetHandle().type; 108 return gmb_->GetHandle().type;
100 } 109 }
101 ClientBuffer AsClientBuffer() override { return gmb_->AsClientBuffer(); } 110 ClientBuffer AsClientBuffer() override { return gmb_->AsClientBuffer(); }
111 base::PlatformFile AsPlatformHandle() override {
112 #if defined(OS_POSIX)
113 return gmb_->GetHandle().handle.fd;
114 #else
115 return gmb_->GetHandle().handle;
116 #endif
117 }
102 118
103 private: 119 private:
104 gfx::GpuMemoryBuffer* const gmb_; 120 gfx::GpuMemoryBuffer* const gmb_;
105 scoped_ptr<void*[]> data_; 121 scoped_ptr<void*[]> data_;
106 const size_t size_; 122 const size_t size_;
107 }; 123 };
108 124
109 // Tracker specifics for SharedMemory. 125 // Tracker specifics for SharedMemory.
110 class VideoCaptureBufferPool::SharedMemTracker final : public Tracker { 126 class VideoCaptureBufferPool::SharedMemTracker final : public Tracker {
111 public: 127 public:
112 SharedMemTracker(); 128 SharedMemTracker();
113 bool Init(VideoFrame::Format format, 129 bool Init(VideoFrame::Format format,
114 media::VideoFrame::StorageType storage_type, 130 media::VideoFrame::StorageType storage_type,
115 const gfx::Size& dimensions) override; 131 const gfx::Size& dimensions) override;
116 132
117 size_t mapped_size() const override { return shared_memory_.mapped_size(); } 133 size_t mapped_size() const override { return shared_memory_.mapped_size(); }
118 134
119 scoped_ptr<BufferHandle> GetBufferHandle() override { 135 scoped_ptr<BufferHandle> GetBufferHandle() override {
120 return make_scoped_ptr( 136 return make_scoped_ptr(new SimpleBufferHandle(
121 new SimpleBufferHandle(shared_memory_.memory(), mapped_size())); 137 shared_memory_.memory(), mapped_size(), shared_memory_.handle()));
122 } 138 }
123 139
124 bool ShareToProcess(base::ProcessHandle process_handle, 140 bool ShareToProcess(base::ProcessHandle process_handle,
125 base::SharedMemoryHandle* new_handle) override { 141 base::SharedMemoryHandle* new_handle) override {
126 return shared_memory_.ShareToProcess(process_handle, new_handle); 142 return shared_memory_.ShareToProcess(process_handle, new_handle);
127 } 143 }
128 144
129 private: 145 private:
130 // The memory created to be shared with renderer processes. 146 // The memory created to be shared with renderer processes.
131 base::SharedMemory shared_memory_; 147 base::SharedMemory shared_memory_;
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 return buffer_id; 396 return buffer_id;
381 } 397 }
382 398
383 VideoCaptureBufferPool::Tracker* VideoCaptureBufferPool::GetTracker( 399 VideoCaptureBufferPool::Tracker* VideoCaptureBufferPool::GetTracker(
384 int buffer_id) { 400 int buffer_id) {
385 TrackerMap::const_iterator it = trackers_.find(buffer_id); 401 TrackerMap::const_iterator it = trackers_.find(buffer_id);
386 return (it == trackers_.end()) ? NULL : it->second; 402 return (it == trackers_.end()) ? NULL : it->second;
387 } 403 }
388 404
389 } // namespace content 405 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698