OLD | NEW |
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/browser/media/android/browser_demuxer_android.h" | 5 #include "content/browser/media/android/browser_demuxer_android.h" |
6 | 6 |
| 7 #include "base/command_line.h" |
7 #include "content/common/media/media_player_messages_android.h" | 8 #include "content/common/media/media_player_messages_android.h" |
| 9 #include "media/base/android/media_codec_player.h" |
| 10 #include "media/base/media_switches.h" |
8 | 11 |
9 namespace content { | 12 namespace content { |
10 | 13 |
11 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid { | 14 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid { |
12 public: | 15 public: |
13 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer, | 16 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer, |
14 int demuxer_client_id) | 17 int demuxer_client_id) |
15 : demuxer_(demuxer), | 18 : demuxer_(demuxer), |
16 demuxer_client_id_(demuxer_client_id) {} | 19 demuxer_client_id_(demuxer_client_id) {} |
17 | 20 |
(...skipping 27 matching lines...) Expand all Loading... |
45 return demuxer_->demuxer_clients_.Lookup(demuxer_client_id_); | 48 return demuxer_->demuxer_clients_.Lookup(demuxer_client_id_); |
46 } | 49 } |
47 | 50 |
48 scoped_refptr<BrowserDemuxerAndroid> demuxer_; | 51 scoped_refptr<BrowserDemuxerAndroid> demuxer_; |
49 int demuxer_client_id_; | 52 int demuxer_client_id_; |
50 | 53 |
51 DISALLOW_COPY_AND_ASSIGN(Internal); | 54 DISALLOW_COPY_AND_ASSIGN(Internal); |
52 }; | 55 }; |
53 | 56 |
54 BrowserDemuxerAndroid::BrowserDemuxerAndroid() | 57 BrowserDemuxerAndroid::BrowserDemuxerAndroid() |
55 : BrowserMessageFilter(MediaPlayerMsgStart) {} | 58 : BrowserMessageFilter(MediaPlayerMsgStart) { |
| 59 bool enable_media_thread = |
| 60 base::CommandLine::ForCurrentProcess()-> |
| 61 HasSwitch(switches::kEnableMediaThreadForMediaPlayback); |
| 62 |
| 63 task_runner_ = |
| 64 enable_media_thread ? |
| 65 media::GetMediaTaskRunner().get() : |
| 66 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get(); |
| 67 |
| 68 } |
56 | 69 |
57 BrowserDemuxerAndroid::~BrowserDemuxerAndroid() {} | 70 BrowserDemuxerAndroid::~BrowserDemuxerAndroid() {} |
58 | 71 |
59 void BrowserDemuxerAndroid::OverrideThreadForMessage( | 72 base::TaskRunner* BrowserDemuxerAndroid::OverrideTaskRunnerForMessage( |
60 const IPC::Message& message, | 73 const IPC::Message& message) { |
61 BrowserThread::ID* thread) { | 74 |
62 switch (message.type()) { | 75 switch (message.type()) { |
63 case MediaPlayerHostMsg_DemuxerReady::ID: | 76 case MediaPlayerHostMsg_DemuxerReady::ID: |
64 case MediaPlayerHostMsg_ReadFromDemuxerAck::ID: | 77 case MediaPlayerHostMsg_ReadFromDemuxerAck::ID: |
65 case MediaPlayerHostMsg_DurationChanged::ID: | 78 case MediaPlayerHostMsg_DurationChanged::ID: |
66 case MediaPlayerHostMsg_DemuxerSeekDone::ID: | 79 case MediaPlayerHostMsg_DemuxerSeekDone::ID: |
67 *thread = BrowserThread::UI; | 80 return task_runner_; |
68 return; | |
69 } | 81 } |
| 82 |
| 83 return nullptr; |
70 } | 84 } |
71 | 85 |
72 bool BrowserDemuxerAndroid::OnMessageReceived(const IPC::Message& message) { | 86 bool BrowserDemuxerAndroid::OnMessageReceived(const IPC::Message& message) { |
73 bool handled = true; | 87 bool handled = true; |
74 IPC_BEGIN_MESSAGE_MAP(BrowserDemuxerAndroid, message) | 88 IPC_BEGIN_MESSAGE_MAP(BrowserDemuxerAndroid, message) |
75 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, OnDemuxerReady) | 89 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, OnDemuxerReady) |
76 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck, | 90 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck, |
77 OnReadFromDemuxerAck) | 91 OnReadFromDemuxerAck) |
78 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DurationChanged, | 92 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DurationChanged, |
79 OnDurationChanged) | 93 OnDurationChanged) |
80 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerSeekDone, | 94 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerSeekDone, |
81 OnDemuxerSeekDone) | 95 OnDemuxerSeekDone) |
82 IPC_MESSAGE_UNHANDLED(handled = false) | 96 IPC_MESSAGE_UNHANDLED(handled = false) |
83 IPC_END_MESSAGE_MAP() | 97 IPC_END_MESSAGE_MAP() |
84 return handled; | 98 return handled; |
85 } | 99 } |
86 | 100 |
87 scoped_ptr<media::DemuxerAndroid> BrowserDemuxerAndroid::CreateDemuxer( | 101 scoped_ptr<media::DemuxerAndroid> BrowserDemuxerAndroid::CreateDemuxer( |
88 int demuxer_client_id) { | 102 int demuxer_client_id) { |
89 return scoped_ptr<media::DemuxerAndroid>( | 103 return scoped_ptr<media::DemuxerAndroid>( |
90 new Internal(this, demuxer_client_id)); | 104 new Internal(this, demuxer_client_id)); |
91 } | 105 } |
92 | 106 |
93 void BrowserDemuxerAndroid::AddDemuxerClient( | 107 void BrowserDemuxerAndroid::AddDemuxerClient( |
94 int demuxer_client_id, | 108 int demuxer_client_id, |
95 media::DemuxerAndroidClient* client) { | 109 media::DemuxerAndroidClient* client) { |
96 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid() | 110 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid() |
97 << " demuxer_client_id=" << demuxer_client_id; | 111 << " demuxer_client_id=" << demuxer_client_id; |
| 112 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 113 |
98 demuxer_clients_.AddWithID(client, demuxer_client_id); | 114 demuxer_clients_.AddWithID(client, demuxer_client_id); |
| 115 |
| 116 if (pending_configs_.count(demuxer_client_id)) { |
| 117 client->OnDemuxerConfigsAvailable(pending_configs_[demuxer_client_id]); |
| 118 pending_configs_.erase(demuxer_client_id); |
| 119 } |
99 } | 120 } |
100 | 121 |
101 void BrowserDemuxerAndroid::RemoveDemuxerClient(int demuxer_client_id) { | 122 void BrowserDemuxerAndroid::RemoveDemuxerClient(int demuxer_client_id) { |
102 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid() | 123 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid() |
103 << " demuxer_client_id=" << demuxer_client_id; | 124 << " demuxer_client_id=" << demuxer_client_id; |
| 125 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 126 |
104 demuxer_clients_.Remove(demuxer_client_id); | 127 demuxer_clients_.Remove(demuxer_client_id); |
105 } | 128 } |
106 | 129 |
107 void BrowserDemuxerAndroid::OnDemuxerReady( | 130 void BrowserDemuxerAndroid::OnDemuxerReady( |
108 int demuxer_client_id, | 131 int demuxer_client_id, |
109 const media::DemuxerConfigs& configs) { | 132 const media::DemuxerConfigs& configs) { |
| 133 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 134 |
110 media::DemuxerAndroidClient* client = | 135 media::DemuxerAndroidClient* client = |
111 demuxer_clients_.Lookup(demuxer_client_id); | 136 demuxer_clients_.Lookup(demuxer_client_id); |
| 137 |
112 if (client) | 138 if (client) |
113 client->OnDemuxerConfigsAvailable(configs); | 139 client->OnDemuxerConfigsAvailable(configs); |
| 140 else |
| 141 pending_configs_[demuxer_client_id] = configs; |
114 } | 142 } |
115 | 143 |
116 void BrowserDemuxerAndroid::OnReadFromDemuxerAck( | 144 void BrowserDemuxerAndroid::OnReadFromDemuxerAck( |
117 int demuxer_client_id, | 145 int demuxer_client_id, |
118 const media::DemuxerData& data) { | 146 const media::DemuxerData& data) { |
| 147 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 148 |
119 media::DemuxerAndroidClient* client = | 149 media::DemuxerAndroidClient* client = |
120 demuxer_clients_.Lookup(demuxer_client_id); | 150 demuxer_clients_.Lookup(demuxer_client_id); |
| 151 |
121 if (client) | 152 if (client) |
122 client->OnDemuxerDataAvailable(data); | 153 client->OnDemuxerDataAvailable(data); |
123 } | 154 } |
124 | 155 |
125 void BrowserDemuxerAndroid::OnDemuxerSeekDone( | 156 void BrowserDemuxerAndroid::OnDemuxerSeekDone( |
126 int demuxer_client_id, | 157 int demuxer_client_id, |
127 const base::TimeDelta& actual_browser_seek_time) { | 158 const base::TimeDelta& actual_browser_seek_time) { |
| 159 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 160 |
128 media::DemuxerAndroidClient* client = | 161 media::DemuxerAndroidClient* client = |
129 demuxer_clients_.Lookup(demuxer_client_id); | 162 demuxer_clients_.Lookup(demuxer_client_id); |
| 163 |
130 if (client) | 164 if (client) |
131 client->OnDemuxerSeekDone(actual_browser_seek_time); | 165 client->OnDemuxerSeekDone(actual_browser_seek_time); |
132 } | 166 } |
133 | 167 |
134 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id, | 168 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id, |
135 const base::TimeDelta& duration) { | 169 const base::TimeDelta& duration) { |
| 170 DCHECK(task_runner_->BelongsToCurrentThread()); |
| 171 |
136 media::DemuxerAndroidClient* client = | 172 media::DemuxerAndroidClient* client = |
137 demuxer_clients_.Lookup(demuxer_client_id); | 173 demuxer_clients_.Lookup(demuxer_client_id); |
| 174 |
138 if (client) | 175 if (client) |
139 client->OnDemuxerDurationChanged(duration); | 176 client->OnDemuxerDurationChanged(duration); |
| 177 else |
| 178 pending_configs_[demuxer_client_id].duration = duration; |
140 } | 179 } |
141 | 180 |
142 } // namespace content | 181 } // namespace content |
OLD | NEW |