diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 02:20:56 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-23 02:20:56 +0000 |
| commit | 2b61b68be1db53957ebd4c6890de91f81060c74b (patch) | |
| tree | 33287cf32fc9ae15be79c32037d1275577c6f363 /webkit/media | |
| parent | 5c61cc960bac8471d3f002e434ac1796b43c129f (diff) | |
| download | chromium_src-2b61b68be1db53957ebd4c6890de91f81060c74b.zip chromium_src-2b61b68be1db53957ebd4c6890de91f81060c74b.tar.gz chromium_src-2b61b68be1db53957ebd4c6890de91f81060c74b.tar.bz2 | |
Add a media pipeline status error code for decryption error.
Also fix a bug in FFmpegVideoDecoderTest.DecodeEncryptedFrame_NoKey test that the frame isn't marked as decrypted.
BUG=121177
TEST=media_unittests
Review URL: http://codereview.chromium.org/10165010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133397 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webmediaplayer_impl.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc index a604f3a7..1c236fb8 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. |