Title: [206037] trunk
- Revision
- 206037
- Author
- jer.no...@apple.com
- Date
- 2016-09-16 12:25:29 -0700 (Fri, 16 Sep 2016)
Log Message
[media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
https://bugs.webkit.org/show_bug.cgi?id=162052
Reviewed by Brent Fulgham.
Source/WebCore:
Fixes tests: imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-video-bitrate.html
The above tests would throw an assertion while trying to invert a range with an invalid end time. Check the
validity of trackBuffer.lastEnqueuedPresentationTime before comparing it and assigning it to a range.
* Modules/mediasource/SourceBuffer.cpp:
(WebCore::SourceBuffer::removeCodedFrames):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (206036 => 206037)
--- trunk/LayoutTests/ChangeLog 2016-09-16 18:59:01 UTC (rev 206036)
+++ trunk/LayoutTests/ChangeLog 2016-09-16 19:25:29 UTC (rev 206037)
@@ -1,3 +1,12 @@
+2016-09-16 Jer Noble <jer.no...@apple.com>
+
+ [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
+ https://bugs.webkit.org/show_bug.cgi?id=162052
+
+ Reviewed by Brent Fulgham.
+
+ * platform/mac/TestExpectations:
+
2016-09-14 Jer Noble <jer.no...@apple.com>
[media-source] fix imported/w3c/web-platform-tests/media-source/mediasource-duration.html
Modified: trunk/LayoutTests/platform/mac/TestExpectations (206036 => 206037)
--- trunk/LayoutTests/platform/mac/TestExpectations 2016-09-16 18:59:01 UTC (rev 206036)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-09-16 19:25:29 UTC (rev 206037)
@@ -1048,6 +1048,8 @@
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/SourceBuffer-abort.html [ Pass ]
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-addsourcebuffer.html [ Pass ]
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-closed.html [ Pass ]
+[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html [ Pass ]
+[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-video-bitrate.html [ Pass ]
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-v-bitrate.html [ Pass ]
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-duration.html [ Pass ]
[ Yosemite+ ] imported/w3c/web-platform-tests/media-source/mediasource-endofstream-invaliderror.html [ Pass ]
Modified: trunk/Source/WebCore/ChangeLog (206036 => 206037)
--- trunk/Source/WebCore/ChangeLog 2016-09-16 18:59:01 UTC (rev 206036)
+++ trunk/Source/WebCore/ChangeLog 2016-09-16 19:25:29 UTC (rev 206037)
@@ -1,3 +1,19 @@
+2016-09-16 Jer Noble <jer.no...@apple.com>
+
+ [media-source] Fix imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
+ https://bugs.webkit.org/show_bug.cgi?id=162052
+
+ Reviewed by Brent Fulgham.
+
+ Fixes tests: imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-audio-bitrate.html
+ imported/w3c/web-platform-tests/media-source/mediasource-config-change-mp4-av-video-bitrate.html
+
+ The above tests would throw an assertion while trying to invert a range with an invalid end time. Check the
+ validity of trackBuffer.lastEnqueuedPresentationTime before comparing it and assigning it to a range.
+
+ * Modules/mediasource/SourceBuffer.cpp:
+ (WebCore::SourceBuffer::removeCodedFrames):
+
2016-09-16 Alex Christensen <achristen...@webkit.org>
URLParser should percent encode the user and password according to spec
Modified: trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp (206036 => 206037)
--- trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-09-16 18:59:01 UTC (rev 206036)
+++ trunk/Source/WebCore/Modules/mediasource/SourceBuffer.cpp 2016-09-16 19:25:29 UTC (rev 206037)
@@ -814,7 +814,7 @@
// Only force the TrackBuffer to re-enqueue if the removed ranges overlap with enqueued and possibly
// not yet displayed samples.
- if (currentMediaTime < trackBuffer.lastEnqueuedPresentationTime) {
+ if (trackBuffer.lastEnqueuedPresentationTime.isValid() && currentMediaTime < trackBuffer.lastEnqueuedPresentationTime) {
PlatformTimeRanges possiblyEnqueuedRanges(currentMediaTime, trackBuffer.lastEnqueuedPresentationTime);
possiblyEnqueuedRanges.intersectWith(erasedRanges);
if (possiblyEnqueuedRanges.length())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
