Title: [173454] trunk
- Revision
- 173454
- Author
- [email protected]
- Date
- 2014-09-09 20:59:15 -0700 (Tue, 09 Sep 2014)
Log Message
[MSE] http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html failing after r173318
https://bugs.webkit.org/show_bug.cgi?id=136676
Reviewed by Eric Carlson.
Source/WebCore:
Revert the inadvertant conditional change introduced in r173318.
* Modules/mediasource/MediaSource.cpp:
(WebCore::MediaSource::setDurationInternal):
LayoutTests:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (173453 => 173454)
--- trunk/LayoutTests/ChangeLog 2014-09-10 00:05:36 UTC (rev 173453)
+++ trunk/LayoutTests/ChangeLog 2014-09-10 03:59:15 UTC (rev 173454)
@@ -1,3 +1,12 @@
+2014-09-09 Jer Noble <[email protected]>
+
+ [MSE] http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html failing after r173318
+ https://bugs.webkit.org/show_bug.cgi?id=136676
+
+ Reviewed by Eric Carlson.
+
+ * platform/mac/TestExpectations:
+
2014-09-09 Roger Fong <[email protected]>
Unskip two snapshotting tests that work for me consistently locally.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (173453 => 173454)
--- trunk/LayoutTests/platform/mac/TestExpectations 2014-09-10 00:05:36 UTC (rev 173453)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2014-09-10 03:59:15 UTC (rev 173454)
@@ -1402,6 +1402,3 @@
# Mac doesn't support YUV 420/422 colorspace
media/video-colorspace-yuv420.html [ Skip ]
media/video-colorspace-yuv422.html [ Skip ]
-
-webkit.org/b/136676 http/tests/media/media-source/mediasource-config-change-mp4-v-framerate.html [ Failure ]
-webkit.org/b/136676 http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html [ Failure ]
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (173453 => 173454)
--- trunk/Source/WebCore/ChangeLog 2014-09-10 00:05:36 UTC (rev 173453)
+++ trunk/Source/WebCore/ChangeLog 2014-09-10 03:59:15 UTC (rev 173454)
@@ -1,3 +1,15 @@
+2014-09-09 Jer Noble <[email protected]>
+
+ [MSE] http/tests/media/media-source/mediasource-config-change-mp4-v-bitrate.html failing after r173318
+ https://bugs.webkit.org/show_bug.cgi?id=136676
+
+ Reviewed by Eric Carlson.
+
+ Revert the inadvertant conditional change introduced in r173318.
+
+ * Modules/mediasource/MediaSource.cpp:
+ (WebCore::MediaSource::setDurationInternal):
+
2014-09-09 Roger Fong <[email protected]>
Unreviewed build fix for Windows.
Modified: trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp (173453 => 173454)
--- trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-09-10 00:05:36 UTC (rev 173453)
+++ trunk/Source/WebCore/Modules/mediasource/MediaSource.cpp 2014-09-10 03:59:15 UTC (rev 173454)
@@ -361,7 +361,7 @@
// 4. If the new duration is less than old duration, then call remove(new duration, old duration)
// on all objects in sourceBuffers.
- if (!oldDuration.isValid() && duration < oldDuration) {
+ if (oldDuration.isValid() && duration < oldDuration) {
for (auto& sourceBuffer : *m_sourceBuffers)
sourceBuffer->remove(duration, oldDuration, IGNORE_EXCEPTION);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
