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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 10388216: Fix ChunkDemuxer so appending triggers progress events. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « no previous file | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index ec7cdcb8a605004a0b26d91a7b20b3001bb7ffe6..6af153a5e025a070fe61ace1edf875f2ecf84e3e 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -140,8 +140,6 @@ class ChunkDemuxerStream : public DemuxerStream {
bool GetBufferedRange(base::TimeDelta* start_out,
base::TimeDelta* end_out) const;
- bool GetLastBufferTimestamp(base::TimeDelta* timestamp) const;
-
// DemuxerStream methods.
virtual void Read(const ReadCB& read_cb) OVERRIDE;
virtual Type type() OVERRIDE;
@@ -324,17 +322,6 @@ bool ChunkDemuxerStream::GetBufferedRange(
return true;
}
-bool ChunkDemuxerStream::GetLastBufferTimestamp(
- base::TimeDelta* timestamp) const {
- base::AutoLock auto_lock(lock_);
-
- if (buffers_.empty())
- return false;
-
- *timestamp = buffers_.back()->GetTimestamp();
- return true;
-}
-
// Helper function that makes sure |read_cb| runs on |message_loop|.
static void RunOnMessageLoop(const DemuxerStream::ReadCB& read_cb,
MessageLoop* message_loop,
@@ -667,7 +654,6 @@ bool ChunkDemuxer::AppendData(const std::string& id,
DCHECK_GT(length, 0u);
int64 buffered_bytes = 0;
- base::TimeDelta buffered_ts = base::TimeDelta::FromSeconds(-1);
PipelineStatusCB cb;
{
@@ -709,17 +695,7 @@ bool ChunkDemuxer::AppendData(const std::string& id,
std::swap(cb, seek_cb_);
}
- base::TimeDelta tmp;
- if (audio_.get() && audio_->GetLastBufferTimestamp(&tmp) &&
- tmp > buffered_ts) {
- buffered_ts = tmp;
- }
-
- if (video_.get() && video_->GetLastBufferTimestamp(&tmp) &&
- tmp > buffered_ts) {
- buffered_ts = tmp;
- }
-
+ buffered_bytes_ += length;
buffered_bytes = buffered_bytes_;
}
« no previous file with comments | « no previous file | media/filters/chunk_demuxer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698