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

Side by Side Diff: content/browser/media/android/browser_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
« no previous file with comments | « no previous file | content/common/media/media_player_messages_android.h » ('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 "content/common/media/media_player_messages_android.h" 7 #include "content/common/media/media_player_messages_android.h"
8 8
9 namespace content { 9 namespace content {
10 10
11 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid { 11 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid {
12 public: 12 public:
13 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer, 13 Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer,
14 int demuxer_client_id) 14 int demuxer_client_id)
15 : demuxer_(demuxer), 15 : demuxer_(demuxer),
16 demuxer_client_id_(demuxer_client_id) {} 16 demuxer_client_id_(demuxer_client_id) {}
17 17
18 virtual ~Internal() { 18 virtual ~Internal() {
19 DCHECK(ClientIDExists()) << demuxer_client_id_; 19 DCHECK(ClientIDExists()) << demuxer_client_id_;
20 demuxer_->RemoveDemuxerClient(demuxer_client_id_); 20 demuxer_->RemoveDemuxerClient(demuxer_client_id_);
21 } 21 }
22 22
23 // media::DemuxerAndroid implementation. 23 // media::DemuxerAndroid implementation.
24 virtual void Initialize(media::DemuxerAndroidClient* client) OVERRIDE { 24 virtual void Initialize(media::DemuxerAndroidClient* client) OVERRIDE {
25 DCHECK(!ClientIDExists()) << demuxer_client_id_; 25 DCHECK(!ClientIDExists()) << demuxer_client_id_;
26 demuxer_->AddDemuxerClient(demuxer_client_id_, client); 26 demuxer_->AddDemuxerClient(demuxer_client_id_, client);
27 } 27 }
28 28
29 virtual void RequestDemuxerConfigs() OVERRIDE {
30 DCHECK(ClientIDExists()) << demuxer_client_id_;
31 demuxer_->Send(new MediaPlayerMsg_MediaConfigRequest(demuxer_client_id_));
32 }
33
34 virtual void RequestDemuxerData(media::DemuxerStream::Type type) OVERRIDE { 29 virtual void RequestDemuxerData(media::DemuxerStream::Type type) OVERRIDE {
35 DCHECK(ClientIDExists()) << demuxer_client_id_; 30 DCHECK(ClientIDExists()) << demuxer_client_id_;
36 demuxer_->Send(new MediaPlayerMsg_ReadFromDemuxer( 31 demuxer_->Send(new MediaPlayerMsg_ReadFromDemuxer(
37 demuxer_client_id_, type)); 32 demuxer_client_id_, type));
38 } 33 }
39 34
40 virtual void RequestDemuxerSeek( 35 virtual void RequestDemuxerSeek(
41 const base::TimeDelta& time_to_seek, 36 const base::TimeDelta& time_to_seek,
42 bool is_browser_seek) OVERRIDE { 37 bool is_browser_seek) OVERRIDE {
43 DCHECK(ClientIDExists()) << demuxer_client_id_; 38 DCHECK(ClientIDExists()) << demuxer_client_id_;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 135
141 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id, 136 void BrowserDemuxerAndroid::OnDurationChanged(int demuxer_client_id,
142 const base::TimeDelta& duration) { 137 const base::TimeDelta& duration) {
143 media::DemuxerAndroidClient* client = 138 media::DemuxerAndroidClient* client =
144 demuxer_clients_.Lookup(demuxer_client_id); 139 demuxer_clients_.Lookup(demuxer_client_id);
145 if (client) 140 if (client)
146 client->OnDemuxerDurationChanged(duration); 141 client->OnDemuxerDurationChanged(duration);
147 } 142 }
148 143
149 } // namespace content 144 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/common/media/media_player_messages_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698