Bug 1132796: Revert incorrect change unfixing bug 1132825. r=jya a=lmandel
authorJean-Yves Avenard <jyavenard@mozilla.com>
Tue, 17 Feb 2015 22:07:48 +1300
changeset 250074 82ef773ccb71
parent 250073 21ec3b2d3da5
child 250075 153da3594a3e
push id4496
push userrgiles@mozilla.com
push date2015-02-25 18:29 +0000
treeherdermozilla-beta@82ef773ccb71 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, lmandel
bugs1132796, 1132825
milestone37.0
Bug 1132796: Revert incorrect change unfixing bug 1132825. r=jya a=lmandel The earlier patch for bug 1132796 accidentally overwrote the change resolving bug 1132825. This commit restores it.
dom/media/mediasource/TrackBuffer.cpp
--- a/dom/media/mediasource/TrackBuffer.cpp
+++ b/dom/media/mediasource/TrackBuffer.cpp
@@ -337,17 +337,17 @@ TrackBuffer::EvictData(double aPlaybackT
       double time = aPlaybackTime - MSE_EVICT_THRESHOLD_TIME;
       int64_t playbackOffset = decoders[i]->ConvertToByteOffset(time);
       MSE_DEBUG("evicting some bufferedEnd=%f"
                 "aPlaybackTime=%f time=%f, playbackOffset=%lld size=%lld",
                 buffered->GetEndTime(), aPlaybackTime, time,
                 playbackOffset, decoders[i]->GetResource()->GetSize());
       if (playbackOffset > 0) {
         toEvict -= decoders[i]->GetResource()->EvictData(playbackOffset,
-                                                         toEvict);
+                                                         playbackOffset);
       }
     }
   }
 
   // Evict all data from decoders we've likely already read from.
   for (uint32_t i = 0; i < decoders.Length() && toEvict > 0; ++i) {
     if (mParentDecoder->IsActiveReader(decoders[i]->GetReader())) {
       break;