diff options
| author | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:20:33 +0000 |
|---|---|---|
| committer | qinmin@chromium.org <qinmin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-13 04:20:33 +0000 |
| commit | a2d9a3536eda540f46faff8fcf7d0b9fe15f9318 (patch) | |
| tree | 3ea7050426baec296b85905a6e450a4ef8fdc295 /media | |
| parent | 135835314b3410ff043f0816aa8a9fa6ad69e178 (diff) | |
| download | chromium_src-a2d9a3536eda540f46faff8fcf7d0b9fe15f9318.zip chromium_src-a2d9a3536eda540f46faff8fcf7d0b9fe15f9318.tar.gz chromium_src-a2d9a3536eda540f46faff8fcf7d0b9fe15f9318.tar.bz2 | |
Remove the if check when calling SetDrmBridge
OnDemuxerReady can be called after SetDrmBridge and we will no longer get the DrmBridge afterwards.
BUG=163552
Review URL: https://chromiumcodereview.appspot.com/18414010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211537 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/android/media_source_player.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc index 22bbf7b..128bee7 100644 --- a/media/base/android/media_source_player.cc +++ b/media/base/android/media_source_player.cc @@ -529,17 +529,14 @@ void MediaSourcePlayer::DurationChanged(const base::TimeDelta& duration) { } void MediaSourcePlayer::SetDrmBridge(MediaDrmBridge* drm_bridge) { - if (!is_audio_encrypted_ && !is_video_encrypted_) - return; - // Currently we don't support DRM change during the middle of playback, even // if the player is paused. // TODO(qinmin): support DRM change after playback has started. // http://crbug.com/253792. - DCHECK(!audio_decoder_job_ || !audio_decoder_job_->is_decoding()); - DCHECK(!video_decoder_job_ || !video_decoder_job_->is_decoding()); - DCHECK_EQ(0u, audio_access_unit_index_); - DCHECK_EQ(0u, video_access_unit_index_); + if (GetCurrentTime() > base::TimeDelta()) { + LOG(INFO) << "Setting DRM bridge after play back has started. " + << "This is not well supported!"; + } drm_bridge_ = drm_bridge; |