Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(499)

Unified Diff: media/filters/chunk_demuxer.h

Issue 2343543002: MSE: Replace crossfade splicing overlap trimming. (Closed)
Patch Set: Merge and feedback. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index 1c2a4b2e42ebcba9636ab3486b3e9f6a936856d8..7f62bd0606cadd8dc5e3e2d9d345c8bd34fc7b64 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -34,9 +34,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.
@@ -156,7 +154,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_;
@@ -179,13 +176,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.
@@ -444,9 +437,6 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// 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_;
« no previous file with comments | « media/blink/webmediaplayer_impl.cc ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698