Title: [265628] branches/safari-610.1-branch/Source/WebCore
- Revision
- 265628
- Author
- [email protected]
- Date
- 2020-08-13 15:20:02 -0700 (Thu, 13 Aug 2020)
Log Message
Cherry-pick r265244. rdar://problem/66945503
Remove AudioSampleDataSource::setPaused
https://bugs.webkit.org/show_bug.cgi?id=215125
Reviewed by Geoffrey Garen.
m_paused is unused except for setting m_transitioningFromPaused.
setPaused is only used in AudioMediaStreamTrackRenderCocoa at creation of the source.
We can remove the call for setPaused(true) and remove setPaused/m_paused.
* platform/audio/mac/AudioSampleDataSource.h:
* platform/audio/mac/AudioSampleDataSource.mm:
(WebCore::AudioSampleDataSource::setPaused): Deleted.
* platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp:
(WebCore::AudioMediaStreamTrackRendererCocoa::pushSamples):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1-branch/Source/WebCore/ChangeLog (265627 => 265628)
--- branches/safari-610.1-branch/Source/WebCore/ChangeLog 2020-08-13 22:19:59 UTC (rev 265627)
+++ branches/safari-610.1-branch/Source/WebCore/ChangeLog 2020-08-13 22:20:02 UTC (rev 265628)
@@ -1,3 +1,42 @@
+2020-08-13 Russell Epstein <[email protected]>
+
+ Cherry-pick r265244. rdar://problem/66945503
+
+ Remove AudioSampleDataSource::setPaused
+ https://bugs.webkit.org/show_bug.cgi?id=215125
+
+ Reviewed by Geoffrey Garen.
+
+ m_paused is unused except for setting m_transitioningFromPaused.
+ setPaused is only used in AudioMediaStreamTrackRenderCocoa at creation of the source.
+ We can remove the call for setPaused(true) and remove setPaused/m_paused.
+
+ * platform/audio/mac/AudioSampleDataSource.h:
+ * platform/audio/mac/AudioSampleDataSource.mm:
+ (WebCore::AudioSampleDataSource::setPaused): Deleted.
+ * platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp:
+ (WebCore::AudioMediaStreamTrackRendererCocoa::pushSamples):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265244 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-08-04 Youenn Fablet <[email protected]>
+
+ Remove AudioSampleDataSource::setPaused
+ https://bugs.webkit.org/show_bug.cgi?id=215125
+
+ Reviewed by Geoffrey Garen.
+
+ m_paused is unused except for setting m_transitioningFromPaused.
+ setPaused is only used in AudioMediaStreamTrackRenderCocoa at creation of the source.
+ We can remove the call for setPaused(true) and remove setPaused/m_paused.
+
+ * platform/audio/mac/AudioSampleDataSource.h:
+ * platform/audio/mac/AudioSampleDataSource.mm:
+ (WebCore::AudioSampleDataSource::setPaused): Deleted.
+ * platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp:
+ (WebCore::AudioMediaStreamTrackRendererCocoa::pushSamples):
+
2020-08-12 Alan Coon <[email protected]>
Cherry-pick r265480. rdar://problem/66943866
Modified: branches/safari-610.1-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h (265627 => 265628)
--- branches/safari-610.1-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h 2020-08-13 22:19:59 UTC (rev 265627)
+++ branches/safari-610.1-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.h 2020-08-13 22:20:02 UTC (rev 265628)
@@ -65,8 +65,6 @@
bool pullAvalaibleSamplesAsChunks(AudioBufferList&, size_t frameCount, uint64_t timeStamp, Function<void()>&&);
- void setPaused(bool);
-
void setVolume(float volume) { m_volume = volume; }
float volume() const { return m_volume; }
@@ -115,7 +113,6 @@
float m_volume { 1.0 };
bool m_muted { false };
- bool m_paused { true };
bool m_transitioningFromPaused { true };
#if !RELEASE_LOG_DISABLED
Modified: branches/safari-610.1-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm (265627 => 265628)
--- branches/safari-610.1-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm 2020-08-13 22:19:59 UTC (rev 265627)
+++ branches/safari-610.1-branch/Source/WebCore/platform/audio/mac/AudioSampleDataSource.mm 2020-08-13 22:20:02 UTC (rev 265628)
@@ -75,15 +75,6 @@
}
}
-void AudioSampleDataSource::setPaused(bool paused)
-{
- if (paused == m_paused)
- return;
-
- m_transitioningFromPaused = m_paused;
- m_paused = paused;
-}
-
OSStatus AudioSampleDataSource::setupConverter()
{
ASSERT(m_inputDescription && m_outputDescription);
Modified: branches/safari-610.1-branch/Source/WebCore/platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp (265627 => 265628)
--- branches/safari-610.1-branch/Source/WebCore/platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp 2020-08-13 22:19:59 UTC (rev 265627)
+++ branches/safari-610.1-branch/Source/WebCore/platform/mediastream/mac/AudioMediaStreamTrackRendererCocoa.cpp 2020-08-13 22:20:02 UTC (rev 265628)
@@ -91,7 +91,6 @@
if (oldSource)
AudioMediaStreamTrackRendererUnit::singleton().removeSource(*oldSource);
- newSource->setPaused(false);
newSource->setVolume(volume());
AudioMediaStreamTrackRendererUnit::singleton().addSource(WTFMove(newSource));
});
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
