Split MediaContentType and AudioFocusType

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 13 matching lines @@
 #include "base/task_runner_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "build/build_config.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/video_layer.h"
 #include "media/audio/null_audio_sink.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/cdm_context.h"
 #include "media/base/limits.h"
+#include "media/base/media_content_type.h"
 #include "media/base/media_log.h"
 #include "media/base/media_switches.h"
 #include "media/base/text_renderer.h"
 #include "media/base/timestamp_constants.h"
 #include "media/base/video_frame.h"
 #include "media/blink/texttrack_impl.h"
 #include "media/blink/watch_time_reporter.h"
 #include "media/blink/webaudiosourceprovider_impl.h"
 #include "media/blink/webcontentdecryptionmodule_impl.h"
 #include "media/blink/webinbandtexttrack_impl.h"
@@ skipping 1497 matching lines @@
   if (!delegate_ || delegate_state_ == new_state)
     return;
 
   delegate_state_ = new_state;
 
   switch (delegate_state_) {
     case DelegateState::GONE:
       delegate_->PlayerGone(delegate_id_);
       break;
     case DelegateState::PLAYING:
-      delegate_->DidPlay(delegate_id_, hasVideo(), hasAudio(), false,
-                         pipeline_.GetMediaDuration());
+      delegate_->DidPlay(
+          delegate_id_, hasVideo(), hasAudio(), false,
+          media::DurationToMediaContentType(pipeline_.GetMediaDuration()));
       break;
     case DelegateState::PAUSED:
       delegate_->DidPause(delegate_id_, false);
       break;
     case DelegateState::PAUSED_BUT_NOT_IDLE:
       // It doesn't really matter what happens when we enter this state, only
       // that we reset the idle timer when leaving it.
       //
       // TODO(sandersd): Ideally the delegate would consider idleness and play
       // state as orthogonal properties so that we could avoid this.
@@ skipping 227 matching lines @@
       pipeline_metadata_.natural_size,
       base::Bind(&GetCurrentTimeInternal, this)));
   watch_time_reporter_->OnVolumeChange(volume_);
   if (delegate_ && delegate_->IsHidden())
     watch_time_reporter_->OnHidden();
   else
     watch_time_reporter_->OnShown();
 }
 
 }  // namespace media