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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 10822026: Implement "Key Presence" step in "Encrypted Block Encounted" algorithm in EME. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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/crypto/aes_decryptor_unittest.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | webkit/media/crypto/proxy_decryptor.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_video_decoder.cc
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index 7cd2c7a95b36b234824feb0f3709d5a6f45072de..2ece14fa04d7b1d827abb23ffce5af5fa69b53b1 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -360,7 +360,8 @@ void FFmpegVideoDecoder::DoBufferDecrypted(
return;
}
- if (decrypt_status == Decryptor::kError) {
+ if (decrypt_status == Decryptor::kNoKey ||
+ decrypt_status == Decryptor::kError) {
state_ = kDecodeFinished;
base::ResetAndReturn(&read_cb_).Run(kDecryptError, NULL);
return;
« no previous file with comments | « media/crypto/aes_decryptor_unittest.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | webkit/media/crypto/proxy_decryptor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698