From db70e38a67cd715ca910b1075c1152ffa30ba9cc Mon Sep 17 00:00:00 2001
From: Chris Pearce <chris@pearce.org.nz>
Date: Thu, 14 Apr 2011 10:12:23 +1200
Subject: [PATCH] Bug 641718 - Round nsWaveReader's buffered ranges times to
 usecs. r=kinetik

---
 content/media/test/Makefile.in      |   1 +
 content/media/test/audio.wav        | Bin 0 -> 1422 bytes
 content/media/test/manifest.js      |   1 +
 content/media/wave/nsWaveReader.cpp |  11 +++++++++--
 4 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 content/media/test/audio.wav

diff --git a/content/media/test/Makefile.in b/content/media/test/Makefile.in
index e9f317bd4ac8..a538b7550a00 100644
--- a/content/media/test/Makefile.in
+++ b/content/media/test/Makefile.in
@@ -231,6 +231,7 @@ _TEST_FILES += \
 		r16000_u8_c1_list.wav \
 		wavedata_u8.wav \
 		wavedata_s16.wav \
+		audio.wav \
 		$(NULL)
 
 # Other files
diff --git a/content/media/test/audio.wav b/content/media/test/audio.wav
new file mode 100644
index 0000000000000000000000000000000000000000..c6fd5cb869351be1b0fd2ccbdac51eb77066f464
GIT binary patch
literal 1422
zcmYk6drVVj7{==#%h=rFoVu|v)QK<wVaUdCOruVvFi=>LmI4)8YALjoQrbfAH+rKj
zEwly7r3C@Yog#O%(0VCa&~7o&Y%ZEPqw%^Jr~bS5v|Hxy<U9Fta`L^;d7tM!n9THa
z)jKE@?hy7UrHZ}%BNPg?4z44ksNh<M3PX{JY$6HXQ8qLv6mq#tCY4IWVv$HF6bSe{
zUVVKXm&0b)vTACW%xVTu6@tO2W-@DPShZ|!U41=IAQXwjQkh(?Xi%!uYPBYaR;vwd
z-nzpxZKF=7*BgK)z!(DA8Vq_}qgJC<tCS52x$G?^e9#hv|35)>h`d^m2jZ$|l@%3K
zYB>UxT2V=>VlY{?oI0LBB$YR)G&+OHY-w$`b#!*y?G6OHy}P@!!`9wvH8-1@^g4}7
zsgOy<LO!n!P7NN)sG`$p037}A;S|a#GP$gbL?RJGkjl!)rzqu6k^WyrzECVvC{<dW
z!PsoJw%Izn?2g{k{R3y5gG0l^BV!XTmunK1%QZ1EF+M&vIx;*o=p5)j-RrP-b+lP6
z%|=6`Mk$wy`1KqXvx-KgkV&N{i;D^ia9C`9{t1Nqd@L4MfG;d6DkhYa5<@aTMJ0_6
z9)<h?hgh`;Y&M(2;c~fkh+6=kFAxZXLa<FF7E2@&sZ=JDE5JR(J`FgeH#8ZWTg+By
z81$<L#5)n;lV_)A=H?d`7tfss&Mhv?&&^Ctj*kwX>Feogx0v*5xtPbUrcsE5f)hDe
z=)(v1r=@<gCn+%@J}xd6AucXHAu%cW>y*^AeFqL5L1!Mz&BNl0OUo!!dNqs76G|1T
zMuXAZYU^_J_B)56=G4sG!s2=N(z3_n^?E&?<z+WihQhA#(V;W_r+e(3wzgJFOS8!c
z843ciGMSp;1I!kS)oQg^%wVyxN#Cf3t_pda8akC+QiR1E%Q$=>?b|&GvC%uWMuczK
zv~j}+>)#6tdlw<>{q-Mi*tj`7Vq4UgyOUDV4yI>g@Fl0{ES^+luyphej!!Rod~3hl
z{O!)Y2aliq_2T8L*KgjudHw3|moJ__ee~eZySH!M2>5+o_x$w4h_lbp*#^ey!B_}4
zGH5Vq0CYbHj2$Gep37!28T5*BGO?r>k2`_MJ)WJFnSo9}8YDd(jn2r-{4p#0cuww5
zm^_F97KbY+z~c)c2t~yJfpGF<NiYz>SXR<u4A@+rKn#ry4uQ43v)j?zH{cu^869^a
zj?T`_gQ0HslE-`D;$@$2<*I*m?b`J~;AbEZxPEQTf5msn>t38aJ2u#7Z*S47B)nQW
zr39aM41H){YI0&+Ow{(si11IhY~J)Suxay_Pr^Toh}<3(6T3SxIpw?k2ajZA<zTRd
z1R|MAW3V_pp+uq58cde94tvmM*VOF7xh2nqOP5!!K>5|RwY62h-+%S$m6a8r@A9RK
z7d*>LZiw9c-0bw!Sr<%AaA^8M_FK)SCY@F(mk4=WRyD1hTuLa!=H+B(9z`O!H#H?W
zDRFn~u9)bZJHFVqb!%kg=LnIJ+jd0ljE>nApYT<3%HHn}{D96nj=>Q~<@B05kwVjC
zu{j1tCTGukeg43WTet80asT0?Cr_U}2cA8B^7!HXdv|~T_2!Mh>dHlrdtqjBY}nb?
W(`{?BwwMe$ty<X-`i;qz@_zs+LbqQ4

literal 0
HcmV?d00001

diff --git a/content/media/test/manifest.js b/content/media/test/manifest.js
index 03f2ff05a37e..b3238af5eb95 100644
--- a/content/media/test/manifest.js
+++ b/content/media/test/manifest.js
@@ -214,6 +214,7 @@ var gErrorTests = [
 // These are files that have nontrivial duration and are useful for seeking within.
 var gSeekTests = [
   { name:"r11025_s16_c1.wav", type:"audio/x-wav", duration:1.0 },
+  { name:"audio.wav", type:"audio/x-wav", duration:0.031247 },
   { name:"seek.ogv", type:"video/ogg", duration:3.966 },
   { name:"320x240.ogv", type:"video/ogg", duration:0.233 },
   { name:"seek.webm", type:"video/webm", duration:3.966 },
diff --git a/content/media/wave/nsWaveReader.cpp b/content/media/wave/nsWaveReader.cpp
index d4fceec68e91..d5e1ce664e64 100644
--- a/content/media/wave/nsWaveReader.cpp
+++ b/content/media/wave/nsWaveReader.cpp
@@ -273,6 +273,10 @@ nsresult nsWaveReader::Seek(PRInt64 aTarget, PRInt64 aStartTime, PRInt64 aEndTim
   return mDecoder->GetCurrentStream()->Seek(nsISeekableStream::NS_SEEK_SET, position);
 }
 
+static double RoundToUsecs(double aSeconds) {
+  return floor(aSeconds * USECS_PER_S) / USECS_PER_S;
+}
+
 nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
 {
   PRInt64 startOffset = mDecoder->GetCurrentStream()->GetNextCachedData(mWavePCMOffset);
@@ -282,8 +286,11 @@ nsresult nsWaveReader::GetBuffered(nsTimeRanges* aBuffered, PRInt64 aStartTime)
     NS_ASSERTION(startOffset >= mWavePCMOffset, "Integer underflow in GetBuffered");
     NS_ASSERTION(endOffset >= mWavePCMOffset, "Integer underflow in GetBuffered");
 
-    aBuffered->Add(BytesToTime(startOffset - mWavePCMOffset),
-                   BytesToTime(endOffset - mWavePCMOffset));
+    // We need to round the buffered ranges' times to microseconds so that they
+    // have the same precision as the currentTime and duration attribute on 
+    // the media element.
+    aBuffered->Add(RoundToUsecs(BytesToTime(startOffset - mWavePCMOffset)),
+                   RoundToUsecs(BytesToTime(endOffset - mWavePCMOffset)));
     startOffset = mDecoder->GetCurrentStream()->GetNextCachedData(endOffset);
   }
   return NS_OK;