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

Side by Side Diff: content/renderer/media/android/webmediaplayer_proxy_android.h

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
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 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_ 6 #define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 67
68 #if defined(GOOGLE_TV) 68 #if defined(GOOGLE_TV)
69 // Request an external surface for out-of-band compositing. 69 // Request an external surface for out-of-band compositing.
70 void RequestExternalSurface(int player_id, const gfx::RectF& geometry); 70 void RequestExternalSurface(int player_id, const gfx::RectF& geometry);
71 71
72 // RenderViewObserver overrides. 72 // RenderViewObserver overrides.
73 virtual void DidCommitCompositorFrame() OVERRIDE; 73 virtual void DidCommitCompositorFrame() OVERRIDE;
74 #endif 74 #endif
75 75
76 // Media source related methods. 76 // Media source related methods.
77 void DemuxerReady(int player_id, 77 void DemuxerReady(int player_id, const media::DemuxerConfigs& configs);
78 const media::MediaPlayerHostMsg_DemuxerReady_Params&); 78 void ReadFromDemuxerAck(int player_id, const media::DemuxerData& data);
79 void ReadFromDemuxerAck(
80 int player_id,
81 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params);
82 void SeekRequestAck(int player_id, unsigned seek_request_id); 79 void SeekRequestAck(int player_id, unsigned seek_request_id);
83 void DurationChanged(int player_id, const base::TimeDelta& duration); 80 void DurationChanged(int player_id, const base::TimeDelta& duration);
84 81
85 // Encrypted media related methods. 82 // Encrypted media related methods.
86 void InitializeCDM(int media_keys_id, const std::vector<uint8>& uuid); 83 void InitializeCDM(int media_keys_id, const std::vector<uint8>& uuid);
87 void GenerateKeyRequest(int media_keys_id, 84 void GenerateKeyRequest(int media_keys_id,
88 const std::string& type, 85 const std::string& type,
89 const std::vector<uint8>& init_data); 86 const std::vector<uint8>& init_data);
90 void AddKey(int media_keys_id, 87 void AddKey(int media_keys_id,
91 const std::vector<uint8>& key, 88 const std::vector<uint8>& key,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 const std::string& destination_url); 127 const std::string& destination_url);
131 128
132 RendererMediaPlayerManager* manager_; 129 RendererMediaPlayerManager* manager_;
133 130
134 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxyAndroid); 131 DISALLOW_IMPLICIT_CONSTRUCTORS(WebMediaPlayerProxyAndroid);
135 }; 132 };
136 133
137 } // namespace content 134 } // namespace content
138 135
139 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_ 136 #endif // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698