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

Unified Diff: media/base/android/media_player_bridge.h

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: combined KeyHandlingDemxuer w/ KeyHandlingChunkDemuxer Created 7 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: media/base/android/media_player_bridge.h
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
index 6733ec65981b9fa1e58ffcca53205fd68c234bc1..b1fb46c9c04587ed1416c3caf2dcd013d58578a5 100644
--- a/media/base/android/media_player_bridge.h
+++ b/media/base/android/media_player_bridge.h
@@ -43,6 +43,13 @@ class MEDIA_EXPORT MediaPlayerBridge {
MEDIA_ERROR_INVALID_CODE,
};
+ // Types of media source that this object will play.
+ enum MediaSource {
Ami GONE FROM CHROMIUM 2013/05/08 20:26:44 MediaSourceType? (otherwise, e.g. void OnInitia
wonsik 2013/05/13 14:03:48 Done.
+ MEDIA_SOURCE_URL,
+ MEDIA_SOURCE_MSE, // W3C Media Source Extensions
+ MEDIA_SOURCE_STREAM, // W3C Media Stream, e.g. getUserMedia().
+ };
+
// Callback when error happens. Args: player ID, error type.
typedef base::Callback<void(int, int)> MediaErrorCB;
@@ -81,7 +88,7 @@ class MEDIA_EXPORT MediaPlayerBridge {
static MediaPlayerBridge* Create(
int player_id,
const GURL& url,
- bool is_media_source,
+ MediaSource media_source,
const GURL& first_party_for_cookies,
bool hide_url_log,
MediaPlayerManager* manager,

Powered by Google App Engine
This is Rietveld 408576698