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

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

Issue 17563002: Add the SetMediaKeys handler to pass a drm bridge to a MediaSourcePlayer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | « media/base/android/media_source_player.h ('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 9495ed082f251839e1d2f6dcc563d8cbd3b442c5..f493ba1638ecb75d708d0aab323b016a1d493e4a 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -286,7 +286,8 @@ MediaSourcePlayer::MediaSourcePlayer(
video_access_unit_index_(0),
waiting_for_audio_data_(false),
waiting_for_video_data_(false),
- weak_this_(this) {
+ weak_this_(this),
+ drm_bridge_(NULL) {
}
MediaSourcePlayer::~MediaSourcePlayer() {
@@ -471,6 +472,13 @@ void MediaSourcePlayer::DurationChanged(const base::TimeDelta& duration) {
duration_ = duration;
}
+void MediaSourcePlayer::SetDrmBridge(MediaDrmBridge* drm_bridge) {
+ drm_bridge_ = drm_bridge;
+ // TODO(qinmin): similar to SetVideoSurface() call, we need to wait for the
+ // current decoder jobs to finish, and then use the ProcessPendingEvents()
+ // to pass the drm_bridge to the decoder jobs.
xhwang 2013/06/21 20:45:11 I am not sure if we could/should do here. So this
qinmin 2013/06/21 20:53:17 This is just to handle a DRM change in the middle
+}
+
void MediaSourcePlayer::OnSeekRequestAck(unsigned seek_request_id) {
// Do nothing until the most recent seek request is processed.
if (seek_request_id_ != seek_request_id)
« no previous file with comments | « media/base/android/media_source_player.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698