Changeset 258693 in webkit

Timestamp:

Mar 19, 2020 5:06:49 AM (4 years ago)

Author:

eocanha@igalia.com

Message:

[GTK] media/track/track-automatic-subtitles.html is timing out
​https://bugs.webkit.org/show_bug.cgi?id=116957

Reviewed by Adrian Perez de Castro.

Source/WebCore:

Moved CaptionUserPreferencesMediaAF::textTrackSelectionScore() implementation
to the CaptionUserPreferencesMedia superclass.

Tested by existing test.

• page/CaptionUserPreferences.cpp:

(WebCore::CaptionUserPreferences::textTrackSelectionScore const):

• page/CaptionUserPreferencesMediaAF.cpp:
• page/CaptionUserPreferencesMediaAF.h:

LayoutTests:

Removed test from expectations.

• platform/gtk/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/CaptionUserPreferences.cpp (modified) (2 diffs)
• Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (modified) (1 diff)
• Source/WebCore/page/CaptionUserPreferencesMediaAF.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-03-19  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GTK] media/track/track-automatic-subtitles.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=116957
+
+        Reviewed by Adrian Perez de Castro.
+
+        Removed test from expectations.
+
+        * platform/gtk/TestExpectations:
+
 2020-03-19  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -2914 +2914 @@
 webkit.org/b/108925 http/tests/media/video-play-stall.html [ Failure Timeout ]
 
-webkit.org/b/116957 media/track/track-automatic-subtitles.html [ Timeout ]
-
 webkit.org/b/147518 inspector/debugger/nested-inspectors.html [ Timeout ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-03-19  Enrique Ocaña González  <eocanha@igalia.com>
+
+        [GTK] media/track/track-automatic-subtitles.html is timing out
+        https://bugs.webkit.org/show_bug.cgi?id=116957
+
+        Reviewed by Adrian Perez de Castro.
+
+        Moved CaptionUserPreferencesMediaAF::textTrackSelectionScore() implementation
+        to the CaptionUserPreferencesMedia superclass.
+
+        Tested by existing test.
+
+        * page/CaptionUserPreferences.cpp:
+        (WebCore::CaptionUserPreferences::textTrackSelectionScore const):
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        * page/CaptionUserPreferencesMediaAF.h:
+
 2020-03-19  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/page/CaptionUserPreferences.cpp

@@ -31 +31 @@
 #include "AudioTrackList.h"
 #include "DOMWrapperWorld.h"
+#include "HTMLMediaElement.h"
 #include "LocalizedStrings.h"
 #include "MediaSelectionOption.h"
@@ -286 +287 @@
 }
 
-int CaptionUserPreferences::textTrackSelectionScore(TextTrack* track, HTMLMediaElement*) const
-{
-    if (track->kind() != TextTrack::Kind::Captions && track->kind() != TextTrack::Kind::Subtitles)
-        return 0;
-    
-    if (!userPrefersSubtitles() && !userPrefersCaptions())
-        return 0;
-    
-    return textTrackLanguageSelectionScore(track, preferredLanguages()) + 1;
+int CaptionUserPreferences::textTrackSelectionScore(TextTrack* track, HTMLMediaElement* mediaElement) const
+{
+    CaptionDisplayMode displayMode = captionDisplayMode();
+    if (displayMode == Manual)
+        return 0;
+
+    bool legacyOverride = mediaElement->webkitClosedCaptionsVisible();
+    if (displayMode == AlwaysOn && (!userPrefersSubtitles() && !userPrefersCaptions() && !legacyOverride))
+        return 0;
+    if (track->kind() != TextTrack::Kind::Captions && track->kind() != TextTrack::Kind::Subtitles && track->kind() != TextTrack::Kind::Forced)
+        return 0;
+    if (!track->isMainProgramContent())
+        return 0;
+
+    bool trackHasOnlyForcedSubtitles = track->containsOnlyForcedSubtitles();
+    if (!legacyOverride && ((trackHasOnlyForcedSubtitles && displayMode != ForcedOnly) || (!trackHasOnlyForcedSubtitles && displayMode == ForcedOnly)))
+        return 0;
+
+    Vector<String> userPreferredCaptionLanguages = preferredLanguages();
+
+    if ((displayMode == Automatic && !legacyOverride) || trackHasOnlyForcedSubtitles) {
+
+        if (!mediaElement || !mediaElement->player())
+            return 0;
+
+        String textTrackLanguage = track->validBCP47Language();
+        if (textTrackLanguage.isEmpty())
+            return 0;
+
+        Vector<String> languageList;
+        languageList.reserveCapacity(1);
+
+        String audioTrackLanguage;
+        if (testingMode())
+            audioTrackLanguage = primaryAudioTrackLanguageOverride();
+        else
+            audioTrackLanguage = mediaElement->player()->languageOfPrimaryAudioTrack();
+
+        if (audioTrackLanguage.isEmpty())
+            return 0;
+
+        bool exactMatch;
+        if (trackHasOnlyForcedSubtitles) {
+            languageList.append(audioTrackLanguage);
+            size_t offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList, exactMatch);
+
+            // Only consider a forced-only track if it IS in the same language as the primary audio track.
+            if (offset)
+                return 0;
+        } else {
+            languageList.append(defaultLanguage());
+
+            // Only enable a text track if the current audio track is NOT in the user's preferred language ...
+            size_t offset = indexOfBestMatchingLanguageInList(audioTrackLanguage, languageList, exactMatch);
+            if (!offset)
+                return 0;
+
+            // and the text track matches the user's preferred language.
+            offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList, exactMatch);
+            if (offset)
+                return 0;
+        }
+
+        userPreferredCaptionLanguages = languageList;
+    }
+
+    int trackScore = 0;
+
+    if (userPrefersCaptions()) {
+        // When the user prefers accessibility tracks, rank is SDH, then CC, then subtitles.
+        if (track->kind() == TextTrack::Kind::Subtitles)
+            trackScore = 1;
+        else if (track->isClosedCaptions())
+            trackScore = 2;
+        else
+            trackScore = 3;
+    } else {
+        // When the user prefers translation tracks, rank is subtitles, then SDH, then CC tracks.
+        if (track->kind() == TextTrack::Kind::Subtitles)
+            trackScore = 3;
+        else if (!track->isClosedCaptions())
+            trackScore = 2;
+        else
+            trackScore = 1;
+    }
+
+    return trackScore + textTrackLanguageSelectionScore(track, userPreferredCaptionLanguages);
 }
 

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp

