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

Unified Diff: content/renderer/pepper/video_decoder_shim.cc

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | « no previous file | media/base/audio_decoder.h » ('j') | media/base/audio_decoder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/video_decoder_shim.cc
diff --git a/content/renderer/pepper/video_decoder_shim.cc b/content/renderer/pepper/video_decoder_shim.cc
index c3e7e78c68a186cb4e7e2695fc41087518a882f4..8ccf5ef90676ce3e86ce66d8a3a6ee9c7a1460df 100644
--- a/content/renderer/pepper/video_decoder_shim.cc
+++ b/content/renderer/pepper/video_decoder_shim.cc
@@ -152,12 +152,12 @@ void VideoDecoderShim::DecoderImpl::Initialize(
// |decoder_| is owned by DecoderImpl. During Stop(), the |decoder_| will be
// destroyed and all outstanding callbacks will be fired.
decoder_->Initialize(
- config,
- true /* low_delay */,
+ config, true /* low_delay */,
base::Bind(&VideoDecoderShim::DecoderImpl::OnPipelineStatus,
base::Unretained(this)),
base::Bind(&VideoDecoderShim::DecoderImpl::OnOutputComplete,
- base::Unretained(this)));
+ base::Unretained(this)),
+ base::Bind(&base::DoNothing) /* no encrypted media so not needed */);
}
void VideoDecoderShim::DecoderImpl::Decode(
« no previous file with comments | « no previous file | media/base/audio_decoder.h » ('j') | media/base/audio_decoder.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698