Index: media/filters/chunk_demuxer.cc |
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc |
index 067fc0eeea75ac72196934ee7e283f6ab01c6dd5..49ec1c943d289fdf33c81f5d4a34628893ff6395 100644 |
--- a/media/filters/chunk_demuxer.cc |
+++ b/media/filters/chunk_demuxer.cc |
@@ -523,8 +523,7 @@ ChunkDemuxer::ChunkDemuxer(ChunkDemuxerClient* client) |
DCHECK(client); |
} |
-void ChunkDemuxer::Initialize(DemuxerHost* host, |
- const PipelineStatusCB& cb) { |
+void ChunkDemuxer::Initialize(DemuxerHost* host, const PipelineStatusCB& cb) { |
DVLOG(1) << "Init()"; |
{ |
base::AutoLock auto_lock(lock_); |
@@ -797,6 +796,12 @@ bool ChunkDemuxer::AppendData(const std::string& id, |
} |
} |
+ if (ranges.size() > 0) { |
+ base::TimeDelta last_timestamp_buffered = ranges.end(ranges.size() - 1); |
+ if (last_timestamp_buffered > duration_) |
+ UpdateDuration(last_timestamp_buffered); |
+ } |
+ |
for (size_t i = 0; i < ranges.size(); ++i) |
host_->AddBufferedTimeRange(ranges.start(i), ranges.end(i)); |
@@ -968,15 +973,13 @@ void ChunkDemuxer::OnStreamParserInitDone(bool success, TimeDelta duration) { |
} |
if (duration > duration_) |
- duration_ = duration; |
+ UpdateDuration(duration); |
// Wait until all streams have initialized. |
if ((!source_id_audio_.empty() && !audio_) || |
(!source_id_video_.empty() && !video_)) |
return; |
- host_->SetDuration(duration_); |
- |
ChangeState_Locked(WAITING_FOR_START_TIME); |
} |
@@ -1093,6 +1096,9 @@ void ChunkDemuxer::OnNewMediaSegment(const std::string& source_id, |
video_->Seek(start_time_); |
} |
+ if (start_time_ > duration_) |
+ UpdateDuration(start_time_); |
+ |
// The demuxer is now initialized after the |start_timestamp_| was set. |
ChangeState_Locked(INITIALIZED); |
base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK); |
@@ -1123,4 +1129,9 @@ bool ChunkDemuxer::IsValidId(const std::string& source_id) const { |
stream_parser_map_.count(source_id) > 0u; |
} |
+void ChunkDemuxer::UpdateDuration(base::TimeDelta new_duration) { |
+ duration_ = new_duration; |
+ host_->SetDuration(new_duration); |
+} |
+ |
} // namespace media |