Chromium Code Reviews| 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) |