OLD | NEW |
---|---|
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 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ | 5 #ifndef MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ |
6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ | 6 #define MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ |
7 | 7 |
8 #include <jni.h> | 8 #include <jni.h> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
81 | 81 |
82 // Methods for DeumxerStreamPlayer. | 82 // Methods for DeumxerStreamPlayer. |
83 // Informs DemuxerStreamPlayer that the demuxer is ready. | 83 // Informs DemuxerStreamPlayer that the demuxer is ready. |
84 virtual void DemuxerReady( | 84 virtual void DemuxerReady( |
85 const MediaPlayerHostMsg_DemuxerReady_Params& params); | 85 const MediaPlayerHostMsg_DemuxerReady_Params& params); |
86 // Called when the requested data is received from the demuxer. | 86 // Called when the requested data is received from the demuxer. |
87 virtual void ReadFromDemuxerAck( | 87 virtual void ReadFromDemuxerAck( |
88 const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params); | 88 const MediaPlayerHostMsg_ReadFromDemuxerAck_Params& params); |
89 | 89 |
90 // Called when a seek request is acked by the render process. | 90 // Called when a seek request is acked by the render process. |
91 virtual void OnSeekRequestAck(); | 91 virtual void OnSeekRequestAck(unsigned request_id); |
acolwell GONE FROM CHROMIUM
2013/06/04 15:19:14
nit:s/request/seek_request/
qinmin
2013/06/04 19:03:23
Done.
| |
92 | 92 |
93 int player_id() { return player_id_; } | 93 int player_id() { return player_id_; } |
94 | 94 |
95 protected: | 95 protected: |
96 MediaPlayerAndroid(int player_id, | 96 MediaPlayerAndroid(int player_id, |
97 MediaPlayerManager* manager); | 97 MediaPlayerManager* manager); |
98 | 98 |
99 // Called when player status changes. | 99 // Called when player status changes. |
100 virtual void OnMediaError(int error_type); | 100 virtual void OnMediaError(int error_type); |
101 virtual void OnVideoSizeChanged(int width, int height); | 101 virtual void OnVideoSizeChanged(int width, int height); |
(...skipping 17 matching lines...) Expand all Loading... | |
119 | 119 |
120 // Resource manager for all the media players. | 120 // Resource manager for all the media players. |
121 MediaPlayerManager* manager_; | 121 MediaPlayerManager* manager_; |
122 | 122 |
123 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid); | 123 DISALLOW_COPY_AND_ASSIGN(MediaPlayerAndroid); |
124 }; | 124 }; |
125 | 125 |
126 } // namespace media | 126 } // namespace media |
127 | 127 |
128 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ | 128 #endif // MEDIA_BASE_ANDROID_MEDIA_PLAYER_ANDROID_H_ |
OLD | NEW |