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

Unified Diff: media/base/video_decoder.h

Issue 123213006: Make VideoDecoder use (kAborted, NULL) to signify an aborted decode, instead of (kOk, NULL). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix unit tests Created 6 years, 12 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 | « no previous file | media/filters/decrypting_video_decoder.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 63f63e5d7d6d9b70dc9f84c98fb159b2e7653df5..66abc8c85c16f90994436985486e4eae69f5f11c 100644
--- a/media/base/video_decoder.h
+++ b/media/base/video_decoder.h
@@ -22,6 +22,7 @@ class MEDIA_EXPORT VideoDecoder {
// Status codes for decode operations on VideoDecoder.
enum Status {
kOk, // Everything went as planned.
+ kAborted, // Decode was aborted as a result of Reset() being called.
kNotEnoughData, // Not enough data to produce a video frame.
kDecodeError, // Decoding error happened.
kDecryptError // Decrypting error happened.
@@ -52,8 +53,6 @@ class MEDIA_EXPORT VideoDecoder {
// If the returned status is kOk:
// - Non-EOS (end of stream) frame contains decoded video data.
// - EOS frame indicates the end of the stream.
- // - NULL frame indicates an aborted decode. This can happen if Reset() or
- // Stop() is called during the decoding process.
// Otherwise the returned frame must be NULL.
typedef base::Callback<void(Status,
const scoped_refptr<VideoFrame>&)> DecodeCB;
« no previous file with comments | « no previous file | media/filters/decrypting_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698