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

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

Issue 2276343005: Delete MediaCodecPlayer, it's time! (Closed)
Patch Set: Created 4 years, 3 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
« no previous file with comments | « no previous file | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/macros.h" 7 #include "base/macros.h"
8 #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_task_runner.h"
10 #include "media/base/media_switches.h" 9 #include "media/base/media_switches.h"
11 10
12 namespace content { 11 namespace content {
13 12
14 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid { 13 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid {
15 public: 14 public:
16 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer, 15 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer,
17 int demuxer_client_id) 16 int demuxer_client_id)
18 : demuxer_(demuxer), 17 : demuxer_(demuxer),
19 demuxer_client_id_(demuxer_client_id) {} 18 demuxer_client_id_(demuxer_client_id) {}
(...skipping 28 matching lines...) Expand all
48 return demuxer_->demuxer_clients_.Lookup(demuxer_client_id_); 47 return demuxer_->demuxer_clients_.Lookup(demuxer_client_id_);
49 } 48 }
50 49
51 scoped_refptr<BrowserDemuxerAndroid> demuxer_; 50 scoped_refptr<BrowserDemuxerAndroid> demuxer_;
52 int demuxer_client_id_; 51 int demuxer_client_id_;
53 52
54 DISALLOW_COPY_AND_ASSIGN(Internal); 53 DISALLOW_COPY_AND_ASSIGN(Internal);
55 }; 54 };
56 55
57 BrowserDemuxerAndroid::BrowserDemuxerAndroid() 56 BrowserDemuxerAndroid::BrowserDemuxerAndroid()
58 : BrowserMessageFilter(MediaPlayerMsgStart) { 57 : BrowserMessageFilter(MediaPlayerMsgStart),
59 const bool use_media_thread = media::UseMediaThreadForMediaPlayback(); 58 task_runner_(
60 VLOG(1) << "Using " << (use_media_thread ? "media" : "UI") << " thread" 59 BrowserThread::GetTaskRunnerForThread(BrowserThread::UI).get()) {}
61 << " for MSE playback";
62 task_runner_ =
63 use_media_thread
64 ? media::GetMediaTaskRunner().get()
65 : BrowserThread::GetTaskRunnerForThread(BrowserThread::UI).get();
66 }
67 60
68 BrowserDemuxerAndroid::~BrowserDemuxerAndroid() {} 61 BrowserDemuxerAndroid::~BrowserDemuxerAndroid() {}
69 62
70 base::TaskRunner* BrowserDemuxerAndroid::OverrideTaskRunnerForMessage( 63 base::TaskRunner* BrowserDemuxerAndroid::OverrideTaskRunnerForMessage(
71 const IPC::Message& message) { 64 const IPC::Message& message) {
72 65
73 switch (message.type()) { 66 switch (message.type()) {
74 case MediaPlayerHostMsg_DemuxerReady::ID: 67 case MediaPlayerHostMsg_DemuxerReady::ID:
75 case MediaPlayerHostMsg_ReadFromDemuxerAck::ID: 68 case MediaPlayerHostMsg_ReadFromDemuxerAck::ID:
76 case MediaPlayerHostMsg_DurationChanged::ID: 69 case MediaPlayerHostMsg_DurationChanged::ID:
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 media::DemuxerAndroidClient* client = 163 media::DemuxerAndroidClient* client =
171 demuxer_clients_.Lookup(demuxer_client_id); 164 demuxer_clients_.Lookup(demuxer_client_id);
172 165
173 if (client) 166 if (client)
174 client->OnDemuxerDurationChanged(duration); 167 client->OnDemuxerDurationChanged(duration);
175 else 168 else
176 pending_configs_[demuxer_client_id].duration = duration; 169 pending_configs_[demuxer_client_id].duration = duration;
177 } 170 }
178 171
179 } // namespace content 172 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/android/browser_media_player_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698