diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 01:36:54 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 01:36:54 +0000 |
| commit | 357a170d4c0fff8a6f4c7b7085c33d0e0559e681 (patch) | |
| tree | d9a50186cc75f834ffa8bf295382fda0a8b4333f /media | |
| parent | 26aea307f2e0c64778cf0089c49d65574be061db (diff) | |
| download | chromium_src-357a170d4c0fff8a6f4c7b7085c33d0e0559e681.zip chromium_src-357a170d4c0fff8a6f4c7b7085c33d0e0559e681.tar.gz chromium_src-357a170d4c0fff8a6f4c7b7085c33d0e0559e681.tar.bz2 | |
Remove stale TODO + unnecessary if-guard in Pipeline::DoSeek().
If we call DoSeek() without a demuxer we've clearly got issues as we shouldn't be seeking without a demuxer so crashing is preferable.
BUG=none
TEST=none
TBR=acolwell
Review URL: https://chromiumcodereview.appspot.com/10694125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146024 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/pipeline.cc | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index fd59a130..9c456bb 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -1227,16 +1227,8 @@ void Pipeline::OnDemuxerStopDone(const base::Closure& callback) { } void Pipeline::DoSeek(TimeDelta seek_timestamp) { - // 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_) { - demuxer_->Seek(seek_timestamp, base::Bind( - &Pipeline::OnDemuxerSeekDone, this, seek_timestamp)); - return; - } - - OnDemuxerSeekDone(seek_timestamp, PIPELINE_OK); + demuxer_->Seek(seek_timestamp, base::Bind( + &Pipeline::OnDemuxerSeekDone, this, seek_timestamp)); } void Pipeline::OnDemuxerSeekDone(TimeDelta seek_timestamp, |