| Index: media/filters/decoder_stream.h
|
| diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
|
| index 1cf504884cca65fceed2de8f09b394be4fb54b58..2a7d8497c2bbb030fa0ca6e122c9e13839d41e65 100644
|
| --- a/media/filters/decoder_stream.h
|
| +++ b/media/filters/decoder_stream.h
|
| @@ -104,16 +104,6 @@ class MEDIA_EXPORT DecoderStream {
|
|
|
| base::TimeDelta AverageDuration() const;
|
|
|
| - // Allows callers to register for notification of splice buffers from the
|
| - // demuxer. I.e., DecoderBuffer::splice_timestamp() is not kNoTimestamp.
|
| - //
|
| - // The observer will be notified of all buffers with a splice_timestamp() and
|
| - // the first buffer after which has a splice_timestamp() of kNoTimestamp.
|
| - typedef base::Callback<void(base::TimeDelta)> SpliceObserverCB;
|
| - void set_splice_observer(const SpliceObserverCB& splice_observer) {
|
| - splice_observer_cb_ = splice_observer;
|
| - }
|
| -
|
| // Allows callers to register for notification of config changes; this is
|
| // called immediately after receiving the 'kConfigChanged' status from the
|
| // DemuxerStream, before any action is taken to handle the config change.
|
| @@ -221,13 +211,8 @@ class MEDIA_EXPORT DecoderStream {
|
| std::unique_ptr<Decoder> previous_decoder_;
|
| std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
|
|
|
| - SpliceObserverCB splice_observer_cb_;
|
| ConfigChangeObserverCB config_change_observer_cb_;
|
|
|
| - // If a splice_timestamp() has been seen, this is true until a
|
| - // splice_timestamp() of kNoTimestamp is encountered.
|
| - bool active_splice_;
|
| -
|
| // An end-of-stream buffer has been sent for decoding, no more buffers should
|
| // be sent for decoding until it completes.
|
| // TODO(sandersd): Turn this into a State. http://crbug.com/408316
|
|
|