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

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

Issue 23480036: Support creating secure decoder in MediaCodecBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test Created 7 years, 3 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_drm_bridge.cc ('k') | media/base/android/video_decoder_job.h » ('j') | 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 b2b414852b07b3cc6fcebe90a7cc2904b543e9be..a3104dd6672291c57d826e900ac2e8352dba58c3 100644
--- a/media/base/android/media_source_player.cc
+++ b/media/base/android/media_source_player.cc
@@ -597,13 +597,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 = IsProtectedSurfaceRequired();
+ 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;
« no previous file with comments | « media/base/android/media_drm_bridge.cc ('k') | media/base/android/video_decoder_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698