54 lines
2.4 KiB
Diff
54 lines
2.4 KiB
Diff
|
From: AlexeyBarabash <alexey@brave.com>
|
||
|
|
Date: Thu, 2 Nov 2017 18:21:16 +0200
|
||
|
|
Subject: Allow playing audio in background
|
||
|
|
|
||
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
||
|
|
---
|
||
|
|
.../renderer/platform/media/web_media_player_impl.cc | 11 ++++++++++-
|
||
|
|
.../renderer/platform/media/web_media_player_impl.h | 3 +++
|
||
|
|
2 files changed, 13 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.cc b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
|
||
|
|
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.cc
|
||
|
|
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.cc
|
||
|
|
@@ -1176,6 +1176,12 @@ bool WebMediaPlayerImpl::HasAudio() const {
|
||
|
|
return pipeline_metadata_.has_audio;
|
||
|
|
}
|
||
|
|
|
||
|
|
+bool WebMediaPlayerImpl::HasVideoNonEmptySize() const {
|
||
|
|
+ DCHECK(main_task_runner_->BelongsToCurrentThread());
|
||
|
|
+
|
||
|
|
+ return pipeline_metadata_.has_video && pipeline_metadata_.natural_size.width() != 0 && pipeline_metadata_.natural_size.height() != 0;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
void WebMediaPlayerImpl::EnabledAudioTracksChanged(
|
||
|
|
const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) {
|
||
|
|
DCHECK(main_task_runner_->BelongsToCurrentThread());
|
||
|
|
@@ -3484,7 +3490,10 @@ bool WebMediaPlayerImpl::ShouldPausePlaybackWhenHidden() const {
|
||
|
|
: HasAudio();
|
||
|
|
|
||
|
|
// Audio only stream is allowed to play when in background.
|
||
|
|
- if (!HasVideo() && preserve_audio)
|
||
|
|
+ //pipeline_metadata_.has_video is true for MediaPlayerRenderer,
|
||
|
|
+ //see media/base/pipeline_metadata.h. This is a workaround to allow audio
|
||
|
|
+ //streams be played in background.
|
||
|
|
+ if (!HasVideoNonEmptySize() && preserve_audio)
|
||
|
|
return false;
|
||
|
|
|
||
|
|
// MediaPlayer always signals audio and video, so use an empty natural size to
|
||
|
|
diff --git a/third_party/blink/renderer/platform/media/web_media_player_impl.h b/third_party/blink/renderer/platform/media/web_media_player_impl.h
|
||
|
|
--- a/third_party/blink/renderer/platform/media/web_media_player_impl.h
|
||
|
|
+++ b/third_party/blink/renderer/platform/media/web_media_player_impl.h
|
||
|
|
@@ -200,6 +200,9 @@ class PLATFORM_EXPORT WebMediaPlayerImpl
|
||
|
|
bool HasVideo() const override;
|
||
|
|
bool HasAudio() const override;
|
||
|
|
|
||
|
|
+ // True is has video and it's frame size is not zero
|
||
|
|
+ bool HasVideoNonEmptySize() const;
|
||
|
|
+
|
||
|
|
void EnabledAudioTracksChanged(
|
||
|
|
const WebVector<WebMediaPlayer::TrackId>& enabledTrackIds) override;
|
||
|
|
void SelectedVideoTrackChanged(
|
||
|
|
--
|
||
|
|
2.25.1
|