Changeset 260380 in webkit

Timestamp:

Apr 20, 2020 11:16:57 AM (4 years ago)

Author:

youenn@apple.com

Message:

MediaPlayerPrivateMediaStreamAVFObjC should start play a newly added audio track if it is playing
​https://bugs.webkit.org/show_bug.cgi?id=210740

Reviewed by Eric Carlson.

Source/WebCore:

Before the patch, MediaPlayerPrivateMediaStreamAVFObjC was not calling play on the audio renderer when the audio renderer
was added after the MediaPlayerPrivateMediaStreamAVFObjC was asked to play.
This patch makes it so that, on configuration of an audio track, it will be asked to play if its MediaPlayerPrivateMediaStreamAVFObjC is playing.
Add internals API to be able to write a test.

Test: fast/mediastream/play-newly-added-audio-track.html

• html/track/AudioTrack.h:
• html/track/AudioTrack.idl:
• platform/graphics/AudioTrackPrivate.h:

(WebCore::AudioTrackPrivate::isBackedByMediaStreamTrack const):

• platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:

(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):

• platform/mediastream/AudioTrackPrivateMediaStream.cpp:

(WebCore::AudioTrackPrivateMediaStream::play):

• platform/mediastream/AudioTrackPrivateMediaStream.h:

(isType):

• testing/Internals.cpp:

(WebCore::Internals::isMockRealtimeMediaSourceCenterEnabled):
(WebCore::Internals::shouldAudioTrackPlay):

• testing/Internals.h:
• testing/Internals.idl:

LayoutTests:

