Chromium Code Reviews| Index: media/base/android/media_player_android.h |
| diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h |
| index be21581624a0fc4211913e11401ac9a5a9cd5473..0d4297f6f0d674736dd1c68c2d61284580a9669e 100644 |
| --- a/media/base/android/media_player_android.h |
| +++ b/media/base/android/media_player_android.h |
| @@ -36,18 +36,24 @@ class MEDIA_EXPORT MediaPlayerAndroid { |
| MEDIA_ERROR_INVALID_CODE, |
| }; |
| + // Types of media source that this object will play. |
| + enum SourceType { |
| + SOURCE_TYPE_URL, |
| + SOURCE_TYPE_MSE, // W3C Media Source Extensions |
| + SOURCE_TYPE_STREAM, // W3C Media Stream, e.g. getUserMedia(). |
| + }; |
| + |
| // Construct a MediaPlayerAndroid object with all the needed media player |
| // callbacks. This object needs to call |manager_|'s RequestMediaResources() |
| // before decoding the media stream. This allows |manager_| to track |
| // unused resources and free them when needed. On the other hand, it needs |
| // to call ReleaseMediaResources() when it is done with decoding. |
| - static MediaPlayerAndroid* Create( |
| - int player_id, |
| - const GURL& url, |
| - bool is_media_source, |
| - const GURL& first_party_for_cookies, |
| - bool hide_url_log, |
| - MediaPlayerManager* manager); |
| + static MediaPlayerAndroid* Create(int player_id, |
| + const GURL& url, |
| + SourceType media_source_type, |
|
acolwell GONE FROM CHROMIUM
2013/05/20 21:23:22
nit:s/media_//
wonsik
2013/05/21 10:09:29
Done.
|
| + const GURL& first_party_for_cookies, |
| + bool hide_url_log, |
| + MediaPlayerManager* manager); |
| // Passing an external java surface object to the player. |
| virtual void SetVideoSurface(jobject surface) = 0; |