[SVN-Commit] r1805 - in trunk/www: firefox-nightly/files firefox/files seamonkey/files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Sat Jan 17 01:57:49 2015
New Revision: 1805

Log:
unbreak clang/libstdc++ i386 build on 8.x and 9.x

PR:		ports/196772
Patch by:	bar (initial version)

Added:
   trunk/www/firefox-nightly/files/patch-bug1122547
   trunk/www/firefox-nightly/files/patch-bug1122586
   trunk/www/firefox/files/patch-bug1122586
   trunk/www/seamonkey/files/patch-bug1122586

Added: trunk/www/firefox-nightly/files/patch-bug1122547
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug1122547	Sat Jan 17 01:57:49 2015	(r1805)
@@ -0,0 +1,20 @@
+diff --git media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
+index e68a104..a090241 100644
+--- media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
++++ media/webrtc/trunk/webrtc/modules/video_coding/main/source/receiver.cc
+@@ -159,12 +159,13 @@ VCMEncodedFrame* VCMReceiver::FrameForDecoding(
+   // Assume that render timing errors are due to changes in the video stream.
+   if (next_render_time_ms < 0) {
+     timing_error = true;
+-  } else if (std::abs(next_render_time_ms - now_ms) > max_video_delay_ms_) {
++  } else if (std::abs(static_cast<int>(next_render_time_ms - now_ms)) >
++             max_video_delay_ms_) {
+     WEBRTC_TRACE(webrtc::kTraceWarning, webrtc::kTraceVideoCoding,
+                  VCMId(vcm_id_, receiver_id_),
+                  "This frame is out of our delay bounds, resetting jitter "
+                  "buffer: %d > %d",
+-                 static_cast<int>(std::abs(next_render_time_ms - now_ms)),
++                 std::abs(static_cast<int>(next_render_time_ms - now_ms)),
+                  max_video_delay_ms_);
+     timing_error = true;
+   } else if (static_cast<int>(timing_->TargetVideoDelay()) >

Added: trunk/www/firefox-nightly/files/patch-bug1122586
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox-nightly/files/patch-bug1122586	Sat Jan 17 01:57:49 2015	(r1805)
@@ -0,0 +1,30 @@
+diff --git dom/media/MediaDecoderStateMachine.cpp dom/media/MediaDecoderStateMachine.cpp
+index 36a6ccf..96d3bd0 100644
+--- dom/media/MediaDecoderStateMachine.cpp
++++ dom/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);

Added: trunk/www/firefox/files/patch-bug1122586
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/firefox/files/patch-bug1122586	Sat Jan 17 01:57:49 2015	(r1805)
@@ -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);

Added: trunk/www/seamonkey/files/patch-bug1122586
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/www/seamonkey/files/patch-bug1122586	Sat Jan 17 01:57:49 2015	(r1805)
@@ -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);