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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1017503002: VideoCaptureHost/VideoCaptureControllerEventHandler cleanup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/base::TimeTicks/const base::TimeTicks&/, reinstalling OnEnded()/OnError->Do.. allowing for Delete… Created 5 years, 9 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
« no previous file with comments | « content/browser/renderer_host/media/video_capture_host.h ('k') | content/browser/renderer_host/media/video_capture_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/video_capture_host.cc
diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc
index b3028d4b267c9ee663308427cdf3c721edb739eb..2dba1d66a89fd0dd64a6f1d4b943778f60f76f75 100644
--- a/content/browser/renderer_host/media/video_capture_host.cc
+++ b/content/browser/renderer_host/media/video_capture_host.cc
@@ -11,12 +11,14 @@
#include "content/browser/renderer_host/media/media_stream_manager.h"
#include "content/browser/renderer_host/media/video_capture_manager.h"
#include "content/common/media/video_capture_messages.h"
+#include "media/base/bind_to_current_loop.h"
namespace content {
VideoCaptureHost::VideoCaptureHost(MediaStreamManager* media_stream_manager)
: BrowserMessageFilter(VideoCaptureMsgStart),
media_stream_manager_(media_stream_manager) {
+ DCHECK_CURRENTLY_ON(BrowserThread::UI);
}
VideoCaptureHost::~VideoCaptureHost() {}
@@ -26,14 +28,14 @@ void VideoCaptureHost::OnChannelClosing() {
for (EntryMap::iterator it = entries_.begin(); it != entries_.end(); ) {
const base::WeakPtr<VideoCaptureController>& controller = it->second;
if (controller) {
- VideoCaptureControllerID controller_id(it->first);
+ const VideoCaptureControllerID controller_id(it->first);
media_stream_manager_->video_capture_manager()->StopCaptureForClient(
controller.get(), controller_id, this, false);
++it;
} else {
// Remove the entry for this controller_id so that when the controller
// is added, the controller will be notified to stop for this client
- // in DoControllerAddedOnIOThread.
+ // in DoControllerAdded.
entries_.erase(it++);
}
}
@@ -46,120 +48,47 @@ void VideoCaptureHost::OnDestruct() const {
///////////////////////////////////////////////////////////////////////////////
// Implements VideoCaptureControllerEventHandler.
-void VideoCaptureHost::OnError(const VideoCaptureControllerID& controller_id) {
+void VideoCaptureHost::OnError(VideoCaptureControllerID controller_id) {
DVLOG(1) << "VideoCaptureHost::OnError";
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
BrowserThread::PostTask(
BrowserThread::IO, FROM_HERE,
- base::Bind(&VideoCaptureHost::DoHandleErrorOnIOThread,
- this, controller_id));
-}
-
-void VideoCaptureHost::OnBufferCreated(
- const VideoCaptureControllerID& controller_id,
- base::SharedMemoryHandle handle,
- int length,
- int buffer_id) {
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(&VideoCaptureHost::DoSendNewBufferOnIOThread,
- this, controller_id, handle, length, buffer_id));
-}
-
-void VideoCaptureHost::OnBufferDestroyed(
- const VideoCaptureControllerID& controller_id,
- int buffer_id) {
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(&VideoCaptureHost::DoSendFreeBufferOnIOThread,
- this, controller_id, buffer_id));
-}
-
-void VideoCaptureHost::OnBufferReady(
- const VideoCaptureControllerID& controller_id,
- int buffer_id,
- const gfx::Size& coded_size,
- const gfx::Rect& visible_rect,
- base::TimeTicks timestamp,
- scoped_ptr<base::DictionaryValue> metadata) {
- BrowserThread::PostTask(
- BrowserThread::IO,
- FROM_HERE,
- base::Bind(&VideoCaptureHost::DoSendFilledBufferOnIOThread,
- this,
- controller_id,
- buffer_id,
- coded_size,
- visible_rect,
- timestamp,
- base::Passed(&metadata)));
-}
-
-void VideoCaptureHost::OnMailboxBufferReady(
- const VideoCaptureControllerID& controller_id,
- int buffer_id,
- const gpu::MailboxHolder& mailbox_holder,
- const gfx::Size& packed_frame_size,
- base::TimeTicks timestamp,
- scoped_ptr<base::DictionaryValue> metadata) {
- BrowserThread::PostTask(
- BrowserThread::IO,
- FROM_HERE,
- base::Bind(&VideoCaptureHost::DoSendFilledMailboxBufferOnIOThread,
- this,
- controller_id,
- buffer_id,
- mailbox_holder,
- packed_frame_size,
- timestamp,
- base::Passed(&metadata)));
-}
-
-void VideoCaptureHost::OnEnded(const VideoCaptureControllerID& controller_id) {
- DVLOG(1) << "VideoCaptureHost::OnEnded";
- BrowserThread::PostTask(
- BrowserThread::IO, FROM_HERE,
- base::Bind(&VideoCaptureHost::DoEndedOnIOThread, this, controller_id));
+ base::Bind(&VideoCaptureHost::DoError, this, controller_id));
}
-void VideoCaptureHost::DoSendNewBufferOnIOThread(
- const VideoCaptureControllerID& controller_id,
- base::SharedMemoryHandle handle,
- int length,
- int buffer_id) {
+void VideoCaptureHost::OnBufferCreated(VideoCaptureControllerID controller_id,
+ base::SharedMemoryHandle handle,
+ int length,
+ int buffer_id) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
if (entries_.find(controller_id) == entries_.end())
return;
- Send(new VideoCaptureMsg_NewBuffer(controller_id.device_id, handle,
- length, buffer_id));
+ Send(new VideoCaptureMsg_NewBuffer(controller_id, handle, length, buffer_id));
}
-void VideoCaptureHost::DoSendFreeBufferOnIOThread(
- const VideoCaptureControllerID& controller_id,
- int buffer_id) {
+void VideoCaptureHost::OnBufferDestroyed(VideoCaptureControllerID controller_id,
+ int buffer_id) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
if (entries_.find(controller_id) == entries_.end())
return;
- Send(new VideoCaptureMsg_FreeBuffer(controller_id.device_id, buffer_id));
+ Send(new VideoCaptureMsg_FreeBuffer(controller_id, buffer_id));
}
-void VideoCaptureHost::DoSendFilledBufferOnIOThread(
- const VideoCaptureControllerID& controller_id,
+void VideoCaptureHost::OnBufferReady(
+ VideoCaptureControllerID controller_id,
int buffer_id,
const gfx::Size& coded_size,
const gfx::Rect& visible_rect,
- base::TimeTicks timestamp,
+ const base::TimeTicks& timestamp,
scoped_ptr<base::DictionaryValue> metadata) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
-
if (entries_.find(controller_id) == entries_.end())
return;
VideoCaptureMsg_BufferReady_Params params;
- params.device_id = controller_id.device_id;
+ params.device_id = controller_id;
params.buffer_id = buffer_id;
params.coded_size = coded_size;
params.visible_rect = visible_rect;
@@ -169,12 +98,12 @@ void VideoCaptureHost::DoSendFilledBufferOnIOThread(
Send(new VideoCaptureMsg_BufferReady(params));
}
-void VideoCaptureHost::DoSendFilledMailboxBufferOnIOThread(
- const VideoCaptureControllerID& controller_id,
+void VideoCaptureHost::OnMailboxBufferReady(
+ VideoCaptureControllerID controller_id,
int buffer_id,
const gpu::MailboxHolder& mailbox_holder,
const gfx::Size& packed_frame_size,
- base::TimeTicks timestamp,
+ const base::TimeTicks& timestamp,
scoped_ptr<base::DictionaryValue> metadata) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -182,7 +111,7 @@ void VideoCaptureHost::DoSendFilledMailboxBufferOnIOThread(
return;
VideoCaptureMsg_MailboxBufferReady_Params params;
- params.device_id = controller_id.device_id;
+ params.device_id = controller_id;
params.buffer_id = buffer_id;
params.mailbox_holder = mailbox_holder;
params.packed_frame_size = packed_frame_size;
@@ -192,28 +121,34 @@ void VideoCaptureHost::DoSendFilledMailboxBufferOnIOThread(
Send(new VideoCaptureMsg_MailboxBufferReady(params));
}
-void VideoCaptureHost::DoHandleErrorOnIOThread(
- const VideoCaptureControllerID& controller_id) {
+void VideoCaptureHost::OnEnded(VideoCaptureControllerID controller_id) {
+ DVLOG(1) << "VideoCaptureHost::OnEnded";
DCHECK_CURRENTLY_ON(BrowserThread::IO);
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ base::Bind(&VideoCaptureHost::DoEnded, this, controller_id));
+}
+void VideoCaptureHost::DoError(VideoCaptureControllerID controller_id) {
+ DVLOG(1) << "VideoCaptureHost::DoError";
+ DCHECK_CURRENTLY_ON(BrowserThread::IO);
if (entries_.find(controller_id) == entries_.end())
return;
- Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
+ Send(new VideoCaptureMsg_StateChanged(controller_id,
VIDEO_CAPTURE_STATE_ERROR));
- DeleteVideoCaptureControllerOnIOThread(controller_id, true);
+ DeleteVideoCaptureController(controller_id, true);
}
-void VideoCaptureHost::DoEndedOnIOThread(
- const VideoCaptureControllerID& controller_id) {
+void VideoCaptureHost::DoEnded(VideoCaptureControllerID controller_id) {
+ DVLOG(1) << "VideoCaptureHost::DoEnded";
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- DVLOG(1) << "VideoCaptureHost::DoEndedOnIOThread";
if (entries_.find(controller_id) == entries_.end())
return;
- Send(new VideoCaptureMsg_StateChanged(controller_id.device_id,
+ Send(new VideoCaptureMsg_StateChanged(controller_id,
VIDEO_CAPTURE_STATE_ENDED));
- DeleteVideoCaptureControllerOnIOThread(controller_id, false);
+ DeleteVideoCaptureController(controller_id, false);
}
///////////////////////////////////////////////////////////////////////////////
@@ -263,26 +198,14 @@ void VideoCaptureHost::OnStartCapture(int device_id,
PeerHandle(),
controller_id,
this,
- base::Bind(&VideoCaptureHost::OnControllerAdded, this, device_id));
+ media::BindToCurrentLoop(
perkj_chrome 2015/03/17 06:46:59 Why do you do this extra bindtocurrentloop? OnCont
mcasas 2015/03/17 15:57:44 Not needed indeed. I think I started by changing t
+ base::Bind(&VideoCaptureHost::OnControllerAdded, this, device_id)));
}
void VideoCaptureHost::OnControllerAdded(
int device_id,
const base::WeakPtr<VideoCaptureController>& controller) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- BrowserThread::PostTask(
- BrowserThread::IO,
- FROM_HERE,
- base::Bind(&VideoCaptureHost::DoControllerAddedOnIOThread,
- this,
- device_id,
- controller));
-}
-
-void VideoCaptureHost::DoControllerAddedOnIOThread(
- int device_id,
- const base::WeakPtr<VideoCaptureController>& controller) {
- DCHECK_CURRENTLY_ON(BrowserThread::IO);
VideoCaptureControllerID controller_id(device_id);
EntryMap::iterator it = entries_.find(controller_id);
if (it == entries_.end()) {
@@ -312,7 +235,7 @@ void VideoCaptureHost::OnStopCapture(int device_id) {
Send(new VideoCaptureMsg_StateChanged(device_id,
VIDEO_CAPTURE_STATE_STOPPED));
- DeleteVideoCaptureControllerOnIOThread(controller_id, false);
+ DeleteVideoCaptureController(controller_id, false);
}
void VideoCaptureHost::OnPauseCapture(int device_id) {
@@ -396,8 +319,8 @@ void VideoCaptureHost::OnGetDeviceFormatsInUse(
formats_in_use));
}
-void VideoCaptureHost::DeleteVideoCaptureControllerOnIOThread(
- const VideoCaptureControllerID& controller_id, bool on_error) {
+void VideoCaptureHost::DeleteVideoCaptureController(
+ VideoCaptureControllerID controller_id, bool on_error) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
EntryMap::iterator it = entries_.find(controller_id);
« no previous file with comments | « content/browser/renderer_host/media/video_capture_host.h ('k') | content/browser/renderer_host/media/video_capture_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698