Title: [172092] branches/safari-600.1-branch/Source/WebCore
- Revision
- 172092
- Author
- lforsch...@apple.com
- Date
- 2014-08-05 15:27:33 -0700 (Tue, 05 Aug 2014)
Log Message
Merged r172026. <rdar://problem/17810998>
Modified Paths
Diff
Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172091 => 172092)
--- branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 22:24:21 UTC (rev 172091)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog 2014-08-05 22:27:33 UTC (rev 172092)
@@ -1,5 +1,23 @@
2014-08-05 Lucas Forschler <lforsch...@apple.com>
+ Merge r172026
+
+ 2014-08-04 Jer Noble <jer.no...@apple.com>
+
+ [MSE][Mac] Seeking past buffered range will not resume playback when seek completes.
+ https://bugs.webkit.org/show_bug.cgi?id=135591
+
+ Reviewed by Eric Carlson.
+
+ If a seek is delayed due to seeking into an unbuffered area, playback will not be restarted
+ at that point. Instead, playback must resume when enough media data has been added, and
+ the MediaSource indicates the seek should complete.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaSourceAVFObjC::seekCompleted):
+
+2014-08-05 Lucas Forschler <lforsch...@apple.com>
+
Merge r172018
2014-08-04 Tim Horton <timothy_hor...@apple.com>
Modified: branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm (172091 => 172092)
--- branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-08-05 22:24:21 UTC (rev 172091)
+++ branches/safari-600.1-branch/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaSourceAVFObjC.mm 2014-08-05 22:27:33 UTC (rev 172092)
@@ -489,6 +489,8 @@
return;
LOG(MediaSource, "MediaPlayerPrivateMediaSourceAVFObjC::seekCompleted(%p)", this);
m_seekCompleted = true;
+ if (shouldBePlaying())
+ [m_synchronizer setRate:m_rate];
if (!m_seeking)
m_player->timeChanged();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
