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

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

Issue 14247018: Implement WebRTC in Chrome for TV (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Dongwon and Yuncheol's comments 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.cc
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
index 3a4522542ea555801e4b88ae0df543c9e8de99e4..3b7510c7ea2b63ec07c9dcabef13e959636be43c 100644
--- a/media/base/android/media_player_bridge.cc
+++ b/media/base/android/media_player_bridge.cc
@@ -34,7 +34,7 @@ namespace media {
MediaPlayerAndroid* MediaPlayerAndroid::Create(
int player_id,
const GURL& url,
- bool is_media_source,
+ MediaSource media_source,
acolwell GONE FROM CHROMIUM 2013/05/14 18:17:47 This should be MediaSourceType right?
wonsik 2013/05/20 14:02:24 Right -- fixed.
const GURL& first_party_for_cookies,
bool hide_url_log,
MediaPlayerManager* manager,
@@ -46,21 +46,21 @@ MediaPlayerAndroid* MediaPlayerAndroid::Create(
const SeekCompleteCB& seek_complete_cb,
const TimeUpdateCB& time_update_cb,
const MediaInterruptedCB& media_interrupted_cb) {
- LOG_IF(WARNING, is_media_source) << "MSE is not supported";
- return new MediaPlayerBridge(
- player_id,
- url,
- first_party_for_cookies,
- hide_url_log,
- manager,
- media_error_cb,
- video_size_changed_cb,
- buffering_update_cb,
- media_prepared_cb,
- playback_complete_cb,
- seek_complete_cb,
- time_update_cb,
- media_interrupted_cb);
+ DCHECK_EQ(media_source, MEDIA_SOURCE_URL)
+ << "Media source other than URL is not supported.";
+ return new MediaPlayerBridge(player_id,
+ url,
+ first_party_for_cookies,
+ hide_url_log,
+ manager,
+ media_error_cb,
+ video_size_changed_cb,
+ buffering_update_cb,
+ media_prepared_cb,
+ playback_complete_cb,
+ seek_complete_cb,
+ time_update_cb,
+ media_interrupted_cb);
}
#endif

Powered by Google App Engine
This is Rietveld 408576698