From ccd50d5c6ce8362c86882caba06d3ac7aaaeee92 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Thu, 23 Aug 2012 02:30:08 +0000 Subject: Revert 152919 - Guard against ALSA returning insane frame counts for current delay. One video observed generated an alleged delay of 9222246136947932171 frames near the end of stream, which when converted to bytes and passed through a chain of uint32/int32 conversions became -4052 bytes, and then -46ms, triggering the DCHECK in the bug below. BUG=144281 Review URL: https://chromiumcodereview.appspot.com/10869019 TBR=fischman@chromium.org Review URL: https://chromiumcodereview.appspot.com/10879027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152923 0039d316-1c4b-4281-b951-d872f2087c98 --- media/base/pipeline.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'media/base/pipeline.cc') diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc index 4650e6e..a27bfc3 100644 --- a/media/base/pipeline.cc +++ b/media/base/pipeline.cc @@ -352,7 +352,7 @@ void Pipeline::OnAudioDisabled() { } void Pipeline::OnAudioTimeUpdate(TimeDelta time, TimeDelta max_time) { - DCHECK_LE(time.InMicroseconds(), max_time.InMicroseconds()); + DCHECK(time <= max_time); DCHECK(IsRunning()); base::AutoLock auto_lock(lock_); -- cgit v1.1