| Index: media/cdm/cdm_buffer_impl.h
|
| diff --git a/media/cdm/cdm_buffer_impl.h b/media/cdm/cdm_buffer_impl.h
|
| index b3dcb13e1171bcdae523fed64708cfcc56405df4..9fb2290aaee44b87b765314763b91cc1bfb13416 100644
|
| --- a/media/cdm/cdm_buffer_impl.h
|
| +++ b/media/cdm/cdm_buffer_impl.h
|
| @@ -6,19 +6,20 @@
|
| #define MEDIA_CDM_CDM_BUFFER_IMPL_H_
|
|
|
| #include <stdint.h>
|
| -
|
| #include <vector>
|
|
|
| #include "base/macros.h"
|
| +#include "media/base/video_frame.h"
|
| #include "media/cdm/api/content_decryption_module.h"
|
| +#include "media/cdm/cdm_buffer.h"
|
|
|
| namespace media {
|
|
|
| // cdm::Buffer implementation that provides access to memory. This is a simple
|
| // implementation that stores the data in a std::vector<uint8_t>.
|
| -class CdmBuffer : public cdm::Buffer {
|
| +class CdmBufferImpl : public CdmBuffer {
|
| public:
|
| - static CdmBuffer* Create(uint32_t capacity);
|
| + static CdmBufferImpl* Create(uint32_t capacity);
|
|
|
| // cdm::Buffer implementation.
|
| void Destroy() final;
|
| @@ -27,14 +28,18 @@ class CdmBuffer : public cdm::Buffer {
|
| void SetSize(uint32_t size) final;
|
| uint32_t Size() const final;
|
|
|
| + // CdmBuffer implementation.
|
| + scoped_refptr<VideoFrame> MakeVideoFrame(VideoFrameImpl* video_frame,
|
| + gfx::Size natural_size) final;
|
| +
|
| private:
|
| - CdmBuffer(uint32_t capacity);
|
| - ~CdmBuffer() final;
|
| + CdmBufferImpl(uint32_t capacity);
|
| + ~CdmBufferImpl() final;
|
|
|
| std::vector<uint8_t> buffer_;
|
| uint32_t size_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(CdmBuffer);
|
| + DISALLOW_COPY_AND_ASSIGN(CdmBufferImpl);
|
| };
|
|
|
| } // namespace media
|
|
|