From owner-freebsd-gecko@FreeBSD.ORG Sat Jan 17 01:58:04 2015 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CBBA8657 for ; Sat, 17 Jan 2015 01:58:04 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian.chruetertee.ch [217.150.244.247]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7082BFE8 for ; Sat, 17 Jan 2015 01:58:03 +0000 (UTC) Received: from trillian.chruetertee.ch (trillian [217.150.244.247]) by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id t0H1vsNX008296 for ; Sat, 17 Jan 2015 01:57:54 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id t0H1vnGV007559 for freebsd-gecko@freebsd.org; Sat, 17 Jan 2015 01:57:49 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Sat, 17 Jan 2015 01:57:49 GMT Message-Id: <201501170157.t0H1vnGV007559@trillian.chruetertee.ch> X-Authentication-Warning: trillian.chruetertee.ch: www set sender to svn-freebsd-gecko@chruetertee.ch using -f From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1805 - in trunk/www: firefox-nightly/files firefox/files seamonkey/files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reply-To: freebsd-gecko@freebsd.org X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Jan 2015 01:58:04 -0000 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(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(std::abs(next_render_time_ms - now_ms)), ++ std::abs(static_cast(next_render_time_ms - now_ms)), + max_video_delay_ms_); + timing_error = true; + } else if (static_cast(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 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 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 event = + NS_NewRunnableMethod(mDecoder, &MediaDecoder::DurationChanged);