Index: content/renderer/media/video_capture_message_filter.cc |
diff --git a/content/renderer/media/video_capture_message_filter.cc b/content/renderer/media/video_capture_message_filter.cc |
index 4d59729ba75b1854f680113db4c65fffa9c89940..b5928e845b88636f288fe922f5fe160c2de1c084 100644 |
--- a/content/renderer/media/video_capture_message_filter.cc |
+++ b/content/renderer/media/video_capture_message_filter.cc |
@@ -4,6 +4,7 @@ |
#include "content/renderer/media/video_capture_message_filter.h" |
+#include "content/common/media/encoded_video_source_messages.h" |
#include "content/common/media/video_capture_messages.h" |
#include "content/common/view_messages.h" |
@@ -61,7 +62,17 @@ bool VideoCaptureMessageFilter::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(VideoCaptureMsg_StateChanged, OnDeviceStateChanged) |
IPC_MESSAGE_HANDLER(VideoCaptureMsg_NewBuffer, OnBufferCreated) |
IPC_MESSAGE_HANDLER(VideoCaptureMsg_DeviceInfo, OnDeviceInfoReceived) |
- IPC_MESSAGE_UNHANDLED(handled = false) |
+ IPC_MESSAGE_HANDLER(EncodedVideoSourceMsg_CapabilityAvailable, |
+ OnCapabilityAvailable) |
+ IPC_MESSAGE_HANDLER(EncodedVideoSourceMsg_BitstreamCreated, |
+ OnBitstreamCreated) |
+ IPC_MESSAGE_HANDLER(EncodedVideoSourceMsg_BitstreamDestroyed, |
+ OnBitstreamDestroyed) |
+ IPC_MESSAGE_HANDLER(EncodedVideoSourceMsg_BitstreamConfigChanged, |
+ OnBitstreamConfigChanged) |
+ IPC_MESSAGE_HANDLER(EncodedVideoSourceMsg_BitstreamReady, |
+ OnBitstreamReady); |
+ IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
} |
@@ -90,6 +101,14 @@ void VideoCaptureMessageFilter::OnChannelClosing() { |
VideoCaptureMessageFilter::~VideoCaptureMessageFilter() {} |
+EncodingVideoCaptureMessageFilter::Delegate* |
+ VideoCaptureMessageFilter::delegate(int device_id) { |
+ VideoCaptureMessageFilter::Delegate* delegate = NULL; |
+ if (delegates_.find(device_id) != delegates_.end()) |
Ami GONE FROM CHROMIUM
2013/06/08 00:18:01
Why not replace the other occurrences of this code
hshi1
2013/06/11 19:51:22
Done.
|
+ delegate = delegates_.find(device_id)->second; |
+ return delegate; |
+} |
+ |
void VideoCaptureMessageFilter::OnBufferCreated( |
int device_id, |
base::SharedMemoryHandle handle, |