Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ | 5 #ifndef CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ |
| 6 #define CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ | 6 #define CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ |
| 7 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 | 9 |
| 10 #include "base/callback.h" | 10 #include "base/callback.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 media::DemuxerStream::Type type, | 66 media::DemuxerStream::Type type, |
| 67 bool seek_done) OVERRIDE; | 67 bool seek_done) OVERRIDE; |
| 68 virtual void RequestMediaResources( | 68 virtual void RequestMediaResources( |
| 69 media::MediaPlayerAndroid* player) OVERRIDE; | 69 media::MediaPlayerAndroid* player) OVERRIDE; |
| 70 virtual void ReleaseMediaResources( | 70 virtual void ReleaseMediaResources( |
| 71 media::MediaPlayerAndroid* player) OVERRIDE; | 71 media::MediaPlayerAndroid* player) OVERRIDE; |
| 72 virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE; | 72 virtual media::MediaResourceGetter* GetMediaResourceGetter() OVERRIDE; |
| 73 virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE; | 73 virtual media::MediaPlayerAndroid* GetFullscreenPlayer() OVERRIDE; |
| 74 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE; | 74 virtual media::MediaPlayerAndroid* GetPlayer(int player_id) OVERRIDE; |
| 75 virtual void DestroyAllMediaPlayers() OVERRIDE; | 75 virtual void DestroyAllMediaPlayers() OVERRIDE; |
| 76 virtual void OnMediaSeekRequest(int player_id, base::TimeDelta time_to_seek, | 76 virtual void OnMediaSeekRequest( |
| 77 bool request_surface) OVERRIDE; | 77 int player_id, base::TimeDelta time_to_seek, |
| 78 unsigned seek_request_id) OVERRIDE; | |
| 79 virtual void OnMediaConfigRequest(int player_id) OVERRIDE; | |
| 78 | 80 |
| 79 #if defined(GOOGLE_TV) | 81 #if defined(GOOGLE_TV) |
| 80 void AttachExternalVideoSurface(int player_id, jobject surface); | 82 void AttachExternalVideoSurface(int player_id, jobject surface); |
| 81 void DetachExternalVideoSurface(int player_id); | 83 void DetachExternalVideoSurface(int player_id); |
| 82 #endif | 84 #endif |
| 83 | 85 |
| 84 protected: | 86 protected: |
| 85 friend MediaPlayerManager* MediaPlayerManager::Create( | 87 friend MediaPlayerManager* MediaPlayerManager::Create( |
| 86 content::RenderViewHost*); | 88 content::RenderViewHost*); |
| 87 | 89 |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 101 virtual void OnSeek(int player_id, base::TimeDelta time); | 103 virtual void OnSeek(int player_id, base::TimeDelta time); |
| 102 virtual void OnPause(int player_id); | 104 virtual void OnPause(int player_id); |
| 103 virtual void OnReleaseResources(int player_id); | 105 virtual void OnReleaseResources(int player_id); |
| 104 virtual void OnDestroyPlayer(int player_id); | 106 virtual void OnDestroyPlayer(int player_id); |
| 105 virtual void OnDemuxerReady( | 107 virtual void OnDemuxerReady( |
| 106 int player_id, | 108 int player_id, |
| 107 const media::MediaPlayerHostMsg_DemuxerReady_Params& params); | 109 const media::MediaPlayerHostMsg_DemuxerReady_Params& params); |
| 108 virtual void OnReadFromDemuxerAck( | 110 virtual void OnReadFromDemuxerAck( |
| 109 int player_id, | 111 int player_id, |
| 110 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params); | 112 const media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params); |
| 111 void OnMediaSeekRequestAck(int player_id); | 113 void OnMediaSeekRequestAck(int player_id, unsigned request_id); |
|
acolwell GONE FROM CHROMIUM
2013/06/04 15:19:14
nit: s/request_id/seek_request_id/ to match the na
qinmin
2013/06/04 19:03:23
Done.
| |
| 112 | 114 |
| 113 #if defined(GOOGLE_TV) | 115 #if defined(GOOGLE_TV) |
| 114 virtual void OnNotifyExternalSurface( | 116 virtual void OnNotifyExternalSurface( |
| 115 int player_id, bool is_request, const gfx::RectF& rect); | 117 int player_id, bool is_request, const gfx::RectF& rect); |
| 116 #endif | 118 #endif |
| 117 | 119 |
| 118 // Adds a given player to the list. | 120 // Adds a given player to the list. |
| 119 void AddPlayer(media::MediaPlayerAndroid* player); | 121 void AddPlayer(media::MediaPlayerAndroid* player); |
| 120 | 122 |
| 121 // Removes the player with the specified id. | 123 // Removes the player with the specified id. |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 135 | 137 |
| 136 // Object for retrieving resources media players. | 138 // Object for retrieving resources media players. |
| 137 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; | 139 scoped_ptr<media::MediaResourceGetter> media_resource_getter_; |
| 138 | 140 |
| 139 DISALLOW_COPY_AND_ASSIGN(MediaPlayerManagerImpl); | 141 DISALLOW_COPY_AND_ASSIGN(MediaPlayerManagerImpl); |
| 140 }; | 142 }; |
| 141 | 143 |
| 142 } // namespace content | 144 } // namespace content |
| 143 | 145 |
| 144 #endif // CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ | 146 #endif // CONTENT_BROWSER_ANDROID_MEDIA_PLAYER_MANAGER_IMPL_H_ |
| OLD | NEW |