| Index: media/filters/decoder_stream.h
|
| diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
|
| index 3f82c2c97b68b2b2d52e3ebebea7f6cc0ead0eda..8c22ce2522abee1e64bf7353c248882225c559b3 100644
|
| --- a/media/filters/decoder_stream.h
|
| +++ b/media/filters/decoder_stream.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <deque>
|
| #include <list>
|
| +#include <memory>
|
|
|
| #include "base/callback.h"
|
| #include "base/compiler_specific.h"
|
| @@ -14,6 +15,7 @@
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "media/base/audio_decoder.h"
|
| +#include "media/base/audio_timestamp_helper.h"
|
| #include "media/base/demuxer_stream.h"
|
| #include "media/base/media_export.h"
|
| #include "media/base/media_log.h"
|
| @@ -40,6 +42,7 @@ class MEDIA_EXPORT DecoderStream {
|
| typedef DecoderStreamTraits<StreamType> StreamTraits;
|
| typedef typename StreamTraits::DecoderType Decoder;
|
| typedef typename StreamTraits::OutputType Output;
|
| + typedef typename StreamTraits::ConfigType Config;
|
|
|
| enum Status {
|
| OK, // Everything went as planned.
|
| @@ -192,6 +195,8 @@ class MEDIA_EXPORT DecoderStream {
|
| void ResetDecoder();
|
| void OnDecoderReset();
|
|
|
| + DecoderStreamTraits<StreamType> traits_;
|
| +
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
|
|
| scoped_refptr<MediaLog> media_log_;
|
|
|