Changeset 179549 in webkit

Timestamp:

Feb 3, 2015 9:27:55 AM (9 years ago)

Author:

jer.noble@apple.com

Message:

[Mac] HLS audio is not correctly selected according to system language
​https://bugs.webkit.org/show_bug.cgi?id=140398
rdar://problem/19218487

Reviewed by Darin Adler.

Source/WebCore:

Test: http/tests/media/hls/hls-audio-tracks-locale-selection.html

When AVMediaSelectionOptions come and go and no explicit track selection choice has
been made, automatically pick the most appropriate track according to the user's
current preferred locale settings.

• platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
• platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:

(WebCore::MediaSelectionGroupAVFObjC::MediaSelectionGroupAVFObjC): Set m_shouldSelectOptionAutomatically

to true by default.

(WebCore::MediaSelectionGroupAVFObjC::updateOptions): If m_shouldSelectOptionAutomatically is set

pick the most appropriate media selection option.

(WebCore::MediaSelectionGroupAVFObjC::setSelectedOption): Set m_shouldSelectOptionAutomatically to false.

• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Remove these automatic selection

requests as they are ineffective when -appliesMediaSelectionCriteriaAutomatically is NO.

LayoutTests:

• http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt: Added.
• http/tests/media/hls/hls-audio-tracks-locale-selection.html: Added.
• http/tests/media/resources/hls/audio-tracks.m3u8:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt (added)
• LayoutTests/http/tests/media/hls/hls-audio-tracks-locale-selection.html (added)
• LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8 (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h (modified) (1 diff)
• Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm (modified) (5 diffs)
• Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-02-03  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] HLS audio is not correctly selected according to system language
+        https://bugs.webkit.org/show_bug.cgi?id=140398
+        rdar://problem/19218487
+
+        Reviewed by Darin Adler.
+
+        * http/tests/media/hls/hls-audio-tracks-locale-selection-expected.txt: Added.
+        * http/tests/media/hls/hls-audio-tracks-locale-selection.html: Added.
+        * http/tests/media/resources/hls/audio-tracks.m3u8:
+
 2015-02-03  Piotr Krysiewicz  <p.krysiewicz@samsung.com>
 

trunk/LayoutTests/http/tests/media/resources/hls/audio-tracks.m3u8

@@ -1 +1 @@
 #EXTM3U
 
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="eng",NAME="English Sound",AUTOSELECT=YES,DEFAULT=YES
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="fre",NAME="French Sound",AUTOSELECT=NO,DEFAULT=NO,URI="french/prog_index.m3u8"
-#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="spa",NAME="Spanish Sound",AUTOSELECT=NO,DEFAULT=NO,URI="spanish/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="en-US",NAME="English Sound",AUTOSELECT=YES,DEFAULT=YES
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="fr-FR",NAME="French Sound",AUTOSELECT=NO,DEFAULT=NO,URI="french/prog_index.m3u8"
+#EXT-X-MEDIA:TYPE=AUDIO,GROUP-ID="bipbop_audio",LANGUAGE="es-US",NAME="Spanish Sound",AUTOSELECT=NO,DEFAULT=NO,URI="spanish/prog_index.m3u8"
 
 #EXT-X-STREAM-INF:BANDWIDTH=634451,CODECS="mp4a.40.2, avc1.4d401e",RESOLUTION=640x480,AUDIO="bipbop_audio"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-02-03  Jer Noble  <jer.noble@apple.com>
+
+        [Mac] HLS audio is not correctly selected according to system language
+        https://bugs.webkit.org/show_bug.cgi?id=140398
+        rdar://problem/19218487
+
+        Reviewed by Darin Adler.
+
+        Test: http/tests/media/hls/hls-audio-tracks-locale-selection.html
+
+        When AVMediaSelectionOptions come and go and no explicit track selection choice has
+        been made, automatically pick the most appropriate track according to the user's
+        current preferred locale settings.
+
+        * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h:
+        * platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm:
+        (WebCore::MediaSelectionGroupAVFObjC::MediaSelectionGroupAVFObjC): Set m_shouldSelectOptionAutomatically
+            to true by default.
+        (WebCore::MediaSelectionGroupAVFObjC::updateOptions): If m_shouldSelectOptionAutomatically is set
+            pick the most appropriate media selection option.
+        (WebCore::MediaSelectionGroupAVFObjC::setSelectedOption): Set m_shouldSelectOptionAutomatically to false.
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Remove these automatic selection
+            requests as they are ineffective when -appliesMediaSelectionCriteriaAutomatically is NO.
+
 2015-02-03  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.h

@@ -90 +90 @@
     RetainPtr<AVMediaSelectionGroup> m_mediaSelectionGroup;
     OptionContainer m_options;
-    MediaSelectionOptionAVFObjC* m_selectedOption;
+    MediaSelectionOptionAVFObjC* m_selectedOption { nullptr };
     Timer m_selectionTimer;
+    bool m_shouldSelectOptionAutomatically { true };
 };
 

trunk/Source/WebCore/platform/graphics/avfoundation/MediaSelectionGroupAVFObjC.mm

@@ -29 +29 @@
 #if ENABLE(VIDEO_TRACK)
 
+#import "Language.h"
 #import "SoftLinking.h"
 #import <AVFoundation/AVAsset.h>
@@ -36 +37 @@
 #import <wtf/HashMap.h>
 #import <wtf/HashSet.h>
+#import <wtf/text/WTFString.h>
 
 SOFT_LINK_FRAMEWORK_OPTIONAL(AVFoundation)
@@ -89 +91 @@
     : m_playerItem(item)
     , m_mediaSelectionGroup(group)
-    , m_selectedOption(nullptr)
     , m_selectionTimer(*this, &MediaSelectionGroupAVFObjC::selectionTimerFired)
 {
@@ -129 +130 @@
         m_options.set(addedAVOption, addedOption.release());
     }
+
+    if (!m_shouldSelectOptionAutomatically)
+        return;
+
+    RetainPtr<NSMutableArray> nsLanguages = adoptNS([[NSMutableArray alloc] initWithCapacity:userPreferredLanguages().size()]);
+    for (auto& language : userPreferredLanguages())
+        [nsLanguages addObject:(NSString*)language];
+    NSArray* filteredOptions = [getAVMediaSelectionGroupClass() mediaSelectionOptionsFromArray:[m_mediaSelectionGroup options] filteredAndSortedAccordingToPreferredLanguages:nsLanguages.get()];
+
+    if (![filteredOptions count])
+        return;
+
+    AVMediaSelectionOption* preferredOption = [filteredOptions objectAtIndex:0];
+    if (m_selectedOption && m_selectedOption->avMediaSelectionOption() == preferredOption)
+        return;
+
+    ASSERT(m_options.contains(preferredOption));
+    m_selectedOption = m_options.get(preferredOption);
+    m_selectionTimer.startOneShot(0);
 }
 
@@ -136 +156 @@
         return;
 
+    m_shouldSelectOptionAutomatically = false;
     m_selectedOption = option;
     if (m_selectionTimer.isActive())

trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

@@ -936 +936 @@
 #endif
 
-#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
-        [m_avPlayerItem selectMediaOptionAutomaticallyInMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
-        [m_avPlayerItem selectMediaOptionAutomaticallyInMediaSelectionGroup:safeMediaSelectionGroupForAudibleMedia()];
-        [m_avPlayerItem selectMediaOptionAutomaticallyInMediaSelectionGroup:safeMediaSelectionGroupForVisualMedia()];
-#endif
-
 #if ENABLE(WEB_AUDIO) && USE(MEDIATOOLBOX)
     if (m_provider)