• fast/mediastream/play-newly-added-audio-track-expected.txt: Added.
• fast/mediastream/play-newly-added-audio-track.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/play-newly-added-audio-track-expected.txt (added)
• LayoutTests/fast/mediastream/play-newly-added-audio-track.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/track/AudioTrack.h (modified) (1 diff)
• Source/WebCore/html/track/AudioTrack.idl (modified) (1 diff)
• Source/WebCore/platform/graphics/AudioTrackPrivate.h (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (modified) (1 diff)
• Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.cpp (modified) (1 diff)
• Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h (modified) (3 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (2 diffs)
• Source/WebCore/testing/Internals.h (modified) (2 diffs)
• Source/WebCore/testing/Internals.idl (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-04-20  Youenn Fablet  <youenn@apple.com>
+
+        MediaPlayerPrivateMediaStreamAVFObjC should start play a newly added audio track if it is playing
+        https://bugs.webkit.org/show_bug.cgi?id=210740
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/play-newly-added-audio-track-expected.txt: Added.
+        * fast/mediastream/play-newly-added-audio-track.html: Added.
+
 2020-04-20  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-04-20  Youenn Fablet  <youenn@apple.com>
+
+        MediaPlayerPrivateMediaStreamAVFObjC should start play a newly added audio track if it is playing
+        https://bugs.webkit.org/show_bug.cgi?id=210740
+
+        Reviewed by Eric Carlson.
+
+        Before the patch, MediaPlayerPrivateMediaStreamAVFObjC was not calling play on the audio renderer when the audio renderer
+        was added after the MediaPlayerPrivateMediaStreamAVFObjC was asked to play.
+        This patch makes it so that, on configuration of an audio track, it will be asked to play if its MediaPlayerPrivateMediaStreamAVFObjC is playing.
+        Add internals API to be able to write a test.
+
+        Test: fast/mediastream/play-newly-added-audio-track.html
+
+        * html/track/AudioTrack.h:
+        * html/track/AudioTrack.idl:
+        * platform/graphics/AudioTrackPrivate.h:
+        (WebCore::AudioTrackPrivate::isBackedByMediaStreamTrack const):
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+        (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::updateTracks):
+        * platform/mediastream/AudioTrackPrivateMediaStream.cpp:
+        (WebCore::AudioTrackPrivateMediaStream::play):
+        * platform/mediastream/AudioTrackPrivateMediaStream.h:
+        (isType):
+        * testing/Internals.cpp:
+        (WebCore::Internals::isMockRealtimeMediaSourceCenterEnabled):
+        (WebCore::Internals::shouldAudioTrackPlay):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
 2020-04-20  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/html/track/AudioTrack.h

@@ -65 +65 @@
     size_t inbandTrackIndex() const;
 
+    const AudioTrackPrivate& privateTrack() const { return m_private; }
     void setPrivate(AudioTrackPrivate&);
+
     void setMediaElement(WeakPtr<HTMLMediaElement>) override;
 #if !RELEASE_LOG_DISABLED

trunk/Source/WebCore/html/track/AudioTrack.idl

@@ -26 +26 @@
 [
     Conditional=VIDEO_TRACK,
+    ExportMacro=WEBCORE_EXPORT,
     GenerateIsReachable=ImplElementRoot,
     JSCustomMarkFunction

trunk/Source/WebCore/platform/graphics/AudioTrackPrivate.h

@@ -63 +63 @@
     virtual Kind kind() const { return None; }
 
+    virtual bool isBackedByMediaStreamTrack() const { return false; }
+
 #if !RELEASE_LOG_DISABLED
     const char* logClassName() const override { return "AudioTrackPrivate"; }

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm

@@ -896 +896 @@
         case TrackState::Configure:
             track.setTrackIndex(index);
-            bool enabled = track.streamTrack().enabled() && !track.streamTrack().muted();
-            track.setEnabled(enabled);
+            track.setVolume(m_volume);
+            track.setMuted(m_muted);
+            track.setEnabled(track.streamTrack().enabled() && !track.streamTrack().muted());
+            if (playing())
+                track.play();
             break;
         }

trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.cpp

@@ -73 +73 @@
 void AudioTrackPrivateMediaStream::play()
 {
+    if (m_shouldPlay)
+        return;
+
     m_shouldPlay = true;
     updateRenderer();

trunk/Source/WebCore/platform/mediastream/AudioTrackPrivateMediaStream.h

@@ -55 +55 @@
     void play();
     void pause();
-    bool isPlaying() { return m_isPlaying; }
+    bool isPlaying() const { return m_isPlaying; }
+    bool shouldPlay() const { return m_shouldPlay; }
 
     void setVolume(float);
@@ -76 +77 @@
     AtomString label() const final { return m_label; }
     int trackIndex() const final { return m_index; }
+    bool isBackedByMediaStreamTrack() const final { return true; }
 
     // MediaStreamTrackPrivate::Observer
@@ -108 +110 @@
 }
 
+SPECIALIZE_TYPE_TRAITS_BEGIN(WebCore::AudioTrackPrivateMediaStream)
+    static bool isType(const WebCore::AudioTrackPrivate& track) { return track.isBackedByMediaStreamTrack(); }
+SPECIALIZE_TYPE_TRAITS_END()
+
 #endif // ENABLE(VIDEO_TRACK) && ENABLE(MEDIA_STREAM)

trunk/Source/WebCore/testing/Internals.cpp

@@ -33 +33 @@
 #include "ApplicationCacheStorage.h"
 #include "AudioSession.h"
+#include "AudioTrackPrivateMediaStream.h"
 #include "Autofill.h"
 #include "BackForwardCache.h"
@@ -5077 +5078 @@
     return MockRealtimeMediaSourceCenter::mockRealtimeMediaSourceCenterEnabled();
 }
+
+bool Internals::shouldAudioTrackPlay(const AudioTrack& track)
+{
+    if (!is<AudioTrackPrivateMediaStream>(track.privateTrack()))
+        return false;
+    return downcast<AudioTrackPrivateMediaStream>(track.privateTrack()).shouldPlay();
+}
 #endif
 

trunk/Source/WebCore/testing/Internals.h

@@ -53 +53 @@
 class AnimationTimeline;
 class AudioContext;
+class AudioTrack;
 class CacheStorageConnection;
 class DOMRect;
@@ -765 +766 @@
     void setMediaStreamSourceInterrupted(MediaStreamTrack&, bool);
     bool isMockRealtimeMediaSourceCenterEnabled();
+    bool shouldAudioTrackPlay(const AudioTrack&);
 #endif
 

trunk/Source/WebCore/testing/Internals.idl

@@ -778 +778 @@
     [Conditional=MEDIA_STREAM] void setMediaStreamSourceInterrupted(MediaStreamTrack track, boolean interrupted);
     [Conditional=MEDIA_STREAM] boolean isMockRealtimeMediaSourceCenterEnabled();
+    [Conditional=MEDIA_STREAM] boolean shouldAudioTrackPlay(AudioTrack track);
 
     unsigned long long documentIdentifier(Document document);