| Index: media/filters/decoder_stream.h
|
| diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
|
| index 5afd0b87ede6a5e735bf4f854a7bb742419752f6..8ac94cb2a4a085d41c512dd9062a76063b9b5a95 100644
|
| --- a/media/filters/decoder_stream.h
|
| +++ b/media/filters/decoder_stream.h
|
| @@ -15,6 +15,7 @@
|
| #include "media/base/decryptor.h"
|
| #include "media/base/demuxer_stream.h"
|
| #include "media/base/media_export.h"
|
| +#include "media/base/media_log.h"
|
| #include "media/base/pipeline_status.h"
|
| #include "media/filters/decoder_selector.h"
|
| #include "media/filters/decoder_stream_traits.h"
|
| @@ -52,7 +53,8 @@ class MEDIA_EXPORT DecoderStream {
|
| DecoderStream(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| ScopedVector<Decoder> decoders,
|
| - const SetDecryptorReadyCB& set_decryptor_ready_cb);
|
| + const SetDecryptorReadyCB& set_decryptor_ready_cb,
|
| + const LogCB& log_cb);
|
| virtual ~DecoderStream();
|
|
|
| // Initializes the DecoderStream and returns the initialization result
|
| @@ -159,6 +161,8 @@ class MEDIA_EXPORT DecoderStream {
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
|
|
|
| + LogCB log_cb_;
|
| +
|
| State state_;
|
|
|
| StatisticsCB statistics_cb_;
|
|
|