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

Unified Diff: media/filters/source_buffer_stream.cc

Issue 10832151: Add kSeekToStartFudgeRoom to SourceBufferStream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase ToT Created 8 years, 4 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
« no previous file with comments | « media/filters/source_buffer_stream.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_stream.cc
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index 8b8598480888f68ed620912313034e20604c701b..c2be6a79dbfd784672f48f27c5123f6fbfa53bbc 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -231,6 +231,12 @@ static bool BufferComparator(
// is set and there's not enough information to get a better estimate.
static int kDefaultBufferDurationInMs = 125;
+// The amount of time the beginning of the buffered data can differ from the
+// start time in order to still be considered the start of stream.
+static base::TimeDelta kSeekToStartFudgeRoom() {
+ return base::TimeDelta::FromMilliseconds(1000);
+}
+
namespace media {
SourceBufferStream::SourceBufferStream(const AudioDecoderConfig& audio_config)
@@ -388,10 +394,15 @@ bool SourceBufferStream::Append(
return true;
}
-bool SourceBufferStream::IsBeforeFirstRange(base::TimeDelta timestamp) const {
+bool SourceBufferStream::ShouldSeekToStartOfBuffered(
+ base::TimeDelta seek_timestamp) const {
if (ranges_.empty())
return false;
- return timestamp < ranges_.front()->GetStartTimestamp();
+ base::TimeDelta beginning_of_buffered =
+ ranges_.front()->GetStartTimestamp();
+ base::TimeDelta start_time_delta = beginning_of_buffered - stream_start_time_;
+ return seek_timestamp <= beginning_of_buffered &&
+ start_time_delta < kSeekToStartFudgeRoom();
}
bool SourceBufferStream::IsMonotonicallyIncreasing(
@@ -651,7 +662,7 @@ void SourceBufferStream::Seek(base::TimeDelta timestamp) {
SetSelectedRange(NULL);
track_buffer_.clear();
- if (IsBeforeFirstRange(timestamp)) {
+ if (ShouldSeekToStartOfBuffered(timestamp)) {
SetSelectedRange(ranges_.front());
ranges_.front()->SeekToStart();
seek_pending_ = false;
« no previous file with comments | « media/filters/source_buffer_stream.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698