| Index: media/filters/decoder_stream_traits.h
|
| ===================================================================
|
| --- media/filters/decoder_stream_traits.h (revision 277175)
|
| +++ media/filters/decoder_stream_traits.h (working copy)
|
| @@ -28,14 +28,12 @@
|
| typedef AudioDecoderConfig DecoderConfigType;
|
| typedef DecryptingAudioDecoder DecryptingDecoderType;
|
| typedef base::Callback<void(bool success)> StreamInitCB;
|
| - typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
|
|
|
| static std::string ToString();
|
| static void Initialize(DecoderType* decoder,
|
| const DecoderConfigType& config,
|
| bool low_delay,
|
| - const PipelineStatusCB& status_cb,
|
| - const OutputCB& output_cb);
|
| + const PipelineStatusCB& status_cb);
|
| static bool FinishInitialization(const StreamInitCB& init_cb,
|
| DecoderType* decoder,
|
| DemuxerStream* stream);
|
| @@ -51,14 +49,12 @@
|
| typedef VideoDecoderConfig DecoderConfigType;
|
| typedef DecryptingVideoDecoder DecryptingDecoderType;
|
| typedef base::Callback<void(bool success)> StreamInitCB;
|
| - typedef base::Callback<void(const scoped_refptr<OutputType>&)> OutputCB;
|
|
|
| static std::string ToString();
|
| static void Initialize(DecoderType* decoder,
|
| const DecoderConfigType& config,
|
| bool low_delay,
|
| - const PipelineStatusCB& status_cb,
|
| - const OutputCB& output_cb);
|
| + const PipelineStatusCB& status_cb);
|
| static bool FinishInitialization(const StreamInitCB& init_cb,
|
| DecoderType* decoder,
|
| DemuxerStream* stream);
|
|
|