| Index: media/base/decoder_buffer.h
|
| diff --git a/media/base/decoder_buffer.h b/media/base/decoder_buffer.h
|
| index c23e88f5fcc85820c9c322b9475955329b31711d..b3d7b01949136dc8bb061602db03b2605cad4a9a 100644
|
| --- a/media/base/decoder_buffer.h
|
| +++ b/media/base/decoder_buffer.h
|
| @@ -64,6 +64,9 @@ class MEDIA_EXPORT DecoderBuffer
|
|
|
| int GetDataSize() const;
|
|
|
| + const uint8* GetSideData() const;
|
| + int GetSideDataSize() const;
|
| +
|
| const DecryptConfig* GetDecryptConfig() const;
|
| void SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config);
|
|
|
| @@ -73,6 +76,9 @@ class MEDIA_EXPORT DecoderBuffer
|
| // Returns a human-readable string describing |*this|.
|
| std::string AsHumanReadableString();
|
|
|
| + // Allocate memory and copy side data. Padded and aligned as necessary
|
| + virtual void SetSideData(const uint8* data, int size);
|
| +
|
| protected:
|
| friend class base::RefCountedThreadSafe<DecoderBuffer>;
|
|
|
| @@ -88,6 +94,8 @@ class MEDIA_EXPORT DecoderBuffer
|
|
|
| int size_;
|
| scoped_ptr<uint8, base::ScopedPtrAlignedFree> data_;
|
| + int side_data_size_;
|
| + scoped_ptr<uint8, base::ScopedPtrAlignedFree> side_data_;
|
| scoped_ptr<DecryptConfig> decrypt_config_;
|
|
|
| // Constructor helper method for memory allocations.
|
|
|