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

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: fix tests 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
« no previous file with comments | « media/base/media_switches.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »
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 85014fb85ed7679fe26f0c2e099e5fb0ab38e4b2..0cc5573b494509ffe819c3282b7761ce8078ed46 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -152,7 +152,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;
}
@@ -498,6 +498,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();
« no previous file with comments | « media/base/media_switches.cc ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698