Page MenuHomeFreeBSD
Files F153470525

D1569.id3272.diff
No OneTemporary
Actions

D1569.id3272.diff
View Options

Index: www/firefox/files/patch-bug1122586
===================================================================
--- /dev/null
+++ www/firefox/files/patch-bug1122586
@@ -0,0 +1,30 @@
+diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
+index 36a6ccf..96d3bd0 100644
+--- content/media/MediaDecoderStateMachine.cpp
++++ content/media/MediaDecoderStateMachine.cpp
+@@ -18,6 +18,7 @@
+ #include "nsTArray.h"
+ #include "MediaDecoder.h"
+ #include "MediaDecoderReader.h"
++#include "mozilla/MathAlgorithms.h"
+ #include "mozilla/mozalloc.h"
+ #include "VideoUtils.h"
+ #include "mozilla/dom/TimeRanges.h"
+@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
+ // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
+ // less than this are ignored, as they're assumed to be the result of
+ // instability in the duration estimation.
+-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
+
+ static TimeDuration UsecsToDuration(int64_t aUsecs) {
+ return TimeDuration::FromMicroseconds(aUsecs);
+@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
+ AssertCurrentThreadInMonitor();
+ int64_t duration = GetDuration();
+ if (aDuration != duration &&
+- std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
++ mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
+ SetDuration(aDuration);
+ nsCOMPtr<nsIRunnable> event =
+ NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);
Index: www/seamonkey/files/patch-bug1122586
===================================================================
--- /dev/null
+++ www/seamonkey/files/patch-bug1122586
@@ -0,0 +1,30 @@
+diff --git content/media/MediaDecoderStateMachine.cpp content/media/MediaDecoderStateMachine.cpp
+index 36a6ccf..96d3bd0 100644
+--- mozilla/content/media/MediaDecoderStateMachine.cpp
++++ mozilla/content/media/MediaDecoderStateMachine.cpp
+@@ -18,6 +18,7 @@
+ #include "nsTArray.h"
+ #include "MediaDecoder.h"
+ #include "MediaDecoderReader.h"
++#include "mozilla/MathAlgorithms.h"
+ #include "mozilla/mozalloc.h"
+ #include "VideoUtils.h"
+ #include "mozilla/dom/TimeRanges.h"
+@@ -165,7 +166,7 @@ static_assert(QUICK_BUFFERING_LOW_DATA_USECS <= AMPLE_AUDIO_USECS,
+ // MediaDecoderStateMachine::UpdateEstimatedDuration(); changes of duration
+ // less than this are ignored, as they're assumed to be the result of
+ // instability in the duration estimation.
+-static const int64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
++static const uint64_t ESTIMATED_DURATION_FUZZ_FACTOR_USECS = USECS_PER_S / 2;
+
+ static TimeDuration UsecsToDuration(int64_t aUsecs) {
+ return TimeDuration::FromMicroseconds(aUsecs);
+@@ -1447,7 +1448,7 @@ void MediaDecoderStateMachine::UpdateEstimatedDuration(int64_t aDuration)
+ AssertCurrentThreadInMonitor();
+ int64_t duration = GetDuration();
+ if (aDuration != duration &&
+- std::abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
++ mozilla::Abs(aDuration - duration) > ESTIMATED_DURATION_FUZZ_FACTOR_USECS) {
+ SetDuration(aDuration);
+ nsCOMPtr<nsIRunnable> event =
+ NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 8:41 AM (9 h, 22 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31914132
Default Alt Text
D1569.id3272.diff (3 KB)

Event Timeline