Title: [217034] branches/safari-604.1.21-branch/Source/WebCore
- Revision
- 217034
- Author
- [email protected]
- Date
- 2017-05-17 22:35:59 -0700 (Wed, 17 May 2017)
Log Message
Cherry-pick r216954. rdar://problem/32233799
Modified Paths
Diff
Modified: branches/safari-604.1.21-branch/Source/WebCore/ChangeLog (217033 => 217034)
--- branches/safari-604.1.21-branch/Source/WebCore/ChangeLog 2017-05-18 05:35:56 UTC (rev 217033)
+++ branches/safari-604.1.21-branch/Source/WebCore/ChangeLog 2017-05-18 05:35:59 UTC (rev 217034)
@@ -1,5 +1,21 @@
2017-05-17 Jason Marcell <[email protected]>
+ Cherry-pick r216954. rdar://problem/32233799
+
+ 2017-05-16 Eric Carlson <[email protected]>
+
+ [MediaStream] AudioSampleBufferList::zeroABL takes byte count, not sample count
+ https://bugs.webkit.org/show_bug.cgi?id=172194
+ <rdar://problem/32233799>
+
+ Reviewed by Jer Noble.
+
+ * platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp:
+ (WebCore::AudioTrackPrivateMediaStreamCocoa::render): Pass number of bytes to zero,
+ not number of samples.
+
+2017-05-17 Jason Marcell <[email protected]>
+
Cherry-pick r216898. rdar://problem/32231650
2017-05-15 Youenn Fablet <[email protected]>
Modified: branches/safari-604.1.21-branch/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp (217033 => 217034)
--- branches/safari-604.1.21-branch/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp 2017-05-18 05:35:56 UTC (rev 217033)
+++ branches/safari-604.1.21-branch/Source/WebCore/platform/mediastream/mac/AudioTrackPrivateMediaStreamCocoa.cpp 2017-05-18 05:35:59 UTC (rev 217034)
@@ -226,7 +226,7 @@
Ref<AudioTrackPrivateMediaStreamCocoa> protectedThis { *this };
if (!m_isPlaying || m_muted || !m_dataSource || streamTrack().muted() || streamTrack().ended() || !streamTrack().enabled()) {
- AudioSampleBufferList::zeroABL(ioData, static_cast<size_t>(sampleCount));
+ AudioSampleBufferList::zeroABL(ioData, static_cast<size_t>(sampleCount * m_outputDescription->bytesPerFrame()));
actionFlags = kAudioUnitRenderAction_OutputIsSilence;
return 0;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
