Merge M57: "Fix underflow duration calculation for MSE."

media/blink/webmediaplayer_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 #include <string>
@@ skipping 1283 matching lines @@
 
     // Report the amount of time it took to leave the underflow state.
     if (underflow_timer_) {
       RecordUnderflowDuration(underflow_timer_->Elapsed());
       underflow_timer_.reset();
     }
   } else {
     // Buffering has underflowed.
     DCHECK_EQ(state, BUFFERING_HAVE_NOTHING);
 
-    // Report the number of times we've entered the underflow state. Only report
-    // for src= playback since for MSE it's out of our control. Ensure we only
-    // report the value when transitioning from HAVE_ENOUGH to HAVE_NOTHING.
-    if (data_source_ &&
-        ready_state_ == WebMediaPlayer::ReadyStateHaveEnoughData) {
+    // Report the number of times we've entered the underflow state. Ensure we
+    // only report the value when transitioning from HAVE_ENOUGH to
+    // HAVE_NOTHING.
+    if (ready_state_ == WebMediaPlayer::ReadyStateHaveEnoughData)
       underflow_timer_.reset(new base::ElapsedTimer());
-    }
 
     // It shouldn't be possible to underflow if we've not advanced past
     // HAVE_CURRENT_DATA.
     DCHECK_GT(highest_ready_state_, WebMediaPlayer::ReadyStateHaveCurrentData);
     SetReadyState(WebMediaPlayer::ReadyStateHaveCurrentData);
   }
 
   UpdatePlayState();
 }
 
@@ skipping 956 matching lines @@
 }
 void WebMediaPlayerImpl::RecordUnderflowDuration(base::TimeDelta duration) {
   DCHECK(data_source_ || chunk_demuxer_);
   if (data_source_)
     UMA_HISTOGRAM_TIMES("Media.UnderflowDuration", duration);
   else
     UMA_HISTOGRAM_TIMES("Media.UnderflowDuration.MSE", duration);
 }
 
 }  // namespace media