- Revision
- 278860
- Author
- dp...@igalia.com
- Date
- 2021-06-14 22:26:56 -0700 (Mon, 14 Jun 2021)
Log Message
[GStreamer] media/track/audio/audio-track-mkv-vorbis-language.html and media/track/video/video-track-mkv-theora-language.html are failing
https://bugs.webkit.org/show_bug.cgi?id=226864
Reviewed by Eric Carlson.
These tests were failing due to an apparently incorrect order of
languages in audio and video tracks.
Examining the video container with tools like mediasource or VLC shows
that the order expected by GStreamer ports is correct. To make these
tests pass I changed the tests to make them language order independent
by fetching audio or video tracks by id.
* media/in-band-tracks.js:
(canplaythrough):
(testAttribute): values' can be also an Object. In that case, fetch tracks by 'id'.
* media/track/audio/audio-track-mkv-vorbis-language-expected.txt: Updated.
* media/track/audio/audio-track-mkv-vorbis-language.html: Pass language expected results as a map indexed by track id.
* media/track/video/video-track-mkv-theora-language-expected.txt: Updated.
* media/track/video/video-track-mkv-theora-language.html: Pass language expected results as a map indexed by track id.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (278859 => 278860)
--- trunk/LayoutTests/ChangeLog 2021-06-15 04:45:09 UTC (rev 278859)
+++ trunk/LayoutTests/ChangeLog 2021-06-15 05:26:56 UTC (rev 278860)
@@ -1,3 +1,26 @@
+2021-06-14 Diego Pino Garcia <dp...@igalia.com>
+
+ [GStreamer] media/track/audio/audio-track-mkv-vorbis-language.html and media/track/video/video-track-mkv-theora-language.html are failing
+ https://bugs.webkit.org/show_bug.cgi?id=226864
+
+ Reviewed by Eric Carlson.
+
+ These tests were failing due to an apparently incorrect order of
+ languages in audio and video tracks.
+
+ Examining the video container with tools like mediasource or VLC shows
+ that the order expected by GStreamer ports is correct. To make these
+ tests pass I changed the tests to make them language order independent
+ by fetching audio or video tracks by id.
+
+ * media/in-band-tracks.js:
+ (canplaythrough):
+ (testAttribute): values' can be also an Object. In that case, fetch tracks by 'id'.
+ * media/track/audio/audio-track-mkv-vorbis-language-expected.txt: Updated.
+ * media/track/audio/audio-track-mkv-vorbis-language.html: Pass language expected results as a map indexed by track id.
+ * media/track/video/video-track-mkv-theora-language-expected.txt: Updated.
+ * media/track/video/video-track-mkv-theora-language.html: Pass language expected results as a map indexed by track id.
+
2021-06-14 Truitt Savell <tsav...@apple.com>
Unreviewed, reverting r278842.
Modified: trunk/LayoutTests/media/in-band-tracks.js (278859 => 278860)
--- trunk/LayoutTests/media/in-band-tracks.js 2021-06-15 04:45:09 UTC (rev 278859)
+++ trunk/LayoutTests/media/in-band-tracks.js 2021-06-15 05:26:56 UTC (rev 278860)
@@ -47,10 +47,17 @@
function canplaythrough()
{
consoleWrite("<br><i>** Check in-band kind attributes</i>");
- testExpected("video." + type +"Tracks.length", values.length);
- for (var i = 0; i < values.length; ++i)
- testExpected("video." + type +"Tracks[" + i + "]." + attribute, values[i]);
+ if (values instanceof Array) {
+ testExpected(`video.${type}Tracks.length`, values.length);
+ for (let i = 0; i < values.length; ++i)
+ testExpected(`video.${type}Tracks[${i}].${attribute}`, values[i]);
+ } else {
+ testExpected(`video.${type}Tracks.length`, Object.keys(values).length);
+ for (let id in values)
+ testExpected(`video.${type}Tracks.getTrackById('${id}').${attribute}`, values[id]);
+ }
+
consoleWrite("");
endTest();
}
Modified: trunk/LayoutTests/media/track/audio/audio-track-mkv-vorbis-language-expected.txt (278859 => 278860)
--- trunk/LayoutTests/media/track/audio/audio-track-mkv-vorbis-language-expected.txt 2021-06-15 04:45:09 UTC (rev 278859)
+++ trunk/LayoutTests/media/track/audio/audio-track-mkv-vorbis-language-expected.txt 2021-06-15 05:26:56 UTC (rev 278860)
@@ -5,8 +5,8 @@
** Check in-band kind attributes
EXPECTED (video.audioTracks.length == '2') OK
-EXPECTED (video.audioTracks[0].language == 'la') OK
-EXPECTED (video.audioTracks[1].language == 'en') OK
+EXPECTED (video.audioTracks.getTrackById('A0').language == 'en') OK
+EXPECTED (video.audioTracks.getTrackById('A1').language == 'la') OK
END OF TEST
Modified: trunk/LayoutTests/media/track/audio/audio-track-mkv-vorbis-language.html (278859 => 278860)
--- trunk/LayoutTests/media/track/audio/audio-track-mkv-vorbis-language.html 2021-06-15 04:45:09 UTC (rev 278859)
+++ trunk/LayoutTests/media/track/audio/audio-track-mkv-vorbis-language.html 2021-06-15 05:26:56 UTC (rev 278860)
@@ -7,7 +7,7 @@
<script src=""
<script src=""
</head>
- <body _onload_="testAttribute('../../content/two-audio-and-video-tracks.mkv', 'audio', 'language', ['la', 'en'])">
+ <body _onload_="testAttribute('../../content/two-audio-and-video-tracks.mkv', 'audio', 'language', {'A0': 'en', 'A1': 'la'})">
<video controls></video>
<p>Check audio tracks' language attributes.</p>
</body>
Modified: trunk/LayoutTests/media/track/video/video-track-mkv-theora-language-expected.txt (278859 => 278860)
--- trunk/LayoutTests/media/track/video/video-track-mkv-theora-language-expected.txt 2021-06-15 04:45:09 UTC (rev 278859)
+++ trunk/LayoutTests/media/track/video/video-track-mkv-theora-language-expected.txt 2021-06-15 05:26:56 UTC (rev 278860)
@@ -5,8 +5,8 @@
** Check in-band kind attributes
EXPECTED (video.videoTracks.length == '2') OK
-EXPECTED (video.videoTracks[0].language == 'ru') OK
-EXPECTED (video.videoTracks[1].language == 'zh') OK
+EXPECTED (video.videoTracks.getTrackById('V0').language == 'zh') OK
+EXPECTED (video.videoTracks.getTrackById('V1').language == 'ru') OK
END OF TEST
Modified: trunk/LayoutTests/media/track/video/video-track-mkv-theora-language.html (278859 => 278860)
--- trunk/LayoutTests/media/track/video/video-track-mkv-theora-language.html 2021-06-15 04:45:09 UTC (rev 278859)
+++ trunk/LayoutTests/media/track/video/video-track-mkv-theora-language.html 2021-06-15 05:26:56 UTC (rev 278860)
@@ -7,7 +7,7 @@
<script src=""
<script src=""
</head>
- <body _onload_="testAttribute('../../content/two-audio-and-video-tracks.mkv', 'video', 'language', ['ru', 'zh'])">
+ <body _onload_="testAttribute('../../content/two-audio-and-video-tracks.mkv', 'video', 'language', {'V0':'zh', 'V1':'ru'})">
<video controls></video>
<p>Check video tracks' language attributes.</p>
</body>
