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

Unified Diff: media/base/decryptor.h

Issue 11198017: Add DecryptingAudioDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add unittests 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
« no previous file with comments | « no previous file | media/filters/decrypting_audio_decoder.h » ('j') | media/filters/decrypting_audio_decoder.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decryptor.h
diff --git a/media/base/decryptor.h b/media/base/decryptor.h
index 2793be42a43646f35313b84327dab4dfd9c73414..6051c634a4731cd0da246ba90be01ff50d6e967a 100644
--- a/media/base/decryptor.h
+++ b/media/base/decryptor.h
@@ -131,11 +131,7 @@ class MEDIA_EXPORT Decryptor {
const KeyAddedCB& key_added_cb) = 0;
// Helper structure for managing multiple decoded audio buffers per input.
- struct QueuedAudioBuffer {
- AudioDecoder::Status status;
- scoped_refptr<Buffer> buffer;
- };
- typedef std::list<QueuedAudioBuffer> AudioBuffers;
+ typedef std::list<scoped_refptr<Buffer> > AudioBuffers;
xhwang 2012/10/18 02:14:10 This cl is based on 11144036, so the changes in th
// Indicates completion of audio/video decrypt-and-decode operation.
//
@@ -153,8 +149,7 @@ class MEDIA_EXPORT Decryptor {
// - Set to kError if unexpected error has occurred. In this case the
// second parameter must be NULL.
// Second parameter: The decoded video frame or audio buffers.
- typedef base::Callback<void(Status,
- const scoped_ptr<AudioBuffers>&)> AudioDecodeCB;
+ typedef base::Callback<void(Status, const AudioBuffers&)> AudioDecodeCB;
typedef base::Callback<void(Status,
const scoped_refptr<VideoFrame>&)> VideoDecodeCB;
« no previous file with comments | « no previous file | media/filters/decrypting_audio_decoder.h » ('j') | media/filters/decrypting_audio_decoder.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698