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

Unified Diff: media/base/video_decoder.h

Issue 10969028: Add video decoding methods in Decryptor and add DecryptingVideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve comments and fix stop-during-pending-init. Created 8 years, 2 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
Index: media/base/video_decoder.h
diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h
index b22b14438d7c7add198a778cbc0aaf1443f9454f..6a93e106bbafd1d59413bad6f6becd86d8cfe918 100644
--- a/media/base/video_decoder.h
+++ b/media/base/video_decoder.h
@@ -26,9 +26,10 @@ class MEDIA_EXPORT VideoDecoder
kDecryptError // Decrypting error happened.
};
- // Initialize a VideoDecoder with the given DemuxerStream, executing the
- // callback upon completion.
- // statistics_cb is used to update global pipeline statistics.
+ // Initializes a VideoDecoder with the given DemuxerStream, executing the
+ // |status_cb| upon completion.
+ // |statistics_cb| is used to update the global pipeline statistics.
+ // Note: No VideoDecoder calls should be made before |status_cb| is executed.
virtual void Initialize(const scoped_refptr<DemuxerStream>& stream,
const PipelineStatusCB& status_cb,
const StatisticsCB& statistics_cb) = 0;
@@ -50,13 +51,15 @@ class MEDIA_EXPORT VideoDecoder
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
+ // Resets decoder state, fulfilling all pending ReadCB and dropping extra
// queued decoded data. After this call, the decoder is back to an initialized
// clean state.
+ // Note: No VideoDecoder calls should be made before |closure| is executed.
virtual void Reset(const base::Closure& closure) = 0;
- // Stop decoder and set it to an uninitialized state. Note that a VideoDecoder
- // should/could not be re-initialized after it has been stopped.
+ // Stops decoder and sets it to an uninitialized state. Note that a
+ // VideoDecoder cannot be re-initialized after it has been stopped.
+ // Note: No VideoDecoder calls should be made before |closure| is executed.
virtual void Stop(const base::Closure& closure) = 0;
// Returns true if the output format has an alpha channel. Most formats do not

Powered by Google App Engine
This is Rietveld 408576698