@@ -720 +720 @@
 }
 
-int CaptionUserPreferencesMediaAF::textTrackSelectionScore(TextTrack* track, HTMLMediaElement* mediaElement) const
-{
-    CaptionDisplayMode displayMode = captionDisplayMode();
-    if (displayMode == Manual)
-        return 0;
-
-    bool legacyOverride = mediaElement->webkitClosedCaptionsVisible();
-    if (displayMode == AlwaysOn && (!userPrefersSubtitles() && !userPrefersCaptions() && !legacyOverride))
-        return 0;
-    if (track->kind() != TextTrack::Kind::Captions && track->kind() != TextTrack::Kind::Subtitles && track->kind() != TextTrack::Kind::Forced)
-        return 0;
-    if (!track->isMainProgramContent())
-        return 0;
-
-    bool trackHasOnlyForcedSubtitles = track->containsOnlyForcedSubtitles();
-    if (!legacyOverride && ((trackHasOnlyForcedSubtitles && displayMode != ForcedOnly) || (!trackHasOnlyForcedSubtitles && displayMode == ForcedOnly)))
-        return 0;
-
-    Vector<String> userPreferredCaptionLanguages = preferredLanguages();
-
-    if ((displayMode == Automatic && !legacyOverride) || trackHasOnlyForcedSubtitles) {
-
-        if (!mediaElement || !mediaElement->player())
-            return 0;
-
-        String textTrackLanguage = track->validBCP47Language();
-        if (textTrackLanguage.isEmpty())
-            return 0;
-
-        Vector<String> languageList;
-        languageList.reserveCapacity(1);
-
-        String audioTrackLanguage;
-        if (testingMode())
-            audioTrackLanguage = primaryAudioTrackLanguageOverride();
-        else
-            audioTrackLanguage = mediaElement->player()->languageOfPrimaryAudioTrack();
-
-        if (audioTrackLanguage.isEmpty())
-            return 0;
-
-        bool exactMatch;
-        if (trackHasOnlyForcedSubtitles) {
-            languageList.append(audioTrackLanguage);
-            size_t offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList, exactMatch);
-
-            // Only consider a forced-only track if it IS in the same language as the primary audio track.
-            if (offset)
-                return 0;
-        } else {
-            languageList.append(defaultLanguage());
-
-            // Only enable a text track if the current audio track is NOT in the user's preferred language ...
-            size_t offset = indexOfBestMatchingLanguageInList(audioTrackLanguage, languageList, exactMatch);
-            if (!offset)
-                return 0;
-
-            // and the text track matches the user's preferred language.
-            offset = indexOfBestMatchingLanguageInList(textTrackLanguage, languageList, exactMatch);
-            if (offset)
-                return 0;
-        }
-
-        userPreferredCaptionLanguages = languageList;
-    }
-
-    int trackScore = 0;
-
-    if (userPrefersCaptions()) {
-        // When the user prefers accessibility tracks, rank is SDH, then CC, then subtitles.
-        if (track->kind() == TextTrack::Kind::Subtitles)
-            trackScore = 1;
-        else if (track->isClosedCaptions())
-            trackScore = 2;
-        else
-            trackScore = 3;
-    } else {
-        // When the user prefers translation tracks, rank is subtitles, then SDH, then CC tracks.
-        if (track->kind() == TextTrack::Kind::Subtitles)
-            trackScore = 3;
-        else if (!track->isClosedCaptions())
-            trackScore = 2;
-        else
-            trackScore = 1;
-    }
-
-    return trackScore + textTrackLanguageSelectionScore(track, userPreferredCaptionLanguages);
-}
-
 static bool textTrackCompare(const RefPtr<TextTrack>& a, const RefPtr<TextTrack>& b)
 {

trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.h

@@ -66 +66 @@
 
     String captionsStyleSheetOverride() const override;
-    int textTrackSelectionScore(TextTrack*, HTMLMediaElement*) const override;
     Vector<RefPtr<AudioTrack>> sortedTrackListForMenu(AudioTrackList*) override;
     Vector<RefPtr<TextTrack>> sortedTrackListForMenu(TextTrackList*) override;