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

Side by Side Diff: media/base/android/media_player_android.cc

Issue 23787002: Rename MediaPlayerHostMsg_{DemuxerReady,ReadFromDemuxerAck}_Params to Media{Configs,Data}. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 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 | Annotate | Revision Log
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_source_player.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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "media/base/android/media_player_android.h" 5 #include "media/base/android/media_player_android.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/android/media_drm_bridge.h" 8 #include "media/base/android/media_drm_bridge.h"
9 #include "media/base/android/media_player_manager.h" 9 #include "media/base/android/media_player_manager.h"
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 void MediaPlayerAndroid::RequestMediaResourcesFromManager() { 56 void MediaPlayerAndroid::RequestMediaResourcesFromManager() {
57 if (manager_) 57 if (manager_)
58 manager_->RequestMediaResources(player_id_); 58 manager_->RequestMediaResources(player_id_);
59 } 59 }
60 60
61 void MediaPlayerAndroid::ReleaseMediaResourcesFromManager() { 61 void MediaPlayerAndroid::ReleaseMediaResourcesFromManager() {
62 if (manager_) 62 if (manager_)
63 manager_->ReleaseMediaResources(player_id_); 63 manager_->ReleaseMediaResources(player_id_);
64 } 64 }
65 65
66 void MediaPlayerAndroid::DemuxerReady( 66 void MediaPlayerAndroid::DemuxerReady(const DemuxerConfigs& configs) {
67 const MediaPlayerHostMsg_DemuxerReady_Params& params) {
68 NOTREACHED() << "Unexpected ipc received"; 67 NOTREACHED() << "Unexpected ipc received";
69 } 68 }
70 69
71 void MediaPlayerAndroid::ReadFromDemuxerAck( 70 void MediaPlayerAndroid::ReadFromDemuxerAck(const DemuxerData& data) {
72 const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params) {
73 NOTREACHED() << "Unexpected ipc received"; 71 NOTREACHED() << "Unexpected ipc received";
74 } 72 }
75 73
76 void MediaPlayerAndroid::OnSeekRequestAck(unsigned seek_request_id) { 74 void MediaPlayerAndroid::OnSeekRequestAck(unsigned seek_request_id) {
77 NOTREACHED() << "Unexpected ipc received"; 75 NOTREACHED() << "Unexpected ipc received";
78 } 76 }
79 77
80 void MediaPlayerAndroid::DurationChanged(const base::TimeDelta& duration) { 78 void MediaPlayerAndroid::DurationChanged(const base::TimeDelta& duration) {
81 NOTREACHED() << "Unexpected ipc received"; 79 NOTREACHED() << "Unexpected ipc received";
82 } 80 }
83 81
84 GURL MediaPlayerAndroid::GetUrl() { 82 GURL MediaPlayerAndroid::GetUrl() {
85 return GURL(); 83 return GURL();
86 } 84 }
87 85
88 GURL MediaPlayerAndroid::GetFirstPartyForCookies() { 86 GURL MediaPlayerAndroid::GetFirstPartyForCookies() {
89 return GURL(); 87 return GURL();
90 } 88 }
91 89
92 void MediaPlayerAndroid::SetDrmBridge(MediaDrmBridge* drm_bridge) { 90 void MediaPlayerAndroid::SetDrmBridge(MediaDrmBridge* drm_bridge) {
93 // Not all players support DrmBridge. Do nothing by default. 91 // Not all players support DrmBridge. Do nothing by default.
94 return; 92 return;
95 } 93 }
96 94
97 } // namespace media 95 } // namespace media
OLDNEW
« no previous file with comments | « media/base/android/media_player_android.h ('k') | media/base/android/media_source_player.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698