Changeset 157982 in webkit

Timestamp:

Oct 24, 2013, 6:44:07 PM (13 years ago)

Author:

Lucas Forschler

Message:

Merged r154693. <rdar://problem/15109413>

Location:

branches/safari-537.73-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp (modified) (3 diffs)

branches/safari-537.73-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-24  Lucas Forschler  <lforschler@apple.com>
+
+        Merge r154693
+
+    2013-08-26  Brent Fulgham  <bfulgham@apple.com>
+
+            [Windows] some track language tags are not recognized
+            https://bugs.webkit.org/show_bug.cgi?id=120335
+
+            Reviewed by Eric Carlson.
+
+            * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp: Revise implementation
+            to match logic in platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjc.mm
+
 2013-10-24  Lucas Forschler  <lforschler@apple.com>
 

branches/safari-537.73-branch/Source/WebCore/platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp

@@ -842 +842 @@
         return;
 
+    setDelayCharacteristicsChangedNotification(true);
+
     bool haveCCTrack = false;
     bool hasCaptions = false;
@@ -915 +917 @@
     sizeChanged();
 
-    if (!primaryAudioTrackLanguage.isNull() && primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
+    if (primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
         player()->characteristicChanged();
+
+    setDelayCharacteristicsChangedNotification(false);
 }
 
@@ -1095 +1099 @@
     AVCFAssetTrackRef track = (AVCFAssetTrackRef)CFArrayGetValueAtIndex(tracks.get(), 0);
     RetainPtr<CFStringRef> language = adoptCF(AVCFAssetTrackCopyExtendedLanguageTag(track));
+
+    // If the language code is stored as a QuickTime 5-bit packed code there aren't enough bits for a full
+    // RFC 4646 language tag so extendedLanguageTag returns null. In this case languageCode will return the
+    // ISO 639-2/T language code so check it.
+    if (!language)
+        language = adoptCF(AVCFAssetTrackCopyLanguageCode(track));
 
     // Some legacy tracks have "und" as a language, treat that the same as no language at all.