Changeset 258988 in webkit

Timestamp:

Mar 25, 2020 9:49:28 AM (4 years ago)

Author:

Russell Epstein

Message:

Apply patch. rdar://problem/60827023

Location:

branches/safari-609-branch/Source/WebCore/platform/mediastream/mac

Files:

• AudioTrackPrivateMediaStreamCocoa.cpp (modified) (4 diffs)
• AudioTrackPrivateMediaStreamCocoa.h (modified) (2 diffs)

branches/safari-609-branch/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp

@@ -62 +62 @@
         m_dataSource->setPaused(true);
 
+    m_isAudioUnitStarted = false;
+    m_isPlaying = false;
+
     if (m_remoteIOUnit) {
         AudioOutputUnitStop(m_remoteIOUnit);
@@ -85 +88 @@
     if (m_dataSource)
         m_dataSource->setPaused(false);
+
+    if (m_isCleared) {
+        streamTrack().source().addObserver(*this);
+        m_isCleared = false;
+    }
 }
 
@@ -98 +106 @@
     if (!m_isPlaying)
         return;
+
+    clear();
 
     m_isPlaying = false;
@@ -257 +267 @@
 }
 
+void AudioTrackPrivateMediaStreamCocoa::sourceMutedChanged()
+{
+    if (streamTrack().muted())
+        return;
+
+    if (!m_isPlaying)
+        return;
+
+    // If we we want to play and were muted, we restart from scratch by doing a pause/start.
+    pause();
+    play();
+}
+
 OSStatus AudioTrackPrivateMediaStreamCocoa::render(UInt32 sampleCount, AudioBufferList& ioData, UInt32 /*inBusNumber*/, const AudioTimeStamp& timeStamp, AudioUnitRenderActionFlags& actionFlags)
 {

branches/safari-609-branch/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.h

@@ -64 +64 @@
     // RealtimeMediaSource::Observer
     void sourceStopped() final;
+    void sourceMutedChanged() final;
     void audioSamplesAvailable(const MediaTime&, const PlatformAudioData&, const AudioStreamDescription&, size_t) final;
 
@@ -73 +74 @@
     void zeroBufferList(AudioBufferList&, size_t);
     void playInternal();
+    void stop();
 
 #if !RELEASE_LOG_DISABLED