| Index: media/filters/chunk_demuxer.h
|
| diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
|
| index 3d0409e90f74051a1852a25ca07df48d404f7dd4..f8d5f3bea99dde44cbb0899be823d9a3ab1f537b 100644
|
| --- a/media/filters/chunk_demuxer.h
|
| +++ b/media/filters/chunk_demuxer.h
|
| @@ -33,9 +33,7 @@ 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.
|
| @@ -155,7 +153,6 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
|
| 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_;
|
| @@ -178,13 +175,9 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
|
| // |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.
|
| @@ -436,9 +429,6 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
|
| std::string source_id_audio_;
|
| std::string source_id_video_;
|
|
|
| - // 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_;
|
|
|