media: Delete renderer/demuxer splicing code.

media/filters/decoder_stream.cc

 // 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.
 
 #include "media/filters/decoder_stream.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 38 matching lines @@
     const scoped_refptr<MediaLog>& media_log)
     : traits_(media_log),
       task_runner_(task_runner),
       media_log_(media_log),
       state_(STATE_UNINITIALIZED),
       stream_(NULL),
       decoder_selector_(new DecoderSelector<StreamType>(task_runner,
                                                         std::move(decoders),
                                                         media_log)),
       decoded_frames_since_fallback_(0),
-      active_splice_(false),
       decoding_eos_(false),
       pending_decode_requests_(0),
       duration_tracker_(8),
       received_config_change_during_reinit_(false),
       pending_demuxer_read_(false),
       weak_factory_(this),
       fallback_weak_factory_(this) {}
 
 template <DemuxerStream::Type StreamType>
 DecoderStream<StreamType>::~DecoderStream() {
@@ skipping 589 matching lines @@
       Reset(base::ResetAndReturn(&reset_cb_));
     return;
   }
 
   if (status == DemuxerStream::kAborted) {
     if (!read_cb_.is_null())
       SatisfyRead(DEMUXER_READ_ABORTED, NULL);
     return;
   }
 
-  if (!splice_observer_cb_.is_null() && !buffer->end_of_stream()) {
-    const bool has_splice_ts = buffer->splice_timestamp() != kNoTimestamp;
-    if (active_splice_ || has_splice_ts) {
-      splice_observer_cb_.Run(buffer->splice_timestamp());
-      active_splice_ = has_splice_ts;
-    }
-  }
-
   DCHECK(status == DemuxerStream::kOk) << status;
   Decode(buffer);
 
   // Read more data if the decoder supports multiple parallel decoding requests.
   if (CanDecodeMore())
     ReadFromDemuxerStream();
 }
 
 template <DemuxerStream::Type StreamType>
 void DecoderStream<StreamType>::ReinitializeDecoder() {
@@ skipping 84 matching lines @@
   // before the reset callback is fired.
   DCHECK(read_cb_.is_null());
   DCHECK(!reset_cb_.is_null());
 
   // Make sure we read directly from the demuxer after a reset.
   fallback_buffers_.clear();
   pending_buffers_.clear();
 
   if (state_ != STATE_FLUSHING_DECODER) {
     state_ = STATE_NORMAL;
-    active_splice_ = false;
     base::ResetAndReturn(&reset_cb_).Run();
     return;
   }
 
   // The resetting process will be continued in OnDecoderReinitialized().
   ReinitializeDecoder();
 }
 
 template class DecoderStream<DemuxerStream::VIDEO>;
 template class DecoderStream<DemuxerStream::AUDIO>;
 
 }  // namespace media