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 bc45338042c4984eae460da7c5883d1ce3edd2f0..8fa2ef0cdc1f98490da953562d99327189772ad3 100644 |
--- a/media/base/android/media_source_player.cc |
+++ b/media/base/android/media_source_player.cc |
@@ -584,13 +584,17 @@ void MediaSourcePlayer::ConfigureVideoDecoderJob() { |
// Android does not allow 2 MediaCodec instances use the same surface. |
video_decoder_job_.reset(); |
// Create the new VideoDecoderJob. |
- video_decoder_job_.reset(VideoDecoderJob::Create( |
- video_codec_, gfx::Size(width_, height_), surface_.j_surface().obj(), |
- media_crypto.obj(), |
- base::Bind(&MediaPlayerManager::OnReadFromDemuxer, |
- base::Unretained(manager()), |
- player_id(), |
- DemuxerStream::VIDEO))); |
+ bool is_secure = drm_bridge_->IsProtectedSurfaceRequired(); |
qinmin
2013/09/05 22:15:31
you need to null check drm_bridge_ here.
xhwang
2013/09/06 02:17:47
Use IsProtectedSurfaceRequired() here which checks
|
+ video_decoder_job_.reset( |
+ VideoDecoderJob::Create(video_codec_, |
+ is_secure, |
+ gfx::Size(width_, height_), |
+ surface_.j_surface().obj(), |
+ media_crypto.obj(), |
+ base::Bind(&MediaPlayerManager::OnReadFromDemuxer, |
+ base::Unretained(manager()), |
+ player_id(), |
+ DemuxerStream::VIDEO))); |
if (video_decoder_job_) |
reconfig_video_decoder_ = false; |