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

Unified Diff: media/base/video_decoder.h

Issue 10825194: Change Deryptor::DecryptStatus and VideoDecoder::DecoderStatus to *::Status. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 4 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/decryptor.h ('k') | media/crypto/aes_decryptor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/video_decoder.h
diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h
index c8c19b7329395dd6c58b70d759d9277cb22a5cbb..c8fd93d35f19733e6e7dc37db013081e27139edb 100644
--- a/media/base/video_decoder.h
+++ b/media/base/video_decoder.h
@@ -20,7 +20,7 @@ class MEDIA_EXPORT VideoDecoder
: public base::RefCountedThreadSafe<VideoDecoder> {
public:
// Status codes for read operations on VideoDecoder.
- enum DecoderStatus {
+ enum Status {
kOk, // Everything went as planned.
kDecodeError, // Decoding error happened.
kDecryptError // Decrypting error happened.
@@ -47,8 +47,7 @@ class MEDIA_EXPORT VideoDecoder
// frames contain decoded video data or may indicate the end of the stream.
// NULL video frames indicate an aborted read. This can happen if the
// DemuxerStream gets flushed and doesn't have any more data to return.
- typedef base::Callback<void(DecoderStatus,
- const scoped_refptr<VideoFrame>&)> ReadCB;
+ typedef base::Callback<void(Status, const scoped_refptr<VideoFrame>&)> ReadCB;
virtual void Read(const ReadCB& read_cb) = 0;
// Reset decoder state, fulfilling all pending ReadCB and dropping extra
« no previous file with comments | « media/base/decryptor.h ('k') | media/crypto/aes_decryptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698