Add DecryptingAudioDecoder.

media/base/decryptor.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_BASE_DECRYPTOR_H_
 #define MEDIA_BASE_DECRYPTOR_H_
 
 #include <list>
 #include <string>
 
@@ skipping 113 matching lines @@
   // upon completion.
   // |key_added_cb| should be called when a key is added to the decryptor.
   virtual void InitializeAudioDecoder(scoped_ptr<AudioDecoderConfig> config,
                                       const DecoderInitCB& init_cb,
                                       const KeyAddedCB& key_added_cb) = 0;
   virtual void InitializeVideoDecoder(scoped_ptr<VideoDecoderConfig> config,
                                       const DecoderInitCB& init_cb,
                                       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 this file are really from that
CL. Comments are not accurate here and please ignore.

 
   // Indicates completion of audio/video decrypt-and-decode operation.
   //
   // First parameter: The status of the decrypt-and-decode operation.
   // - Set to kSuccess if the encrypted buffer is successfully decrypted and
   //   decoded. In this case, the decoded frame/buffers can be/contain:
   //   1) NULL, which means the operation has been aborted.
   //   2) End-of-stream (EOS) frame, which means that the decoder has hit EOS,
   //      flushed all internal buffers and cannot produce more video frames.
   //   3) Decrypted and decoded video frame or audio buffer.
   // - Set to kNoKey if no decryption key is available to decrypt the encrypted
   //   buffer. In this case the second parameter must be NULL.
   // - Set to kNeedMoreData if more data is needed to produce a video frame. In
   //   this case the second parameter must be NULL.
   // - 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;
 
   // Decrypts and decodes the |encrypted| buffer. The status and the decrypted
   // buffer are returned via the provided callback.
   // The |encrypted| buffer must not be NULL.
   // At end-of-stream, this method should be called repeatedly with
   // end-of-stream DecoderBuffer until no frame/buffer can be produced.
   // These two methods can only be called after the corresponding decoder has
   // been successfully initialized.
@@ skipping 20 matching lines @@
   // The decoder can be reinitialized after it is uninitialized.
   virtual void DeinitializeDecoder(StreamType stream_type) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Decryptor);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_DECRYPTOR_H_