| Index: media/filters/decoder_stream_traits.h
|
| diff --git a/media/filters/decoder_stream_traits.h b/media/filters/decoder_stream_traits.h
|
| index 918f4ac1a28cac889cb3c9d69b05af58267ef956..c0a97777e46be0c304328096643f7c06ab059d62 100644
|
| --- a/media/filters/decoder_stream_traits.h
|
| +++ b/media/filters/decoder_stream_traits.h
|
| @@ -28,12 +28,14 @@ struct DecoderStreamTraits<DemuxerStream::AUDIO> {
|
| 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 PipelineStatusCB& status_cb,
|
| + const OutputCB& output_cb);
|
| static bool FinishInitialization(const StreamInitCB& init_cb,
|
| DecoderType* decoder,
|
| DemuxerStream* stream);
|
| @@ -49,12 +51,14 @@ struct DecoderStreamTraits<DemuxerStream::VIDEO> {
|
| 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 PipelineStatusCB& status_cb,
|
| + const OutputCB& output_cb);
|
| static bool FinishInitialization(const StreamInitCB& init_cb,
|
| DecoderType* decoder,
|
| DemuxerStream* stream);
|
|
|