| Index: media/filters/decoder_stream.h
|
| diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
|
| index ce29ac086da2bb33b1ee7fb216910da61b838fc2..e5b0cfcea53f885c254a248643cd5ff6c7e45d53 100644
|
| --- a/media/filters/decoder_stream.h
|
| +++ b/media/filters/decoder_stream.h
|
| @@ -36,6 +36,7 @@
|
| typedef DecoderStreamTraits<StreamType> StreamTraits;
|
| typedef typename StreamTraits::DecoderType Decoder;
|
| typedef typename StreamTraits::OutputType Output;
|
| + typedef typename StreamTraits::StreamInitCB InitCB;
|
| typedef typename Decoder::Status DecoderStatus;
|
|
|
| enum Status {
|
| @@ -44,9 +45,6 @@
|
| DEMUXER_READ_ABORTED, // Demuxer returned aborted read.
|
| DECODE_ERROR, // Decoder returned decode error.
|
| };
|
| -
|
| - // Indicates completion of a DecoderStream initialization.
|
| - typedef base::Callback<void(bool success)> InitCB;
|
|
|
| // Indicates completion of a DecoderStream read.
|
| typedef base::Callback<void(Status, const scoped_refptr<Output>&)> ReadCB;
|
| @@ -157,7 +155,7 @@
|
| void ReinitializeDecoder();
|
|
|
| // Callback for Decoder reinitialization.
|
| - void OnDecoderReinitialized(bool success);
|
| + void OnDecoderReinitialized(PipelineStatus status);
|
|
|
| void CompleteDecoderReinitialization(bool success);
|
|
|
|
|