| Index: media/base/decryptor.h
|
| diff --git a/media/base/decryptor.h b/media/base/decryptor.h
|
| index 89733ef2d589f233e3f25731a44857edf6ed8774..47b4645efd9ba328655c3af7c321243ecbf94c15 100644
|
| --- a/media/base/decryptor.h
|
| +++ b/media/base/decryptor.h
|
| @@ -105,8 +105,7 @@ class MEDIA_EXPORT Decryptor {
|
| const DecoderInitCB& init_cb) = 0;
|
|
|
| // Helper structure for managing multiple decoded audio buffers per input.
|
| - // TODO(xhwang): Rename this to AudioFrames.
|
| - typedef std::list<scoped_refptr<AudioBuffer> > AudioBuffers;
|
| + typedef std::list<scoped_refptr<AudioBuffer> > AudioFrames;
|
|
|
| // Indicates completion of audio/video decrypt-and-decode operation.
|
| //
|
| @@ -124,7 +123,7 @@ class MEDIA_EXPORT Decryptor {
|
| // - Set to kError if unexpected error has occurred. In this case the
|
| // returned frame(s) must be NULL/empty.
|
| // Second parameter: The decoded video frame or audio buffers.
|
| - typedef base::Callback<void(Status, const AudioBuffers&)> AudioDecodeCB;
|
| + typedef base::Callback<void(Status, const AudioFrames&)> AudioDecodeCB;
|
| typedef base::Callback<void(Status,
|
| const scoped_refptr<VideoFrame>&)> VideoDecodeCB;
|
|
|
|
|