diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
| commit | f8ee788a64d60abd8f2d742a5fdedde054ecd910 (patch) | |
| tree | 7dc14380200b953c64e0ccd16435cdbd1dbf1205 /media/base/android/media_source_player.cc | |
| parent | fcbbbe23a38088a52492922075e71a419c4b01ec (diff) | |
| download | chromium_org-f8ee788a64d60abd8f2d742a5fdedde054ecd910.tar.gz | |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
Diffstat (limited to 'media/base/android/media_source_player.cc')
| -rw-r--r-- | media/base/android/media_source_player.cc | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc index 9b10b7850f..6eb5677b2c 100644 --- a/media/base/android/media_source_player.cc +++ b/media/base/android/media_source_player.cc @@ -28,11 +28,13 @@ MediaSourcePlayer::MediaSourcePlayer( MediaPlayerManager* manager, const RequestMediaResourcesCB& request_media_resources_cb, const ReleaseMediaResourcesCB& release_media_resources_cb, - scoped_ptr<DemuxerAndroid> demuxer) + scoped_ptr<DemuxerAndroid> demuxer, + const GURL& frame_url) : MediaPlayerAndroid(player_id, manager, request_media_resources_cb, - release_media_resources_cb), + release_media_resources_cb, + frame_url), demuxer_(demuxer.Pass()), pending_event_(NO_EVENT_PENDING), playing_(false), @@ -744,11 +746,15 @@ void MediaSourcePlayer::OnKeyAdded() { void MediaSourcePlayer::OnCdmUnset() { DVLOG(1) << __FUNCTION__; - DCHECK(drm_bridge_); // TODO(xhwang): Support detachment of CDM. This will be needed when we start - // to support setMediaKeys(0), or when we release MediaDrm when the video is - // paused, or when the device goes to sleep. See http://crbug.com/272421 - DVLOG(1) << "CDM detachment not supported."; + // to support setMediaKeys(0) (see http://crbug.com/330324), or when we + // release MediaDrm when the video is paused, or when the device goes to + // sleep (see http://crbug.com/272421). + NOTREACHED() << "CDM detachment not supported."; + DCHECK(drm_bridge_); + audio_decoder_job_->SetDrmBridge(NULL); + video_decoder_job_->SetDrmBridge(NULL); + drm_bridge_ = NULL; } } // namespace media |