Bug 115740 - [Mac] Inband text tracks are not in text track menu on Lion
Summary: [Mac] Inband text tracks are not in text track menu on Lion
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Media (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Eric Carlson
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-05-07 10:53 PDT by Eric Carlson
Modified: 2013-05-08 09:06 PDT (History)
7 users (show)

See Also:


Attachments
Proposed patch (34.73 KB, patch)
2013-05-07 17:42 PDT, Eric Carlson
no flags Details | Formatted Diff | Diff
Out damned tabs! (34.75 KB, patch)
2013-05-07 18:06 PDT, Eric Carlson
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Eric Carlson 2013-05-07 10:53:24 PDT
Inband text tracks are not listed in the track menu on OS X Lion.
Comment 1 Eric Carlson 2013-05-07 17:42:43 PDT
Created attachment 201004 [details]
Proposed patch
Comment 2 WebKit Commit Bot 2013-05-07 17:44:00 PDT
Attachment 201004 [details] did not pass style-queue:

Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/platform/mac-lion/media/video-controls-captions-trackmenu-localized-expected.txt', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/Platform.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/html/HTMLMediaElement.cpp', u'Source/WebCore/html/HTMLMediaElement.h', u'Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp', u'Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.h', u'Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp', u'Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.h', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateAVFObjC.mm', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.h', u'Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm', u'Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h', u'Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm']" exit_code: 1
Source/WebCore/ChangeLog:13:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:19:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:20:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:34:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:44:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:47:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:49:  Line contains tab character.  [whitespace/tab] [5]
Source/WebCore/ChangeLog:53:  Line contains tab character.  [whitespace/tab] [5]
Total errors found: 8 in 14 files


If any of these errors are false positives, please file a bug against check-webkit-style.
Comment 3 Eric Carlson 2013-05-07 18:06:20 PDT
Created attachment 201006 [details]
Out damned tabs!
Comment 4 Dean Jackson 2013-05-07 23:22:24 PDT
Comment on attachment 201006 [details]
Out damned tabs!

View in context: https://bugs.webkit.org/attachment.cgi?id=201006&action=review

> Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm:88
>  {
>      if (!m_playerItemTrack)
>          return false;
> -    
> -    return [[[m_playerItemTrack assetTrack] mediaType] isEqualToString:AVMediaTypeClosedCaption];
> +
> +    return true;
>  }

Seems like this can now be "return m_playerItemTrack"

> Source/WebCore/platform/graphics/avfoundation/objc/InbandTextTrackPrivateLegacyAVFObjC.mm:98
>  bool InbandTextTrackPrivateLegacyAVFObjC::isMainProgramContent() const
>  {
> -    if (!m_playerItemTrack)
> -        return false;
> -    
> -    return [[m_playerItemTrack assetTrack] hasMediaCharacteristic:AVMediaCharacteristicIsMainProgramContent];
> +    return m_playerItemTrack;
>  }

Which is the same as this now.
Comment 5 Eric Carlson 2013-05-08 09:06:45 PDT
Committed r149741  - https://trac.webkit.org/r149741