head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2012.10.10.21.13.06;	author flo;	state dead;
branches;
next	1.1;

1.1
date	2012.08.30.14.54.17;	author flo;	state Exp;
branches;
next	;


desc
@@


1.2
log
@SVN rev 305684 on 2012-10-10 21:13:06Z by flo

- Update firefox-esr, thunderbird-esr, linux-firefox and linux-thunderbird to 10.0.8
- Update firefox and thunderbird to 16.0
- Update seamonkey to 2.13
- Update all -i18n ports respectively
- switch firefox 16.0 and seamonkey 2.13 to ALSA by default for better
  latency during pause and seeking with HTML5 video
- remove fedisableexcept() hacks, obsolete since FreeBSD 4.0
- support system hunspell dictionaries [1]
- unbreak -esr ports with clang3.2 [2]
- unbreak nss build when CC contains full path [3]
- remove GNOME option grouping [4]
- integrate enigmail into thunderbird/seamonkey as an option [5]
- remove mail/enigmail* [6]
- enable ENIGMAIL, LIGHTNING and GIO options by default
- add more reporters in about:memory: page-faults-hard, page-faults-soft,
  resident, vsize
- use bundled jemalloc 3.0.0 on FreeBSD < 10.0 for gecko 16.0,
  only heap-allocated reporter works in about:memory (see bug 762445)
- use lrintf() instead of slow C cast in bundled libopus
- use libjpeg-turbo's faster color conversion if available during build
- record startup time for telemetry
- use -z origin instead of hardcoding path to gecko runtime
- fail early if incompatible libxul version is installed (in USE_GECKO)
- *miscellaneous cleanups and fixups*

PR:		ports/171534 [1]
PR:		ports/171566 [2]
PR:		ports/172164 [3]
PR:		ports/172201 [4]
Discussed with:	ale, beat, Jan Beich [5]
Approved by:	ale [6]
In collaboration with:	Jan Beich <jbeich@@tormail.org>
Security:	6e5a9afd-12d3-11e2-b47d-c8600054b392
Feature safe:	yes
Approved by:	portmgr (beat)
@
text
@commit 4e07587
Author: Matthew Gregan <kinetik@@flim.org>
Date:   Wed Jun 6 17:58:07 2012 +1200

    Bug 723860 - Early bail from reader's GetBuffered() if not yet initialized.  r=doublec
---
 content/media/gstreamer/nsGStreamerReader.cpp | 4 ++++
 content/media/ogg/nsOggReader.cpp             | 3 +--
 content/media/wave/nsWaveReader.cpp           | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git content/media/gstreamer/nsGStreamerReader.cpp content/media/gstreamer/nsGStreamerReader.cpp
index 164fb2e..06a09b5 100644
--- content/media/gstreamer/nsGStreamerReader.cpp
+++ content/media/gstreamer/nsGStreamerReader.cpp
@@@@ -505,6 +505,10 @@@@ nsresult nsGStreamerReader::Seek(PRInt64 aTarget,
 nsresult nsGStreamerReader::GetBuffered(nsTimeRanges* aBuffered,
                                         PRInt64 aStartTime)
 {
+  if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
+    return NS_OK;
+  }
+
   GstFormat format = GST_FORMAT_TIME;
   MediaResource* resource = mDecoder->GetResource();
   gint64 resourceLength = resource->GetLength();
diff --git content/media/ogg/nsOggReader.cpp content/media/ogg/nsOggReader.cpp
index c6ff008..8d40e2c 100644
--- content/media/ogg/nsOggReader.cpp
+++ content/media/ogg/nsOggReader.cpp
@@@@ -1532,8 +1532,7 @@@@ nsresult nsOggReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
 {
   // HasAudio and HasVideo are not used here as they take a lock and cause
   // a deadlock. Accessing mInfo doesn't require a lock - it doesn't change
-  // after metadata is read and GetBuffered isn't called before metadata is
-  // read.
+  // after metadata is read.
   if (!mInfo.mHasVideo && !mInfo.mHasAudio) {
     // No need to search through the file if there are no audio or video tracks
     return NS_OK;
diff --git content/media/wave/nsWaveReader.cpp content/media/wave/nsWaveReader.cpp
index 7242eb5..60fc1e1 100644
--- content/media/wave/nsWaveReader.cpp
+++ content/media/wave/nsWaveReader.cpp
@@@@ -239,6 +239,9 @@@@ static double RoundToUsecs(double aSeconds) {
 
 nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
 {
+  if (!mInfo.mHasAudio) {
+    return NS_OK;
+  }
   PRInt64 startOffset = mDecoder->GetResource()->GetNextCachedData(mWavePCMOffset);
   while (startOffset >= 0) {
     PRInt64 endOffset = mDecoder->GetResource()->GetCachedDataEnd(startOffset);
@


1.1
log
@SVN rev 303378 on 2012-08-30 14:54:17Z by flo

- update firefox and thunderbird to 15.0
- update firefox-esr, thunderbird-esr, linux-thunderbird and linux-firefox to 10.0.7
- update seamonkey and linux-seamonkey to 2.12
- update nss to 3.13.6
- update bsdipc code (posix_spawn, SysV shared memory)
- rename patches to easily track those not (yet) submitted upstream
- reduce package size, except for www/libxul[1]
- restore default objdir to what it was in 13.0
- fix mail/enigmail after thunderbird build changes
- don't accidentally pick up headers from installed ports[3]
- add support for PREFIX != LOCALBASE to Makefile.webplugins [4]
- document vulnerabilities in vuln.xml
- *miscellaneous cleanups and fixups*

Obtained from:	OpenBSD ports[1]
PR:		ports/159831, ports/160933, ports/170467[3], ports/170236 [4]
Submitted by:	avilla [4]
In collaboration with:	Jan Beich <jbeich@@tormail.net> Who did most of the hard
			work.
@
text
@@

