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

Side by Side Diff: content/renderer/media/video_capture_message_filter.cc

Issue 1267883002: Pass GpuMemoryBuffer backed VideoFrame from browser to renderer processes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gmbtracker-multiple
Patch Set: Rebase Created 5 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/renderer/media/video_capture_message_filter.h" 5 #include "content/renderer/media/video_capture_message_filter.h"
6 6
7 #include "content/common/media/video_capture_messages.h" 7 #include "content/common/media/video_capture_messages.h"
8 #include "content/common/view_messages.h" 8 #include "content/common/view_messages.h"
9 #include "ipc/ipc_sender.h" 9 #include "ipc/ipc_sender.h"
10 10
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 return sender_->Send(message); 55 return sender_->Send(message);
56 } 56 }
57 57
58 bool VideoCaptureMessageFilter::OnMessageReceived(const IPC::Message& message) { 58 bool VideoCaptureMessageFilter::OnMessageReceived(const IPC::Message& message) {
59 bool handled = true; 59 bool handled = true;
60 IPC_BEGIN_MESSAGE_MAP(VideoCaptureMessageFilter, message) 60 IPC_BEGIN_MESSAGE_MAP(VideoCaptureMessageFilter, message)
61 IPC_MESSAGE_HANDLER(VideoCaptureMsg_BufferReady, OnBufferReceived) 61 IPC_MESSAGE_HANDLER(VideoCaptureMsg_BufferReady, OnBufferReceived)
62 IPC_MESSAGE_HANDLER(VideoCaptureMsg_StateChanged, OnDeviceStateChanged) 62 IPC_MESSAGE_HANDLER(VideoCaptureMsg_StateChanged, OnDeviceStateChanged)
63 IPC_MESSAGE_HANDLER(VideoCaptureMsg_NewBuffer, OnBufferCreated) 63 IPC_MESSAGE_HANDLER(VideoCaptureMsg_NewBuffer, OnBufferCreated)
64 IPC_MESSAGE_HANDLER(VideoCaptureMsg_NewGpuMemoryBuffer,
65 OnGpuMemoryBufferCreated)
64 IPC_MESSAGE_HANDLER(VideoCaptureMsg_FreeBuffer, OnBufferDestroyed) 66 IPC_MESSAGE_HANDLER(VideoCaptureMsg_FreeBuffer, OnBufferDestroyed)
65 IPC_MESSAGE_HANDLER(VideoCaptureMsg_DeviceSupportedFormatsEnumerated, 67 IPC_MESSAGE_HANDLER(VideoCaptureMsg_DeviceSupportedFormatsEnumerated,
66 OnDeviceSupportedFormatsEnumerated) 68 OnDeviceSupportedFormatsEnumerated)
67 IPC_MESSAGE_HANDLER(VideoCaptureMsg_DeviceFormatsInUseReceived, 69 IPC_MESSAGE_HANDLER(VideoCaptureMsg_DeviceFormatsInUseReceived,
68 OnDeviceFormatsInUseReceived) 70 OnDeviceFormatsInUseReceived)
69 IPC_MESSAGE_UNHANDLED(handled = false) 71 IPC_MESSAGE_UNHANDLED(handled = false)
70 IPC_END_MESSAGE_MAP() 72 IPC_END_MESSAGE_MAP()
71 return handled; 73 return handled;
72 } 74 }
73 75
(...skipping 22 matching lines...) Expand all
96 int device_id) const { 98 int device_id) const {
97 Delegates::const_iterator i = delegates_.find(device_id); 99 Delegates::const_iterator i = delegates_.find(device_id);
98 return i != delegates_.end() ? i->second : NULL; 100 return i != delegates_.end() ? i->second : NULL;
99 } 101 }
100 102
101 void VideoCaptureMessageFilter::OnBufferCreated( 103 void VideoCaptureMessageFilter::OnBufferCreated(
102 int device_id, 104 int device_id,
103 base::SharedMemoryHandle handle, 105 base::SharedMemoryHandle handle,
104 int length, 106 int length,
105 int buffer_id) { 107 int buffer_id) {
106 Delegate* delegate = find_delegate(device_id); 108 Delegate* const delegate = find_delegate(device_id);
107 if (!delegate) { 109 if (!delegate) {
108 DLOG(WARNING) << "OnBufferCreated: Got video SHM buffer for a " 110 DLOG(WARNING) << "OnBufferCreated: Got video SHM buffer for a "
109 "non-existent or removed video capture."; 111 "non-existent or removed video capture.";
110 112
111 // Send the buffer back to Host in case it's waiting for all buffers 113 // Send the buffer back to Host in case it's waiting for all buffers
112 // to be returned. 114 // to be returned.
113 base::SharedMemory::CloseHandle(handle); 115 base::SharedMemory::CloseHandle(handle);
116
114 Send(new VideoCaptureHostMsg_BufferReady(device_id, buffer_id, 0, -1.0)); 117 Send(new VideoCaptureHostMsg_BufferReady(device_id, buffer_id, 0, -1.0));
115 return; 118 return;
116 } 119 }
117 120
118 delegate->OnBufferCreated(handle, length, buffer_id); 121 delegate->OnBufferCreated(handle, length, buffer_id);
119 } 122 }
120 123
124 void VideoCaptureMessageFilter::OnGpuMemoryBufferCreated(
125 int device_id,
126 const std::vector<gfx::GpuMemoryBufferHandle>& gmb_handles,
127 const gfx::Size& size,
128 int buffer_id) {
129 Delegate* delegate = find_delegate(device_id);
mcasas 2015/08/21 03:57:25 Delegate* const delegate
130 if (!delegate) {
131 DLOG(WARNING) << "OnBufferCreated: Got video GMB buffer for a "
132 "non-existent or removed video capture.";
133 Send(new VideoCaptureHostMsg_BufferReady(device_id, buffer_id, 0, -1.0));
mcasas 2015/08/21 03:57:25 0? -1.0?? Proposal: 0 /* release_sync_point */, -
134 return;
135 }
136
137 delegate->OnGpuMemoryBufferCreated(gmb_handles, size, buffer_id);
138 }
139
121 void VideoCaptureMessageFilter::OnBufferReceived( 140 void VideoCaptureMessageFilter::OnBufferReceived(
122 const VideoCaptureMsg_BufferReady_Params& params) { 141 const VideoCaptureMsg_BufferReady_Params& params) {
123 Delegate* const delegate = find_delegate(params.device_id); 142 Delegate* const delegate = find_delegate(params.device_id);
124 if (!delegate) { 143 if (!delegate) {
125 DLOG(WARNING) << "OnBufferReceived: Got video SHM buffer for a " 144 DLOG(WARNING) << "OnBufferReceived: Got video SHM buffer for a "
126 "non-existent or removed video capture."; 145 "non-existent or removed video capture.";
127 146
128 // Send the buffer back to Host in case it's waiting for all buffers 147 // Send the buffer back to Host in case it's waiting for all buffers
129 // to be returned. 148 // to be returned.
130 Send(new VideoCaptureHostMsg_BufferReady( 149 Send(new VideoCaptureHostMsg_BufferReady(
131 params.device_id, params.buffer_id, 0, -1.0)); 150 params.device_id, params.buffer_id, 0, -1.0));
132 return; 151 return;
133 } 152 }
134 153
135 delegate->OnBufferReceived(params.buffer_id, 154 delegate->OnBufferReceived(params.buffer_id,
136 params.timestamp, 155 params.timestamp,
137 params.metadata, 156 params.metadata,
138 params.pixel_format, 157 params.pixel_format,
139 params.storage_type, 158 params.storage_type,
140 params.coded_size, 159 params.coded_size,
141 params.visible_rect, 160 params.visible_rect,
142 params.mailbox_holder); 161 params.mailbox_holders);
143 } 162 }
144 163
145 void VideoCaptureMessageFilter::OnBufferDestroyed( 164 void VideoCaptureMessageFilter::OnBufferDestroyed(
146 int device_id, 165 int device_id,
147 int buffer_id) { 166 int buffer_id) {
148 Delegate* delegate = find_delegate(device_id); 167 Delegate* delegate = find_delegate(device_id);
149 if (!delegate) { 168 if (!delegate) {
150 DLOG(WARNING) << "OnBufferDestroyed: Instructed to free buffer for a " 169 DLOG(WARNING) << "OnBufferDestroyed: Instructed to free buffer for a "
151 "non-existent or removed video capture."; 170 "non-existent or removed video capture.";
152 return; 171 return;
(...skipping 30 matching lines...) Expand all
183 const media::VideoCaptureFormats& formats_in_use) { 202 const media::VideoCaptureFormats& formats_in_use) {
184 Delegate* delegate = find_delegate(device_id); 203 Delegate* delegate = find_delegate(device_id);
185 if (!delegate) { 204 if (!delegate) {
186 DLOG(WARNING) << "OnDeviceFormatInUse: unknown device"; 205 DLOG(WARNING) << "OnDeviceFormatInUse: unknown device";
187 return; 206 return;
188 } 207 }
189 delegate->OnDeviceFormatsInUseReceived(formats_in_use); 208 delegate->OnDeviceFormatsInUseReceived(formats_in_use);
190 } 209 }
191 210
192 } // namespace content 211 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698