From owner-freebsd-gecko@FreeBSD.ORG Tue Feb 11 21:28:39 2014 Return-Path: Delivered-To: freebsd-gecko@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AF9BB2EF for ; Tue, 11 Feb 2014 21:28:39 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4F6891434 for ; Tue, 11 Feb 2014 21:28:38 +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 s1BLSbVx082933 for ; Tue, 11 Feb 2014 21:28:37 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Received: (from www@localhost) by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id s1BLSWkX082334 for freebsd-gecko@freebsd.org; Tue, 11 Feb 2014 21:28:32 GMT (envelope-from svn-freebsd-gecko@chruetertee.ch) Date: Tue, 11 Feb 2014 21:28:32 GMT Message-Id: <201402112128.s1BLSWkX082334@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] r1493 - 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 X-BeenThere: freebsd-gecko@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: freebsd-gecko@freebsd.org List-Id: Gecko Rendering Engine issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Feb 2014 21:28:39 -0000 Author: jbeich Date: Tue Feb 11 21:28:32 2014 New Revision: 1493 Log: sync gstreamer1 patch with landed version Modified: trunk/www/firefox-nightly/files/patch-bug806917 trunk/www/firefox/files/patch-bug806917 trunk/www/seamonkey/files/patch-bug806917 Modified: trunk/www/firefox-nightly/files/patch-bug806917 ============================================================================== --- trunk/www/firefox-nightly/files/patch-bug806917 Tue Feb 11 21:11:25 2014 (r1492) +++ trunk/www/firefox-nightly/files/patch-bug806917 Tue Feb 11 21:28:32 2014 (r1493) @@ -890,7 +890,7 @@ #include "VideoUtils.h" #include "mozilla/dom/TimeRanges.h" #include "mozilla/Preferences.h" -@@ -31,14 +33,14 @@ extern PRLogModuleInfo* gMediaDecoderLog; +@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog; #define LOG(type, msg) #endif @@ -899,9 +899,11 @@ - const VideoData::YCbCrBuffer::Plane& aCbPlane, - const VideoData::YCbCrBuffer::Plane& aCrPlane); - ++#if DEBUG static const unsigned int MAX_CHANNELS = 4; -// Let the demuxer work in pull mode for short files -static const int SHORT_FILE_SIZE = 1024 * 1024; ++#endif +// Let the demuxer work in pull mode for short files. This used to be a micro +// optimization to have more accurate durations for ogg files in mochitests. +// Since as of today we aren't using gstreamer to demux ogg, and having demuxers Modified: trunk/www/firefox/files/patch-bug806917 ============================================================================== --- trunk/www/firefox/files/patch-bug806917 Tue Feb 11 21:11:25 2014 (r1492) +++ trunk/www/firefox/files/patch-bug806917 Tue Feb 11 21:28:32 2014 (r1493) @@ -887,7 +887,7 @@ #include "VideoUtils.h" #include "mozilla/dom/TimeRanges.h" #include "mozilla/Preferences.h" -@@ -31,14 +33,14 @@ extern PRLogModuleInfo* gMediaDecoderLog; +@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog; #define LOG(type, msg) #endif @@ -896,9 +896,11 @@ - const VideoData::YCbCrBuffer::Plane& aCbPlane, - const VideoData::YCbCrBuffer::Plane& aCrPlane); - ++#if DEBUG static const unsigned int MAX_CHANNELS = 4; -// Let the demuxer work in pull mode for short files -static const int SHORT_FILE_SIZE = 1024 * 1024; ++#endif +// Let the demuxer work in pull mode for short files. This used to be a micro +// optimization to have more accurate durations for ogg files in mochitests. +// Since as of today we aren't using gstreamer to demux ogg, and having demuxers Modified: trunk/www/seamonkey/files/patch-bug806917 ============================================================================== --- trunk/www/seamonkey/files/patch-bug806917 Tue Feb 11 21:11:25 2014 (r1492) +++ trunk/www/seamonkey/files/patch-bug806917 Tue Feb 11 21:28:32 2014 (r1493) @@ -887,7 +887,7 @@ #include "VideoUtils.h" #include "mozilla/dom/TimeRanges.h" #include "mozilla/Preferences.h" -@@ -31,14 +33,14 @@ extern PRLogModuleInfo* gMediaDecoderLog; +@@ -31,14 +33,16 @@ extern PRLogModuleInfo* gMediaDecoderLog; #define LOG(type, msg) #endif @@ -896,9 +896,11 @@ - const VideoData::YCbCrBuffer::Plane& aCbPlane, - const VideoData::YCbCrBuffer::Plane& aCrPlane); - ++#if DEBUG static const unsigned int MAX_CHANNELS = 4; -// Let the demuxer work in pull mode for short files -static const int SHORT_FILE_SIZE = 1024 * 1024; ++#endif +// Let the demuxer work in pull mode for short files. This used to be a micro +// optimization to have more accurate durations for ogg files in mochitests. +// Since as of today we aren't using gstreamer to demux ogg, and having demuxers