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

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 10165010: Add a media pipeline status error code for decryption error. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revise comment and rebase Created 8 years, 8 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/pipeline_status.h ('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 cd6383018a61348a9dadaca6bca336766c076cc7..93dfbfb93881e340b5a4a6d155521f6a826dffb3 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -286,11 +286,10 @@ void FFmpegVideoDecoder::DoDecodeBuffer(const scoped_refptr<Buffer>& buffer) {
scoped_refptr<Buffer> unencrypted_buffer = buffer;
if (buffer->GetDecryptConfig() && buffer->GetDataSize()) {
unencrypted_buffer = decryptor_.Decrypt(buffer);
- // TODO(xhwang): Add a decryption error code, see http://crbug.com/121177
if (!unencrypted_buffer || !unencrypted_buffer->GetDataSize()) {
state_ = kDecodeFinished;
DeliverFrame(VideoFrame::CreateEmptyFrame());
- host()->SetError(PIPELINE_ERROR_DECODE);
+ host()->SetError(PIPELINE_ERROR_DECRYPT);
return;
}
}
« no previous file with comments | « media/base/pipeline_status.h ('k') | media/filters/ffmpeg_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698