| 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 267cfe78e140b9e8dd738f9fa38e6951da5021fb..817efa010c2b0e51a3d35e5a08c9b273529c250d 100644
|
| --- a/media/base/android/media_player_bridge.cc
|
| +++ b/media/base/android/media_player_bridge.cc
|
| @@ -34,7 +34,7 @@ namespace media {
|
| MediaPlayerBridge* MediaPlayerBridge::Create(
|
| int player_id,
|
| const GURL& url,
|
| - bool is_media_source,
|
| + MediaType media_type,
|
| const GURL& first_party_for_cookies,
|
| MediaResourceGetter* resource_getter,
|
| bool hide_url_log,
|
| @@ -47,22 +47,22 @@ MediaPlayerBridge* MediaPlayerBridge::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,
|
| - resource_getter,
|
| - 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);
|
| + LOG_IF(WARNING, media_type != MEDIA_TYPE_DEFAULT)
|
| + << "Media type other than the default (URL-based) is not supported.";
|
| + return new MediaPlayerBridge(player_id,
|
| + url,
|
| + first_party_for_cookies,
|
| + resource_getter,
|
| + 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
|
|
|
|
|