Changeset 153912 in webkit


Ignore:
Timestamp:
Aug 9, 2013 4:09:10 PM (11 years ago)
Author:
eric.carlson@apple.com
Message:

[Mac] some track language tags are not recognized
https://bugs.webkit.org/show_bug.cgi?id=119643

Reviewed by Dean Jackson.

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

(WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): Always call languageOfPrimaryAudioTrack(),

a track may have changed so we may have a new language.

(WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack): Call [AVAssetTrack languageCode]

if [AVAssetTrack extendedLanguageTag] returns NULL in case the media file has an old
QuickTime language code.

Location:
trunk/Source/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r153909 r153912  
     12013-08-09  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [Mac] some track language tags are not recognized
     4        https://bugs.webkit.org/show_bug.cgi?id=119643
     5
     6        Reviewed by Dean Jackson.
     7
     8        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     9        (WebCore::MediaPlayerPrivateAVFoundationObjC::tracksChanged): Always call languageOfPrimaryAudioTrack(),
     10            a track may have changed so we may have a new language.
     11        (WebCore::MediaPlayerPrivateAVFoundationObjC::languageOfPrimaryAudioTrack): Call [AVAssetTrack languageCode]
     12            if [AVAssetTrack extendedLanguageTag] returns NULL in case the media file has an old
     13            QuickTime language code.
     14
    1152013-08-09  Dean Jackson  <dino@apple.com>
    216
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r153728 r153912  
    10461046    sizeChanged();
    10471047
    1048     if (!primaryAudioTrackLanguage.isNull() && primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
     1048    if (primaryAudioTrackLanguage != languageOfPrimaryAudioTrack())
    10491049        player()->characteristicChanged();
    10501050}
     
    14971497    AVAssetTrack *track = [tracks objectAtIndex:0];
    14981498    NSString *language = [track extendedLanguageTag];
     1499
     1500    // If the language code is stored as a QuickTime 5-bit packed code there aren't enough bits for a full
     1501    // RFC 4646 language tag so extendedLanguageTag returns NULL. In this case languageCode will return the
     1502    // ISO 639-2/T language code so check it.
     1503    if (!language)
     1504        language = [track languageCode];
    14991505
    15001506    // Some legacy tracks have "und" as a language, treat that the same as no language at all.
Note: See TracChangeset for help on using the changeset viewer.