Title: [172073] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172073
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 14:06:55 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r171937. <rdar://problem/17876699>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172072 => 172073)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:05:07 UTC (rev 172072)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 21:06:55 UTC (rev 172073)
@@ -1,5 +1,22 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r171937
+
+ 2014-08-01 Jer Noble <jer.no...@apple.com>
+
+ [MSE][Mac] Volume is not remembered between items in a YouTube playlist
+ https://bugs.webkit.org/show_bug.cgi?id=135479
+
+ Reviewed by Eric Carlson.
+
+ When an AVSampleBufferAudioRenderer is added to the player, set its -volume and -muted
+ properties with the current values from the HTMLMediaElement.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer):
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r171895
2014-07-31 Jer Noble <jer.no...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (172072 => 172073)
--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-08-05 21:05:07 UTC (rev 172072)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-08-05 21:06:55 UTC (rev 172073)
@@ -758,6 +758,10 @@
return;
m_sampleBufferAudioRenderers.append(audioRenderer);
+
+ [audioRenderer setMuted:m_player->muted()];
+ [audioRenderer setVolume:m_player->volume()];
+
[m_synchronizer addRenderer:audioRenderer];
m_player->mediaPlayerClient()->mediaPlayerRenderingModeChanged(m_player);
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
