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 /media/base/media_log.cc | |
| 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 'media/base/media_log.cc')
| -rw-r--r-- | media/base/media_log.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/media_log.cc b/media/base/media_log.cc index 0920fb4..d1ac7de 100644 --- a/media/base/media_log.cc +++ b/media/base/media_log.cc @@ -110,6 +110,8 @@ const char* MediaLog::PipelineStatusToString(PipelineStatus status) { return "pipeline: network error"; case PIPELINE_ERROR_DECODE: return "pipeline: decode error"; + case PIPELINE_ERROR_DECRYPT: + return "pipeline: decrypt error"; case PIPELINE_ERROR_ABORT: return "pipeline: abort"; case PIPELINE_ERROR_INITIALIZATION_FAILED: |