MSE: Replace crossfade splicing overlap trimming.

media/filters/chunk_demuxer.h

 // Copyright (c) 2012 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_CHUNK_DEMUXER_H_
 #define MEDIA_FILTERS_CHUNK_DEMUXER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 16 matching lines @@
 #include "media/filters/source_buffer_stream.h"
 
 namespace media {
 
 class FFmpegURLProtocol;
 
 class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
  public:
   typedef std::deque<scoped_refptr<StreamParserBuffer> > BufferQueue;
 
-  ChunkDemuxerStream(Type type,
-                     bool splice_frames_enabled,
-                     MediaTrack::Id media_track_id);
+  ChunkDemuxerStream(Type type, MediaTrack::Id media_track_id);
   ~ChunkDemuxerStream() override;
 
   // ChunkDemuxerStream control methods.
   void StartReturningData();
   void AbortReads();
   void CompletePendingReadIfPossible();
   void Shutdown();
 
   // SourceBufferStream manipulation methods.
   void Seek(base::TimeDelta time);
@@ skipping 99 matching lines @@
 
   Liveness liveness_;
 
   std::unique_ptr<SourceBufferStream> stream_;
 
   const MediaTrack::Id media_track_id_;
 
   mutable base::Lock lock_;
   State state_;
   ReadCB read_cb_;
-  bool splice_frames_enabled_;
   bool partial_append_window_trimming_enabled_;
   bool is_enabled_;
   StreamStatusChangeCB stream_status_change_cb_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ChunkDemuxerStream);
 };
 
 // Demuxer implementation that allows chunks of media data to be passed
 // from JavaScript to the media stack.
 class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
  public:
   enum Status {
     kOk,              // ID added w/o error.
     kNotSupported,    // Type specified is not supported.
     kReachedIdLimit,  // Reached ID limit. We can't handle any more IDs.
   };
 
   // |open_cb| Run when Initialize() is called to signal that the demuxer
   //   is ready to receive media data via AppenData().
   // |encrypted_media_init_data_cb| Run when the demuxer determines that an
   //   encryption key is needed to decrypt the content.
   // |media_log| Used to report content and engine debug messages.
-  // |splice_frames_enabled| Indicates that it's okay to generate splice frames
-  //   per the MSE specification.  Renderers must understand DecoderBuffer's
-  //   splice_timestamp() field.
   ChunkDemuxer(const base::Closure& open_cb,
                const EncryptedMediaInitDataCB& encrypted_media_init_data_cb,
-               const scoped_refptr<MediaLog>& media_log,
-               bool splice_frames_enabled);
+               const scoped_refptr<MediaLog>& media_log);
   ~ChunkDemuxer() override;
 
   // Demuxer implementation.
   std::string GetDisplayName() const override;
 
   // |enable_text| Process inband text tracks in the normal way when true,
   //   otherwise ignore them.
   void Initialize(DemuxerHost* host,
                   const PipelineStatusCB& init_cb,
                   bool enable_text_tracks) override;
@@ skipping 238 matching lines @@
 
   std::map<std::string, std::unique_ptr<SourceBufferState>> source_state_map_;
 
   std::map<std::string, std::vector<ChunkDemuxerStream*>> id_to_streams_map_;
   // Used to hold alive the demuxer streams that were created for removed /
   // released SourceBufferState objects. Demuxer clients might still have
   // references to these streams, so we need to keep them alive. But they'll be
   // in a shut down state, so reading from them will return EOS.
   std::vector<std::unique_ptr<ChunkDemuxerStream>> removed_streams_;
 
-  // Indicates that splice frame generation is enabled.
-  const bool splice_frames_enabled_;
-
   // Accumulate, by type, detected track counts across the SourceBuffers.
   int detected_audio_track_count_;
   int detected_video_track_count_;
   int detected_text_track_count_;
 
   std::map<MediaTrack::Id, DemuxerStream*> track_id_to_demux_stream_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ChunkDemuxer);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_CHUNK_DEMUXER_H_