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

Side by Side Diff: content/browser/media/android/browser_demuxer_android.cc

Issue 1076013002: Added stub MediaSourcePlayer for developing behind the flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Eliminated proxy player class as suggested by Xiaohan Created 5 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
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/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"
xhwang 2015/05/06 17:42:44 hmm, wondering why we need this...
Tima Vaisburd 2015/05/08 07:30:53 media::GetMediaTaskRunner() is defined there
xhwang 2015/05/08 17:12:36 It's a bit odd since BDA can also be used by Media
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
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 enable_media_thread_for_media_playback_ =
60 base::CommandLine::ForCurrentProcess()->
61 HasSwitch(switches::kEnableMediaThreadForMediaPlayback);
xhwang 2015/05/06 17:42:44 Actually, how about this. Instead of having a en
Tima Vaisburd 2015/05/08 07:30:53 Done.
62
63 }
56 64
57 BrowserDemuxerAndroid::~BrowserDemuxerAndroid() {} 65 BrowserDemuxerAndroid::~BrowserDemuxerAndroid() {}
58 66
59 void BrowserDemuxerAndroid::OverrideThreadForMessage( 67 base::TaskRunner* BrowserDemuxerAndroid::OverrideTaskRunnerForMessage(
60 const IPC::Message& message, 68 const IPC::Message& message) {
61 BrowserThread::ID* thread) { 69
62 switch (message.type()) { 70 switch (message.type()) {
63 case MediaPlayerHostMsg_DemuxerReady::ID: 71 case MediaPlayerHostMsg_DemuxerReady::ID:
64 case MediaPlayerHostMsg_ReadFromDemuxerAck::ID: 72 case MediaPlayerHostMsg_ReadFromDemuxerAck::ID:
65 case MediaPlayerHostMsg_DurationChanged::ID: 73 case MediaPlayerHostMsg_DurationChanged::ID:
66 case MediaPlayerHostMsg_DemuxerSeekDone::ID: 74 case MediaPlayerHostMsg_DemuxerSeekDone::ID:
67 *thread = BrowserThread::UI; 75 return enable_media_thread_for_media_playback_ ?
68 return; 76 media::GetMediaTaskRunner().get() :
77 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get();
69 } 78 }
79
80 return nullptr;
xhwang 2015/05/06 17:42:44 When nullptr is returned, a message will be dispat
Tima Vaisburd 2015/05/08 07:30:53 Actually, I saw some messages there. I did not ide
xhwang 2015/05/08 17:12:36 Acknowledged. You are right. I believe the dispat
70 } 81 }
71 82
83
xhwang 2015/05/06 17:42:44 nit: remove extra line.
Tima Vaisburd 2015/05/08 07:30:53 Done.
72 bool BrowserDemuxerAndroid::OnMessageReceived(const IPC::Message& message) { 84 bool BrowserDemuxerAndroid::OnMessageReceived(const IPC::Message& message) {
73 bool handled = true; 85 bool handled = true;
74 IPC_BEGIN_MESSAGE_MAP(BrowserDemuxerAndroid, message) 86 IPC_BEGIN_MESSAGE_MAP(BrowserDemuxerAndroid, message)
75 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, OnDemuxerReady) 87 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerReady, OnDemuxerReady)
76 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck, 88 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_ReadFromDemuxerAck,
77 OnReadFromDemuxerAck) 89 OnReadFromDemuxerAck)
78 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DurationChanged, 90 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DurationChanged,
79 OnDurationChanged) 91 OnDurationChanged)
80 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerSeekDone, 92 IPC_MESSAGE_HANDLER(MediaPlayerHostMsg_DemuxerSeekDone,
81 OnDemuxerSeekDone) 93 OnDemuxerSeekDone)
82 IPC_MESSAGE_UNHANDLED(handled = false) 94 IPC_MESSAGE_UNHANDLED(handled = false)
83 IPC_END_MESSAGE_MAP() 95 IPC_END_MESSAGE_MAP()
84 return handled; 96 return handled;
85 } 97 }
86 98
87 scoped_ptr<media::DemuxerAndroid> BrowserDemuxerAndroid::CreateDemuxer( 99 scoped_ptr<media::DemuxerAndroid> BrowserDemuxerAndroid::CreateDemuxer(
88 int demuxer_client_id) { 100 int demuxer_client_id) {
89 return scoped_ptr<media::DemuxerAndroid>( 101 return scoped_ptr<media::DemuxerAndroid>(
90 new Internal(this, demuxer_client_id)); 102 new Internal(this, demuxer_client_id));
91 } 103 }
92 104
93 void BrowserDemuxerAndroid::AddDemuxerClient( 105 void BrowserDemuxerAndroid::AddDemuxerClient(
xhwang 2015/05/06 17:42:44 In what case will this happen after OnDemuxerReady
Tima Vaisburd 2015/05/08 07:30:53 As far as I understand, Initialize message arrives
xhwang 2015/05/08 17:12:36 Acknowledged.
94 int demuxer_client_id, 106 int demuxer_client_id,
95 media::DemuxerAndroidClient* client) { 107 media::DemuxerAndroidClient* client) {
96 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid() 108 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid()
97 << " demuxer_client_id=" << demuxer_client_id; 109 << " demuxer_client_id=" << demuxer_client_id;
110
98 demuxer_clients_.AddWithID(client, demuxer_client_id); 111 demuxer_clients_.AddWithID(client, demuxer_client_id);
112
113 if (pending_configs_.count(demuxer_client_id)) {
114 client->OnDemuxerConfigsAvailable(pending_configs_[demuxer_client_id]);
115 pending_configs_.erase(demuxer_client_id);
116 }
99 } 117 }
100 118
101 void BrowserDemuxerAndroid::RemoveDemuxerClient(int demuxer_client_id) { 119 void BrowserDemuxerAndroid::RemoveDemuxerClient(int demuxer_client_id) {
102 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid() 120 DVLOG(1) << __FUNCTION__ << " peer_pid=" << peer_pid()
103 << " demuxer_client_id=" << demuxer_client_id; 121 << " demuxer_client_id=" << demuxer_client_id;
122
104 demuxer_clients_.Remove(demuxer_client_id); 123 demuxer_clients_.Remove(demuxer_client_id);
105 } 124 }
106 125
107 void BrowserDemuxerAndroid::OnDemuxerReady( 126 void BrowserDemuxerAndroid::OnDemuxerReady(
108 int demuxer_client_id, 127 int demuxer_client_id,
109 const media::DemuxerConfigs& configs) { 128 const media::DemuxerConfigs& configs) {
110 media::DemuxerAndroidClient* client = 129 media::DemuxerAndroidClient* client =
111 demuxer_clients_.Lookup(demuxer_client_id); 130 demuxer_clients_.Lookup(demuxer_client_id);
131
112 if (client) 132 if (client)
113 client->OnDemuxerConfigsAvailable(configs); 133 client->OnDemuxerConfigsAvailable(configs);
134 else
135 pending_configs_[demuxer_client_id] = configs;
114 } 136 }
115 137
116 void BrowserDemuxerAndroid::OnReadFromDemuxerAck( 138 void BrowserDemuxerAndroid::OnReadFromDemuxerAck(
117 int demuxer_client_id, 139 int demuxer_client_id,
118 const media::DemuxerData& data) { 140 const media::DemuxerData& data) {
119 media::DemuxerAndroidClient* client = 141 media::DemuxerAndroidClient* client =
120 demuxer_clients_.Lookup(demuxer_client_id); 142 demuxer_clients_.Lookup(demuxer_client_id);
143
121 if (client) 144 if (client)
122 client->OnDemuxerDataAvailable(data); 145 client->OnDemuxerDataAvailable(data);
123 } 146 }
124 147
125 void BrowserDemuxerAndroid::OnDemuxerSeekDone( 148 void BrowserDemuxerAndroid::OnDemuxerSeekDone(
126 int demuxer_client_id, 149 int demuxer_client_id,
127 const base::TimeDelta& actual_browser_seek_time) { 150 const base::TimeDelta& actual_browser_seek_time) {
128 media::DemuxerAndroidClient* client = 151 media::DemuxerAndroidClient* client =
129 demuxer_clients_.Lookup(demuxer_client_id); 152 demuxer_clients_.Lookup(demuxer_client_id);
153
130 if (client) 154 if (client)
131 client->OnDemuxerSeekDone(actual_browser_seek_time); 155 client->OnDemuxerSeekDone(actual_browser_seek_time);
132 } 156 }
133 157
134 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id, 158 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id,
135 const base::TimeDelta& duration) { 159 const base::TimeDelta& duration) {
136 media::DemuxerAndroidClient* client = 160 media::DemuxerAndroidClient* client =
137 demuxer_clients_.Lookup(demuxer_client_id); 161 demuxer_clients_.Lookup(demuxer_client_id);
162
138 if (client) 163 if (client)
139 client->OnDemuxerDurationChanged(duration); 164 client->OnDemuxerDurationChanged(duration);
165 else
166 pending_configs_[demuxer_client_id].duration = duration;
140 } 167 }
141 168
142 } // namespace content 169 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698