Bug 1174584: P1. Fix logging. r=cpearce
authorJean-Yves Avenard <jyavenard@mozilla.com>
Mon, 15 Jun 2015 12:11:29 +1000
changeset 280489 e62a1881bf6b6b19094616e0c4a3d9cd598605c7
parent 280488 21a4cdb444f52d82eaea947a1b4f3a0819e87dac
child 280490 128206149d80ebefd782eaebb4d4a2a0f54fe041
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1174584
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1174584: P1. Fix logging. r=cpearce
dom/media/mediasource/TrackBuffersManager.cpp
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -416,21 +416,21 @@ TrackBuffersManager::CodedFrameRemoval(T
   if (mMediaSourceDuration.Ref().isNothing() ||
       IsNaN(mMediaSourceDuration.Ref().ref())) {
     MSE_DEBUG("Nothing to remove, aborting");
     return false;
   }
   TimeUnit duration{TimeUnit::FromSeconds(mMediaSourceDuration.Ref().ref())};
 
   MSE_DEBUG("duration:%.2f", duration.ToSeconds());
-  if (HasAudio()) {
+  if (HasVideo()) {
     MSE_DEBUG("before video ranges=%s",
               DumpTimeRanges(mVideoTracks.mBufferedRanges).get());
   }
-  if (HasVideo()) {
+  if (HasAudio()) {
     MSE_DEBUG("before audio ranges=%s",
               DumpTimeRanges(mAudioTracks.mBufferedRanges).get());
   }
 
   // 1. Let start be the starting presentation timestamp for the removal range.
   TimeUnit start = aInterval.mStart;
   // 2. Let end be the end presentation timestamp for the removal range.
   TimeUnit end = aInterval.mEnd;
@@ -506,21 +506,21 @@ TrackBuffersManager::CodedFrameRemoval(T
   // TODO.
   mBufferFull = false;
   {
     MonitorAutoLock mon(mMonitor);
     mVideoBufferedRanges = mVideoTracks.mBufferedRanges;
     mAudioBufferedRanges = mAudioTracks.mBufferedRanges;
   }
 
-  if (HasAudio()) {
+  if (HasVideo()) {
     MSE_DEBUG("after video ranges=%s",
               DumpTimeRanges(mVideoTracks.mBufferedRanges).get());
   }
-  if (HasVideo()) {
+  if (HasAudio()) {
     MSE_DEBUG("after audio ranges=%s",
               DumpTimeRanges(mAudioTracks.mBufferedRanges).get());
   }
 
   // Update our reported total size.
   mSizeSourceBuffer = mVideoTracks.mSizeBuffer + mAudioTracks.mSizeBuffer;
 
   // Reset our insertion indexes as they are now invalid.