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

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 11414138: Encrypted Media: No NeedKey if --enable-encrypted-media is not set. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 1 month 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
Index: media/filters/ffmpeg_video_decoder.cc
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index db70580f66c29ad96275c21975cfa78295da2f25..8f75e1f712e048d63a5bc6e5bfdfef54c355c3af 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -156,7 +156,7 @@ void FFmpegVideoDecoder::Initialize(const scoped_refptr<DemuxerStream>& stream,
statistics_cb_ = statistics_cb;
if (!ConfigureDecoder()) {
- status_cb.Run(PIPELINE_ERROR_DECODE);
+ status_cb.Run(DECODER_ERROR_NOT_SUPPORTED);
return;
}
@@ -502,6 +502,11 @@ bool FFmpegVideoDecoder::ConfigureDecoder() {
return false;
}
+ if (config.is_encrypted() && !decryptor_) {
+ DLOG(ERROR) << "Encrypted video stream not supported.";
+ return false;
+ }
+
// Release existing decoder resources if necessary.
ReleaseFFmpegResources();

Powered by Google App Engine
This is Rietveld 408576698