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

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

Issue 325363002: Fix BrowserMediaPlayerManager and BrowserCdmManager destruction order. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 6 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
« no previous file with comments | « content/browser/media/media_web_contents_observer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/media_source_player.cc
diff --git a/media/base/android/media_source_player.cc b/media/base/android/media_source_player.cc
index 9b10b7850f86501619243712f01b1f66c56813e5..45e0e4fb9502a78533510029023f319f14b86849 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -744,11 +744,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
« no previous file with comments | « content/browser/media/media_web_contents_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698