Index: content/renderer/media/android/renderer_demuxer_android.cc |
diff --git a/content/renderer/media/android/renderer_demuxer_android.cc b/content/renderer/media/android/renderer_demuxer_android.cc |
index ab139b5403e4ed62438421d1b115b865abd6b168..d8e86519643c50f4a1cfb6d39a550348f154dd49 100644 |
--- a/content/renderer/media/android/renderer_demuxer_android.cc |
+++ b/content/renderer/media/android/renderer_demuxer_android.cc |
@@ -6,7 +6,6 @@ |
#include "base/bind.h" |
#include "base/message_loop/message_loop.h" |
-#include "content/child/thread_safe_sender.h" |
#include "content/common/media/media_player_messages_android.h" |
#include "content/renderer/media/android/media_source_delegate.h" |
#include "content/renderer/media/android/renderer_media_player_manager.h" |
@@ -16,8 +15,7 @@ |
namespace content { |
RendererDemuxerAndroid::RendererDemuxerAndroid() |
- : thread_safe_sender_(RenderThreadImpl::current()->thread_safe_sender()), |
- media_message_loop_( |
+ : media_message_loop_( |
RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy()) {} |
RendererDemuxerAndroid::~RendererDemuxerAndroid() {} |
@@ -38,51 +36,50 @@ void RendererDemuxerAndroid::RemoveDelegate(int demuxer_client_id) { |
delegates_.Remove(demuxer_client_id); |
} |
-bool RendererDemuxerAndroid::OnMessageReceived(const IPC::Message& message) { |
+base::TaskRunner* RendererDemuxerAndroid::OverrideTaskRunnerForMessage( |
+ const IPC::Message& message) { |
switch (message.type()) { |
case MediaPlayerMsg_DemuxerSeekRequest::ID: |
case MediaPlayerMsg_ReadFromDemuxer::ID: |
case MediaPlayerMsg_MediaConfigRequest::ID: |
- media_message_loop_->PostTask(FROM_HERE, base::Bind( |
- &RendererDemuxerAndroid::DispatchMessage, this, message)); |
- return true; |
+ return media_message_loop_; |
} |
- return false; |
+ return NULL; |
+} |
+ |
+bool RendererDemuxerAndroid::OnMessageReceived(const IPC::Message& message) { |
+ bool handled = true; |
+ IPC_BEGIN_MESSAGE_MAP(RendererDemuxerAndroid, message) |
+ IPC_MESSAGE_HANDLER(MediaPlayerMsg_DemuxerSeekRequest, OnDemuxerSeekRequest) |
+ IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) |
+ IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest) |
+ IPC_MESSAGE_UNHANDLED(handled = false) |
+ IPC_END_MESSAGE_MAP() |
+ return handled; |
} |
void RendererDemuxerAndroid::DemuxerReady( |
int demuxer_client_id, |
const media::DemuxerConfigs& configs) { |
- thread_safe_sender_->Send(new MediaPlayerHostMsg_DemuxerReady( |
- demuxer_client_id, configs)); |
+ Send(new MediaPlayerHostMsg_DemuxerReady(demuxer_client_id, configs)); |
} |
void RendererDemuxerAndroid::ReadFromDemuxerAck( |
int demuxer_client_id, |
const media::DemuxerData& data) { |
- thread_safe_sender_->Send(new MediaPlayerHostMsg_ReadFromDemuxerAck( |
- demuxer_client_id, data)); |
+ Send(new MediaPlayerHostMsg_ReadFromDemuxerAck(demuxer_client_id, data)); |
} |
void RendererDemuxerAndroid::DemuxerSeekDone( |
int demuxer_client_id, |
const base::TimeDelta& actual_browser_seek_time) { |
- thread_safe_sender_->Send(new MediaPlayerHostMsg_DemuxerSeekDone( |
- demuxer_client_id, actual_browser_seek_time)); |
+ Send(new MediaPlayerHostMsg_DemuxerSeekDone(demuxer_client_id, |
+ actual_browser_seek_time)); |
} |
void RendererDemuxerAndroid::DurationChanged(int demuxer_client_id, |
const base::TimeDelta& duration) { |
- thread_safe_sender_->Send(new MediaPlayerHostMsg_DurationChanged( |
- demuxer_client_id, duration)); |
-} |
- |
-void RendererDemuxerAndroid::DispatchMessage(const IPC::Message& message) { |
- IPC_BEGIN_MESSAGE_MAP(RendererDemuxerAndroid, message) |
- IPC_MESSAGE_HANDLER(MediaPlayerMsg_DemuxerSeekRequest, OnDemuxerSeekRequest) |
- IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) |
- IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest) |
- IPC_END_MESSAGE_MAP() |
+ Send(new MediaPlayerHostMsg_DurationChanged(demuxer_client_id, duration)); |
} |
void RendererDemuxerAndroid::OnReadFromDemuxer( |