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

Unified Diff: media/filters/decoder_stream.cc

Issue 2492953003: media: Delete renderer/demuxer splicing code. (Closed)
Patch Set: 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
Index: media/filters/decoder_stream.cc
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index 759bdf73490a967f20581f7002921bf4bbbcced8..a177c67935e3f1e62293009bb8be4fcdfc710ea9 100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc
@@ -56,7 +56,6 @@ DecoderStream<StreamType>::DecoderStream(
std::move(decoders),
media_log)),
decoded_frames_since_fallback_(0),
- active_splice_(false),
decoding_eos_(false),
pending_decode_requests_(0),
duration_tracker_(8),
@@ -666,14 +665,6 @@ void DecoderStream<StreamType>::OnBufferReady(
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);
@@ -778,7 +769,6 @@ void DecoderStream<StreamType>::OnDecoderReset() {
if (state_ != STATE_FLUSHING_DECODER) {
state_ = STATE_NORMAL;
- active_splice_ = false;
base::ResetAndReturn(&reset_cb_).Run();
return;
}

Powered by Google App Engine
This is Rietveld 408576698