| Index: trunk/src/media/base/decoder_buffer.h
|
| ===================================================================
|
| --- trunk/src/media/base/decoder_buffer.h (revision 194468)
|
| +++ trunk/src/media/base/decoder_buffer.h (working copy)
|
| @@ -47,13 +47,6 @@
|
| // padded and aligned as necessary. |data| must not be NULL and |size| >= 0.
|
| static scoped_refptr<DecoderBuffer> CopyFrom(const uint8* data, int size);
|
|
|
| - // Create a DecoderBuffer whose |data_| is copied from |data| and |side_data_|
|
| - // is copied from |side_data|. Buffers will be padded and aligned as necessary
|
| - // Data pointers must not be NULL and sizes must be >= 0.
|
| - static scoped_refptr<DecoderBuffer> CopyFrom(const uint8* data, int size,
|
| - const uint8* side_data,
|
| - int side_data_size);
|
| -
|
| // Create a DecoderBuffer indicating we've reached end of stream.
|
| //
|
| // Calling any method other than IsEndOfStream() on the resulting buffer
|
| @@ -71,9 +64,6 @@
|
|
|
| int GetDataSize() const;
|
|
|
| - const uint8* GetSideData() const;
|
| - int GetSideDataSize() const;
|
| -
|
| const DecryptConfig* GetDecryptConfig() const;
|
| void SetDecryptConfig(scoped_ptr<DecryptConfig> decrypt_config);
|
|
|
| @@ -90,8 +80,6 @@
|
| // will be padded and aligned as necessary. If |data| is NULL then |data_| is
|
| // set to NULL and |buffer_size_| to 0.
|
| DecoderBuffer(const uint8* data, int size);
|
| - DecoderBuffer(const uint8* data, int size,
|
| - const uint8* side_data, int side_data_size);
|
| virtual ~DecoderBuffer();
|
|
|
| private:
|
| @@ -100,8 +88,6 @@
|
|
|
| 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.
|
|
|