summaryrefslogtreecommitdiffstats
path: root/media/base/pipeline.cc
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 23:45:24 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 23:45:24 +0000
commit57ab1ce259d663cd0b9c9df7a8c0c315a9558abd (patch)
tree33082bdb2e1d8d28b94c32bb8812186c7a65fa94 /media/base/pipeline.cc
parent751642fcf8baf55f121ebf83b495efcf6bd3dcbb (diff)
downloadchromium_src-57ab1ce259d663cd0b9c9df7a8c0c315a9558abd.zip
chromium_src-57ab1ce259d663cd0b9c9df7a8c0c315a9558abd.tar.gz
chromium_src-57ab1ce259d663cd0b9c9df7a8c0c315a9558abd.tar.bz2
Remove FFmpegDemuxer::first_seek_hack_ and related unnecessary code.
The warning in WebMediaPlayerImpl was added in r23598 but has long since been true. FFmpegDemuxer::first_seek_hack_ is due to Pipeline issuing a seek to the start timestamp as the final stage of initialization, however the demuxer doesn't require prerolling so we can safely skip it and remove the hack entirely. TEST=media_unittests, http/tests/media/, any HTTP 200 chunked response Review URL: https://chromiumcodereview.appspot.com/10024033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/pipeline.cc')
-rw-r--r--media/base/pipeline.cc7
1 files changed, 4 insertions, 3 deletions
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index d3854e4..719f579 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -717,11 +717,12 @@ void Pipeline::InitializeTask(PipelineStatus last_stage_status) {
PlaybackRateChangedTask(GetPlaybackRate());
VolumeChangedTask(GetVolume());
- // Fire the seek request to get the filters to preroll.
+ // Fire a seek request to get the renderers to preroll. We don't need to
+ // tell the demuxer to seek since it should already be at the start.
seek_pending_ = true;
SetState(kSeeking);
seek_timestamp_ = demuxer_->GetStartTime();
- DoSeek(seek_timestamp_);
+ OnDemuxerSeekDone(seek_timestamp_, PIPELINE_OK);
}
}
@@ -1312,7 +1313,7 @@ void Pipeline::OnDemuxerStopDone(const base::Closure& callback) {
}
void Pipeline::DoSeek(base::TimeDelta seek_timestamp) {
- // TODO(acolwell) : We might be able to convert this if (demuxer_) into a
+ // TODO(acolwell): We might be able to convert this if (demuxer_) into a
// DCHECK(). Further investigation is needed to make sure this won't introduce
// a bug.
if (demuxer_) {