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

Side by Side Diff: content/renderer/media/android/renderer_demuxer_android.cc

Issue 257323003: Remove the IPC to request DemuxerConfigs when config changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: adding CHECK to enforce the optional demuxer_configs only has 0 or 1 element Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/renderer/media/android/renderer_demuxer_android.h" 5 #include "content/renderer/media/android/renderer_demuxer_android.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "content/child/thread_safe_sender.h" 10 #include "content/child/thread_safe_sender.h"
(...skipping 25 matching lines...) Expand all
36 36
37 void RendererDemuxerAndroid::RemoveDelegate(int demuxer_client_id) { 37 void RendererDemuxerAndroid::RemoveDelegate(int demuxer_client_id) {
38 DCHECK(media_message_loop_->BelongsToCurrentThread()); 38 DCHECK(media_message_loop_->BelongsToCurrentThread());
39 delegates_.Remove(demuxer_client_id); 39 delegates_.Remove(demuxer_client_id);
40 } 40 }
41 41
42 bool RendererDemuxerAndroid::OnMessageReceived(const IPC::Message& message) { 42 bool RendererDemuxerAndroid::OnMessageReceived(const IPC::Message& message) {
43 switch (message.type()) { 43 switch (message.type()) {
44 case MediaPlayerMsg_DemuxerSeekRequest::ID: 44 case MediaPlayerMsg_DemuxerSeekRequest::ID:
45 case MediaPlayerMsg_ReadFromDemuxer::ID: 45 case MediaPlayerMsg_ReadFromDemuxer::ID:
46 case MediaPlayerMsg_MediaConfigRequest::ID:
47 media_message_loop_->PostTask(FROM_HERE, base::Bind( 46 media_message_loop_->PostTask(FROM_HERE, base::Bind(
48 &RendererDemuxerAndroid::DispatchMessage, this, message)); 47 &RendererDemuxerAndroid::DispatchMessage, this, message));
49 return true; 48 return true;
50 } 49 }
51 return false; 50 return false;
52 } 51 }
53 52
54 void RendererDemuxerAndroid::DemuxerReady( 53 void RendererDemuxerAndroid::DemuxerReady(
55 int demuxer_client_id, 54 int demuxer_client_id,
56 const media::DemuxerConfigs& configs) { 55 const media::DemuxerConfigs& configs) {
(...skipping 18 matching lines...) Expand all
75 void RendererDemuxerAndroid::DurationChanged(int demuxer_client_id, 74 void RendererDemuxerAndroid::DurationChanged(int demuxer_client_id,
76 const base::TimeDelta& duration) { 75 const base::TimeDelta& duration) {
77 thread_safe_sender_->Send(new MediaPlayerHostMsg_DurationChanged( 76 thread_safe_sender_->Send(new MediaPlayerHostMsg_DurationChanged(
78 demuxer_client_id, duration)); 77 demuxer_client_id, duration));
79 } 78 }
80 79
81 void RendererDemuxerAndroid::DispatchMessage(const IPC::Message& message) { 80 void RendererDemuxerAndroid::DispatchMessage(const IPC::Message& message) {
82 IPC_BEGIN_MESSAGE_MAP(RendererDemuxerAndroid, message) 81 IPC_BEGIN_MESSAGE_MAP(RendererDemuxerAndroid, message)
83 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DemuxerSeekRequest, OnDemuxerSeekRequest) 82 IPC_MESSAGE_HANDLER(MediaPlayerMsg_DemuxerSeekRequest, OnDemuxerSeekRequest)
84 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer) 83 IPC_MESSAGE_HANDLER(MediaPlayerMsg_ReadFromDemuxer, OnReadFromDemuxer)
85 IPC_MESSAGE_HANDLER(MediaPlayerMsg_MediaConfigRequest, OnMediaConfigRequest)
86 IPC_END_MESSAGE_MAP() 84 IPC_END_MESSAGE_MAP()
87 } 85 }
88 86
89 void RendererDemuxerAndroid::OnReadFromDemuxer( 87 void RendererDemuxerAndroid::OnReadFromDemuxer(
90 int demuxer_client_id, 88 int demuxer_client_id,
91 media::DemuxerStream::Type type) { 89 media::DemuxerStream::Type type) {
92 MediaSourceDelegate* delegate = delegates_.Lookup(demuxer_client_id); 90 MediaSourceDelegate* delegate = delegates_.Lookup(demuxer_client_id);
93 if (delegate) 91 if (delegate)
94 delegate->OnReadFromDemuxer(type); 92 delegate->OnReadFromDemuxer(type);
95 } 93 }
96 94
97 void RendererDemuxerAndroid::OnDemuxerSeekRequest( 95 void RendererDemuxerAndroid::OnDemuxerSeekRequest(
98 int demuxer_client_id, 96 int demuxer_client_id,
99 const base::TimeDelta& time_to_seek, 97 const base::TimeDelta& time_to_seek,
100 bool is_browser_seek) { 98 bool is_browser_seek) {
101 MediaSourceDelegate* delegate = delegates_.Lookup(demuxer_client_id); 99 MediaSourceDelegate* delegate = delegates_.Lookup(demuxer_client_id);
102 if (delegate) 100 if (delegate)
103 delegate->Seek(time_to_seek, is_browser_seek); 101 delegate->Seek(time_to_seek, is_browser_seek);
104 } 102 }
105 103
106 void RendererDemuxerAndroid::OnMediaConfigRequest(int demuxer_client_id) {
107 MediaSourceDelegate* delegate = delegates_.Lookup(demuxer_client_id);
108 if (delegate)
109 delegate->OnMediaConfigRequest();
110 }
111
112 } // namespace content 104 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/android/renderer_demuxer_android.h ('k') | media/base/android/demuxer_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698