media: Delete renderer/demuxer splicing code.

media/filters/decoder_stream.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_FILTERS_DECODER_STREAM_H_
 #define MEDIA_FILTERS_DECODER_STREAM_H_
 
 #include <deque>
 #include <list>
 #include <memory>
@@ skipping 86 matching lines @@
   bool CanReadWithoutStalling() const;
 
   // Returns maximum concurrent decode requests for the current |decoder_|.
   int GetMaxDecodeRequests() const;
 
   // Returns true if one more decode request can be submitted to the decoder.
   bool CanDecodeMore() const;
 
   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.
   typedef base::Closure ConfigChangeObserverCB;
   void set_config_change_observer(
       const ConfigChangeObserverCB& config_change_observer) {
     config_change_observer_cb_ = config_change_observer;
   }
 
   const Decoder* get_previous_decoder_for_testing() const {
@@ skipping 87 matching lines @@
 
   std::unique_ptr<Decoder> decoder_;
   // When falling back from H/W decoding to S/W decoding, destructing the
   // GpuVideoDecoder too early results in black frames being displayed.
   // |previous_decoder_| is used to keep it alive.  It is destroyed once we've
   // decoded at least media::limits::kMaxVideoFrames frames after fallback.
   int decoded_frames_since_fallback_;
   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
   bool decoding_eos_;
 
   // Decoded buffers that haven't been read yet. Used when the decoder supports
   // parallel decoding.
   std::list<scoped_refptr<Output> > ready_outputs_;
 
   // Number of outstanding decode requests sent to the |decoder_|.
@@ skipping 32 matching lines @@
 
 template <>
 int DecoderStream<DemuxerStream::AUDIO>::GetMaxDecodeRequests() const;
 
 typedef DecoderStream<DemuxerStream::VIDEO> VideoFrameStream;
 typedef DecoderStream<DemuxerStream::AUDIO> AudioBufferStream;
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_DECODER_STREAM_H_