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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 10800041: Update media duration if data is appended after the previous duration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months 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/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index db9ef8f93654f5c2d288221bf0ee325861c9dfa2..3b450437ecf2756218734cdc6601d48856207705 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -742,6 +742,14 @@ 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_) {
+ duration_ = last_timestamp_buffered;
+ host_->SetDuration(last_timestamp_buffered);
+ }
+ }
+
for (size_t i = 0; i < ranges.size(); ++i)
host_->AddBufferedTimeRange(ranges.start(i), ranges.end(i));
@@ -923,8 +931,6 @@ void ChunkDemuxer::OnStreamParserInitDone(bool success, TimeDelta duration) {
(!source_id_video_.empty() && !video_))
return;
- host_->SetDuration(duration_);
-
ChangeState_Locked(WAITING_FOR_START_TIME);
}
@@ -1028,6 +1034,9 @@ void ChunkDemuxer::OnNewMediaSegment(const std::string& source_id,
video_->Seek(start_time_);
}
+ duration_ = std::max(duration_, start_time_);
+ host_->SetDuration(duration_);
+
// The demuxer is now initialized after the |start_timestamp_| was set.
ChangeState_Locked(INITIALIZED);
base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);

Powered by Google App Engine
This is Rietveld 408576698