Changeset 148140 in webkit

Timestamp:

Apr 10, 2013 2:53:28 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

[Mac] in-band tracks sometimes not recognized
​https://bugs.webkit.org/show_bug.cgi?id=114380

Reviewed by Jer Noble.

No new tests, covered by existing in-band tests.

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

(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Don't call selectMediaOption,

availableMediaCharacteristicsWithMediaSelectionOptions is unlikely to be loaded at this time.

(WebCore::MediaPlayerPrivateAVFoundationObjC::processTextTracks): Disable automatic text track

selection.

(WebCore::assetMetadataKeyNames): Watch for the status of availableMediaCharacteristicsWithMediaSelectionOptions

to change.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-10  Eric Carlson  <eric.carlson@apple.com>
+
+        [Mac] in-band tracks sometimes not recognized
+        https://bugs.webkit.org/show_bug.cgi?id=114380
+
+        Reviewed by Jer Noble.
+
+        No new tests, covered by existing in-band tests.
+
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerItem): Don't call selectMediaOption,
+            availableMediaCharacteristicsWithMediaSelectionOptions is unlikely to be loaded at this time.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::processTextTracks): Disable automatic text track
+            selection.
+        (WebCore::assetMetadataKeyNames): Watch for the status of availableMediaCharacteristicsWithMediaSelectionOptions
+            to change.
+
 2013-04-10  Hans Muller  <hmuller@adobe.com>
 

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

@@ -465 +465 @@
     [m_legibleOutput.get() setSuppressesPlayerRendering:YES];
 
-    // We enabled automatic media selection because we want alternate audio tracks to be enabled/disabled automatically,
-    // but set the selected legible track to nil so text tracks will not be automatically configured.
-    [m_avPlayerItem.get() selectMediaOption:nil inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
-
     [m_legibleOutput.get() setDelegate:m_objcObserver.get() queue:dispatch_get_main_queue()];
     [m_legibleOutput.get() setAdvanceIntervalForDelegateInvocation:legibleOutputAdvanceInterval];
@@ -1315 +1311 @@
         return;
     }
-    
+
+    // We enabled automatic media selection because we want alternate audio tracks to be enabled/disabled automatically,
+    // but set the selected legible track to nil so text tracks will not be automatically configured.
+    if (!m_textTracks.size())
+        [m_avPlayerItem.get() selectMediaOption:nil inMediaSelectionGroup:safeMediaSelectionGroupForLegibleMedia()];
+
     Vector<RefPtr<InbandTextTrackPrivateAVF> > removedTextTracks = m_textTracks;
     NSArray *legibleOptions = [AVMediaSelectionGroup playableMediaSelectionOptionsFromArray:[legibleGroup options]];
@@ -1440 +1441 @@
                     @"playable",
                     @"tracks",
+                    @"availableMediaCharacteristicsWithMediaSelectionOptions",
                    nil];
     }