Chromium Code Reviews| Index: media/base/decryptor.h |
| diff --git a/media/base/decryptor.h b/media/base/decryptor.h |
| index 9c7f64d87b10967d3066adadcb242d6cd1c43a32..4f69ec7b96be38f73497c62b6a868d55b864c08f 100644 |
| --- a/media/base/decryptor.h |
| +++ b/media/base/decryptor.h |
| @@ -28,20 +28,16 @@ class VideoFrame; |
| // asynchronously. |
| class MEDIA_EXPORT Decryptor { |
| public: |
| - // TODO(xhwang): Replace kError with kDecryptError and kDecodeError. |
| - // TODO(xhwang): Replace kNeedMoreData with kNotEnoughData. |
| enum Status { |
| kSuccess, // Decryption successfully completed. Decrypted buffer ready. |
| - kNoKey, // No key is available to decrypt. |
| + kNoKey, // No key is available to decrypt. |
| kNeedMoreData, // Decoder needs more data to produce a frame. |
| - kError // Key is available but an error occurred during decryption. |
| + kError, // Key is available but an error occurred during decryption. |
| + STATUS_MAX = kError |
|
dcheng
2016/10/14 21:36:42
Nit: it's probably better to be consistent with na
xhwang
2016/10/14 21:40:09
I am not sure. I think at certain point we want to
dcheng
2016/10/14 22:01:12
Shrug, I'm not an owner of this code. But usually,
xhwang
2016/10/14 22:39:54
Agreed. I was updating this then my machine lost p
|
| }; |
| // TODO(xhwang): Unify this with DemuxerStream::Type. |
| - enum StreamType { |
| - kAudio, |
| - kVideo |
| - }; |
| + enum StreamType { kAudio, kVideo, STREAM_TYPE_MAX = kVideo }; |
| Decryptor(); |
| virtual ~Decryptor(); |