diff options
| author | davve <davve@opera.com> | 2016-03-11 06:55:07 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-11 14:56:43 +0000 |
| commit | 541ee5c14eb321ab188cce3d077649cc216404b8 (patch) | |
| tree | 4b7dfc88dbb01960f28f6a9579b403fc77a0336f /content/browser/media | |
| parent | 43e79f033e4981cc924614529678f74db1ca435a (diff) | |
| download | chromium_src-541ee5c14eb321ab188cce3d077649cc216404b8.zip chromium_src-541ee5c14eb321ab188cce3d077649cc216404b8.tar.gz chromium_src-541ee5c14eb321ab188cce3d077649cc216404b8.tar.bz2 | |
Propagate media session id into MediaPlayerAndroid
The media session id will be used to implicitly activate a user defined media session.
BUG=497735, 581728
Review URL: https://codereview.chromium.org/1640123004
Cr-Commit-Position: refs/heads/master@{#380632}
Diffstat (limited to 'content/browser/media')
| -rw-r--r-- | content/browser/media/android/browser_media_player_manager.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc index a42c31c..eba80da 100644 --- a/content/browser/media/android/browser_media_player_manager.cc +++ b/content/browser/media/android/browser_media_player_manager.cc @@ -144,16 +144,13 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( case MEDIA_PLAYER_TYPE_URL: { const std::string user_agent = GetContentClient()->GetUserAgent(); MediaPlayerBridge* media_player_bridge = new MediaPlayerBridge( - media_player_params.player_id, - media_player_params.url, - media_player_params.first_party_for_cookies, - user_agent, - hide_url_log, + media_player_params.player_id, media_player_params.url, + media_player_params.first_party_for_cookies, user_agent, hide_url_log, this, base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased, weak_ptr_factory_.GetWeakPtr()), - media_player_params.frame_url, - media_player_params.allow_credentials); + media_player_params.frame_url, media_player_params.allow_credentials, + media_player_params.media_session_id); if (media_player_params.type == MEDIA_PLAYER_TYPE_REMOTE_ONLY) return media_player_bridge; @@ -190,20 +187,20 @@ MediaPlayerAndroid* BrowserMediaPlayerManager::CreateMediaPlayer( case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: { if (media::UseMediaThreadForMediaPlayback()) { return new MediaCodecPlayer( - media_player_params.player_id, - weak_ptr_factory_.GetWeakPtr(), + media_player_params.player_id, weak_ptr_factory_.GetWeakPtr(), base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased, weak_ptr_factory_.GetWeakPtr()), demuxer->CreateDemuxer(media_player_params.demuxer_client_id), - media_player_params.frame_url); + media_player_params.frame_url, + media_player_params.media_session_id); } else { return new MediaSourcePlayer( - media_player_params.player_id, - this, + media_player_params.player_id, this, base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased, weak_ptr_factory_.GetWeakPtr()), demuxer->CreateDemuxer(media_player_params.demuxer_client_id), - media_player_params.frame_url); + media_player_params.frame_url, + media_player_params.media_session_id); } } } |