author | Robert O'Callahan <robert@ocallahan.org> |
Mon, 09 Dec 2013 18:08:02 +1300 | |
changeset 162301 | c735d3475955280cfd887d45374d6430acc628c8 |
parent 162300 | 939ac6298d2a90e0bcafec32e83aa589fd8e0199 |
child 162302 | 76bf4bf3492623c86ed86b66e1c6abc3c0a0b3cc |
push id | 38157 |
push user | rocallahan@mozilla.com |
push date | Tue, 07 Jan 2014 03:33:28 +0000 |
treeherder | mozilla-inbound@90d56ff72f1a [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | padenot |
bugs | 947796 |
milestone | 29.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/content/media/MediaStreamGraph.cpp +++ b/content/media/MediaStreamGraph.cpp @@ -338,17 +338,17 @@ MediaStreamGraphImpl::UpdateCurrentTime( mCurrentTimeStamp = now; STREAM_LOG(PR_LOG_DEBUG+1, ("Updating current time to %f (real %f, mStateComputedTime %f)", MediaTimeToSeconds(nextCurrentTime), (now - mInitialTimeStamp).ToSeconds(), MediaTimeToSeconds(mStateComputedTime))); } else { prevCurrentTime = mCurrentTime; - nextCurrentTime = mCurrentTime + MEDIA_GRAPH_TARGET_PERIOD_MS; + nextCurrentTime = mCurrentTime + MillisecondsToMediaTime(MEDIA_GRAPH_TARGET_PERIOD_MS); STREAM_LOG(PR_LOG_DEBUG+1, ("Updating offline current time to %f (mStateComputedTime %f)", MediaTimeToSeconds(nextCurrentTime), MediaTimeToSeconds(mStateComputedTime))); } if (mStateComputedTime < nextCurrentTime) { STREAM_LOG(PR_LOG_WARNING, ("Media graph global underrun detected")); nextCurrentTime = mStateComputedTime;