Changeset 152204 in webkit


Ignore:
Timestamp:
Jun 28, 2013 7:55:52 PM (11 years ago)
Author:
eric.carlson@apple.com
Message:

[Mac] adopt new AVFoundation caption API
https://bugs.webkit.org/show_bug.cgi?id=118207

Reviewed by Dean Jackson.

No new tests, I was not able to come up with a reliable layout test.

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

(WebCore::MediaPlayerPrivateAVFoundationObjC::flushCues): New, call currentTrack->resetCueValues().
(-[WebCoreAVFMovieObserver outputSequenceWasFlushed:]): New delegate method.

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r152203 r152204  
     12013-06-28  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [Mac] adopt new AVFoundation caption API
     4        https://bugs.webkit.org/show_bug.cgi?id=118207
     5
     6        Reviewed by Dean Jackson.
     7
     8        No new tests, I was not able to come up with a reliable layout test.
     9
     10        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
     11        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     12        (WebCore::MediaPlayerPrivateAVFoundationObjC::flushCues): New, call currentTrack->resetCueValues().
     13        (-[WebCoreAVFMovieObserver outputSequenceWasFlushed:]): New delegate method.
     14
    1152013-06-28  Kangil Han  <kangil.han@samsung.com>
    216
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h

    r149741 r152204  
    7272    RetainPtr<AVPlayerItem> playerItem() const { return m_avPlayerItem; }
    7373    void processCue(NSArray *, double);
     74    void flushCues();
    7475#endif
    7576   
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r151762 r152204  
    166166#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
    167167- (void)legibleOutput:(id)output didOutputAttributedStrings:(NSArray *)strings nativeSampleBuffers:(NSArray *)nativeSamples forItemTime:(CMTime)itemTime;
     168- (void)outputSequenceWasFlushed:(id)output;
    168169#endif
    169170@end
     
    14561457
    14571458    m_currentTrack->processCue(reinterpret_cast<CFArrayRef>(attributedStrings), time);
     1459}
     1460
     1461void MediaPlayerPrivateAVFoundationObjC::flushCues()
     1462{
     1463    LOG(Media, "MediaPlayerPrivateAVFoundationObjC::flushCues(%p)", this);
     1464
     1465    if (!m_currentTrack)
     1466        return;
     1467   
     1468    m_currentTrack->resetCueValues();
    14581469}
    14591470#endif // HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP)
     
    16721683    });
    16731684}
     1685
     1686- (void)outputSequenceWasFlushed:(id)output
     1687{
     1688    UNUSED_PARAM(output);
     1689
     1690    if (!m_callback)
     1691        return;
     1692   
     1693    dispatch_async(dispatch_get_main_queue(), ^{
     1694        if (!m_callback)
     1695            return;
     1696        m_callback->flushCues();
     1697    });
     1698}
    16741699#endif
    16751700
Note: See TracChangeset for help on using the changeset viewer.