Index: chromecast/media/cma/base/decoder_buffer_adapter.h |
diff --git a/chromecast/media/cma/base/decoder_buffer_adapter.h b/chromecast/media/cma/base/decoder_buffer_adapter.h |
index 7c48ec8a40b7a1d10f0706b7ba66c21cbe8bac13..1c7a36cc6e87ae63e0ce887e37f7c9fcf6573126 100644 |
--- a/chromecast/media/cma/base/decoder_buffer_adapter.h |
+++ b/chromecast/media/cma/base/decoder_buffer_adapter.h |
@@ -7,6 +7,7 @@ |
#include "base/macros.h" |
#include "base/memory/ref_counted.h" |
+#include "base/memory/scoped_ptr.h" |
#include "chromecast/media/cma/base/decoder_buffer_base.h" |
namespace media { |
@@ -29,12 +30,12 @@ class DecoderBufferAdapter : public DecoderBufferBase { |
// DecoderBufferBase implementation. |
StreamId stream_id() const override; |
- base::TimeDelta timestamp() const override; |
- void set_timestamp(const base::TimeDelta& timestamp) override; |
+ TimeDelta timestamp() const override; |
+ void set_timestamp(TimeDelta timestamp) override; |
const uint8* data() const override; |
uint8* writable_data() const override; |
size_t data_size() const override; |
- const ::media::DecryptConfig* decrypt_config() const override; |
+ const DecryptConfig* decrypt_config() const override; |
bool end_of_stream() const override; |
private: |
@@ -42,6 +43,7 @@ class DecoderBufferAdapter : public DecoderBufferBase { |
StreamId stream_id_; |
scoped_refptr<::media::DecoderBuffer> const buffer_; |
+ mutable scoped_ptr<DecryptConfig> decrypt_config_; |
DISALLOW_COPY_AND_ASSIGN(DecoderBufferAdapter); |
}; |