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

Unified Diff: webkit/media/webmediaplayer_impl.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/filters/ffmpeg_video_decoder_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index a604f3a760e629b9f5baedf148c049ee62db3966..1c236fb8dfd294e77c11ddf82edf74018bd60b57 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -886,6 +886,13 @@ void WebMediaPlayerImpl::OnPipelineError(PipelineStatus error) {
// Decode error.
SetNetworkState(WebMediaPlayer::NetworkStateDecodeError);
break;
+
+ case media::PIPELINE_ERROR_DECRYPT:
+ // Decrypt error.
+ // TODO(xhwang): Change to use NetworkStateDecryptError once it's added in
+ // Webkit (see http://crbug.com/124486).
+ SetNetworkState(WebMediaPlayer::NetworkStateDecodeError);
+ break;
}
// Repaint to trigger UI update.
« no previous file with comments | « media/filters/ffmpeg_video_decoder_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698