media/blink/webmediaplayer_impl.cc - Issue 1996043002: Split MediaContentType and AudioFocusType

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/blink/webmediaplayer_impl.cc

Issue 1996043002: Split MediaContentType and AudioFocusType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixed desktop build & tests Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/blink/webmediaplayer_impl.cc

diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc

index c0cdfcc5c25245dd8da65c0ec0c301947fcd5b88..faa98374adbe382baf9dc07419384c717da38690 100644

--- a/media/blink/webmediaplayer_impl.cc

+++ b/media/blink/webmediaplayer_impl.cc

@@ -31,6 +31,7 @@

#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"

@@ -1478,8 +1479,9 @@ void WebMediaPlayerImpl::SetDelegateState(DelegateState new_state) {

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);