roytam1/palemoon27
1
0
Fork 0
mirror of https://github.com/roytam1/palemoon27.git synced 2026-05-26 14:18:48 +00:00
Code Issues Projects Releases Wiki Activity

Clean up SetDuration and remove negative duration case

Browse Source
This commit is contained in:
trav90
2017-07-02 04:35:54 -05:00
committed by Roy Tam
parent f3666a1dc9
commit f319e95fd1
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dom/media/MediaDecoderStateMachine.cpp
+7 -11
View File
@@ -1448,7 +1448,7 @@ void MediaDecoderStateMachine::RecomputeDuration()
fireDurationChanged = true;
}
SetDuration(duration.ToMicroseconds());
SetDuration(duration);
if (fireDurationChanged) {
nsCOMPtr<nsIRunnable> event =
@@ -1457,29 +1457,25 @@ void MediaDecoderStateMachine::RecomputeDuration()
}
}
void MediaDecoderStateMachine::SetDuration(int64_t aDuration)
void MediaDecoderStateMachine::SetDuration(TimeUnit aDuration)
{
MOZ_ASSERT(OnTaskQueue());
ReentrantMonitorAutoEnter mon(mDecoder->GetReentrantMonitor());
if (aDuration < 0) {
mDurationSet = false;
return;
}
MOZ_ASSERT(aDuration.ToMicroseconds() >= 0);
mDurationSet = true;
if (mStartTime == -1) {
SetStartTime(0);
}
if (aDuration == INT64_MAX) {
if (aDuration.IsInfinite()) {
mEndTime = -1;
return;
}
mEndTime = mStartTime + aDuration;
mEndTime = mStartTime + aDuration.ToMicroseconds();
if (mDecoder && mEndTime >= 0 && mEndTime < mCurrentPosition.ReadOnWrongThread()) {
if (mDecoder && mEndTime >= 0 && mEndTime < mCurrentPosition) {
// The current playback position is now past the end of the element duration
// the user agent must also seek to the time of the end of the media
// resource.