Changeset 148291 in webkit

Timestamp:

Apr 12, 2013 11:39:37 AM (11 years ago)

Author:

jer.noble@apple.com

Message:

Add support for MediaPlayer::minTimeSeekable()
​https://bugs.webkit.org/show_bug.cgi?id=114484

Reviewed by Eric Carlson.

Plumb a new minTimeSeekable() method through MediaPlayer and
MediaPlayerPrivate and use this new method in the existing
HTMLMediaElement::minTimeSeekable() method.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::minTimeSeekable): Pass to MediaPlayer.

• platform/graphics/MediaPlayer.cpp:

(WebCore::NullMediaPlayerPrivate::minTimeSeekable): Return 0.
(WebCore::MediaPlayer::minTimeSeekable): Pass to MediaPlayerPrivate.

• platform/graphics/MediaPlayer.h:
• platform/graphics/MediaPlayerPrivate.h:

(WebCore::MediaPlayerPrivateInterface::seekable): Define in terms of

minTimeSeekable()

(WebCore::MediaPlayerPrivateInterface::minTimeSeekable): Default to 0.

• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:

(WebCore::MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation):

Initialize new m_cachedMinTimeSeekable ivar.

(WebCore::MediaPlayerPrivateAVFoundation::maxTimeSeekableDouble):

Renamed from maxTimeSeekable().

(WebCore::MediaPlayerPrivateAVFoundation::minTimeSeekable): Added.

Cache value of platformMinTimeSeekable().

(WebCore::MediaPlayerPrivateAVFoundation::seekableTimeRangesChanged):

Reset m_cachedMinTimeSeekable.

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

(WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime): float -> double.
(WebCore::MediaPlayerPrivateAVFoundationObjC::platformMinTimeSeekable):

Added. Retrieve the lowest value from -[m_playerItem seekableTimeRanges].

(WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable):

float -> double.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (1 diff)
• platform/graphics/MediaPlayer.cpp (modified) (2 diffs)
• platform/graphics/MediaPlayer.h (modified) (1 diff)
• platform/graphics/MediaPlayerPrivate.h (modified) (1 diff)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp (modified) (4 diffs)
• platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h (modified) (3 diffs)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h (modified) (1 diff)
• platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-11  Jer Noble  <jer.noble@apple.com>
+
+        Add support for MediaPlayer::minTimeSeekable()
+        https://bugs.webkit.org/show_bug.cgi?id=114484
+
+        Reviewed by Eric Carlson.
+
+        Plumb a new minTimeSeekable() method through MediaPlayer and
+        MediaPlayerPrivate and use this new method in the existing
+        HTMLMediaElement::minTimeSeekable() method.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::minTimeSeekable): Pass to MediaPlayer.
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::NullMediaPlayerPrivate::minTimeSeekable): Return 0.
+        (WebCore::MediaPlayer::minTimeSeekable): Pass to MediaPlayerPrivate.
+        * platform/graphics/MediaPlayer.h:
+        * platform/graphics/MediaPlayerPrivate.h:
+        (WebCore::MediaPlayerPrivateInterface::seekable): Define in terms of 
+            minTimeSeekable()
+        (WebCore::MediaPlayerPrivateInterface::minTimeSeekable): Default to 0.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp:
+        (WebCore::MediaPlayerPrivateAVFoundation::MediaPlayerPrivateAVFoundation):
+            Initialize new m_cachedMinTimeSeekable ivar.
+        (WebCore::MediaPlayerPrivateAVFoundation::maxTimeSeekableDouble):
+            Renamed from maxTimeSeekable().
+        (WebCore::MediaPlayerPrivateAVFoundation::minTimeSeekable): Added.
+            Cache value of platformMinTimeSeekable().
+        (WebCore::MediaPlayerPrivateAVFoundation::seekableTimeRangesChanged):
+            Reset m_cachedMinTimeSeekable.
+        * platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::seekToTime): float -> double.
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformMinTimeSeekable):
+            Added. Retrieve the lowest value from -[m_playerItem seekableTimeRanges].
+        (WebCore::MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable):
+            float -> double.
+
 2013-04-12  Commit Queue  <rniwa@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -3779 +3779 @@
 double HTMLMediaElement::minTimeSeekable() const
 {
-    return 0;
+    return m_player ? m_player->minTimeSeekable() : 0;
 }
 

trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp

@@ -136 +136 @@
 
     virtual double maxTimeSeekableDouble() const { return 0; }
+    virtual double minTimeSeekable() const { return 0; }
     virtual PassRefPtr<TimeRanges> buffered() const { return TimeRanges::create(); }
 
@@ -682 +683 @@
 }
 
+double MediaPlayer::minTimeSeekable()
+{
+    return m_private->minTimeSeekable();
+}
+
 bool MediaPlayer::didLoadingProgress()
 {

trunk/Source/WebCore/platform/graphics/MediaPlayer.h

@@ -316 +316 @@
     PassRefPtr<TimeRanges> buffered();
     PassRefPtr<TimeRanges> seekable();
+    double minTimeSeekable();
     double maxTimeSeekable();
 

trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h

@@ -106 +106 @@
     virtual MediaPlayer::ReadyState readyState() const = 0;
 
-    virtual PassRefPtr<TimeRanges> seekable() const { return maxTimeSeekable() ? TimeRanges::create(0, maxTimeSeekable()) : TimeRanges::create(); }
+    virtual PassRefPtr<TimeRanges> seekable() const { return maxTimeSeekableDouble() ? TimeRanges::create(minTimeSeekable(), maxTimeSeekableDouble()) : TimeRanges::create(); }
     virtual float maxTimeSeekable() const { return 0; }
     virtual double maxTimeSeekableDouble() const { return maxTimeSeekable(); }
+    virtual double minTimeSeekable() const { return 0; }
     virtual PassRefPtr<TimeRanges> buffered() const = 0;
 

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.cpp

@@ -58 +58 @@
     , m_cachedMaxTimeLoaded(0)
     , m_cachedMaxTimeSeekable(0)
+    , m_cachedMinTimeSeekable(0)
     , m_cachedDuration(MediaPlayer::invalidTime())
     , m_reportedDuration(MediaPlayer::invalidTime())
@@ -362 +363 @@
 }
 
-float MediaPlayerPrivateAVFoundation::maxTimeSeekable() const
+double MediaPlayerPrivateAVFoundation::maxTimeSeekableDouble() const
 {
     if (!metaDataAvailable())
@@ -372 +373 @@
     LOG(Media, "MediaPlayerPrivateAVFoundation::maxTimeSeekable(%p) - returning %f", this, m_cachedMaxTimeSeekable);
     return m_cachedMaxTimeSeekable;   
+}
+
+double MediaPlayerPrivateAVFoundation::minTimeSeekable() const
+{
+    if (!metaDataAvailable())
+        return 0;
+
+    if (!m_cachedMinTimeSeekable)
+        m_cachedMinTimeSeekable = platformMinTimeSeekable();
+
+    LOG(Media, "MediaPlayerPrivateAVFoundation::minTimeSeekable(%p) - returning %f", this, m_cachedMinTimeSeekable);
+    return m_cachedMinTimeSeekable;
 }
 
@@ -571 +584 @@
 {
     m_cachedMaxTimeSeekable = 0;
+    m_cachedMinTimeSeekable = 0;
 }
 

trunk/Source/WebCore/platform/graphics/avfoundation/MediaPlayerPrivateAVFoundation.h

@@ -158 +158 @@
     virtual MediaPlayer::NetworkState networkState() const { return m_networkState; }
     virtual MediaPlayer::ReadyState readyState() const { return m_readyState; }
-    virtual float maxTimeSeekable() const;
+    virtual double maxTimeSeekableDouble() const;
+    virtual double minTimeSeekable() const;
     virtual PassRefPtr<TimeRanges> buffered() const;
     virtual bool didLoadingProgress() const;
@@ -210 +211 @@
     virtual void updateRate() = 0;
     virtual float rate() const = 0;
-    virtual void seekToTime(float time) = 0;
+    virtual void seekToTime(double time) = 0;
     virtual unsigned totalBytes() const = 0;
     virtual PassRefPtr<TimeRanges> platformBufferedTimeRanges() const = 0;
-    virtual float platformMaxTimeSeekable() const = 0;
+    virtual double platformMaxTimeSeekable() const = 0;
+    virtual double platformMinTimeSeekable() const = 0;
     virtual float platformMaxTimeLoaded() const = 0;
     virtual float platformDuration() const = 0;
@@ -286 +288 @@
     IntSize m_cachedNaturalSize;
     mutable float m_cachedMaxTimeLoaded;
-    mutable float m_cachedMaxTimeSeekable;
+    mutable double m_cachedMaxTimeSeekable;
+    mutable double m_cachedMinTimeSeekable;
     mutable float m_cachedDuration;
     float m_reportedDuration;
     mutable float m_maxTimeLoadedAtLastDidLoadingProgress;
-    float m_seekTo;
+    double m_seekTo;
     float m_requestedRate;
     mutable int m_delayCallbacks;

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

@@ -123 +123 @@
     virtual void updateRate();
     virtual float rate() const;
-    virtual void seekToTime(float time);
+    virtual void seekToTime(double time);
     virtual unsigned totalBytes() const;
     virtual PassRefPtr<TimeRanges> platformBufferedTimeRanges() const;
-    virtual float platformMaxTimeSeekable() const;
+    virtual double platformMinTimeSeekable() const;
+    virtual double platformMaxTimeSeekable() const;
     virtual float platformDuration() const;
     virtual float platformMaxTimeLoaded() const;

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

@@ -602 +602 @@
 }
 
-void MediaPlayerPrivateAVFoundationObjC::seekToTime(float time)
+void MediaPlayerPrivateAVFoundationObjC::seekToTime(double time)
 {
     // setCurrentTime generates several event callbacks, update afterwards.
@@ -670 +670 @@
 }
 
-float MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable() const
+double MediaPlayerPrivateAVFoundationObjC::platformMinTimeSeekable() const
+{
+    NSArray *seekableRanges = [m_avPlayerItem.get() seekableTimeRanges];
+    if (!seekableRanges || ![seekableRanges count])
+        return 0;
+
+    double minTimeSeekable = std::numeric_limits<double>::infinity();
+    bool hasValidRange = false;
+    for (NSValue *thisRangeValue in seekableRanges) {
+        CMTimeRange timeRange = [thisRangeValue CMTimeRangeValue];
+        if (!CMTIMERANGE_IS_VALID(timeRange) || CMTIMERANGE_IS_EMPTY(timeRange))
+            continue;
+
+        hasValidRange = true;
+        double startOfRange = CMTimeGetSeconds(timeRange.start);
+        if (minTimeSeekable > startOfRange)
+            minTimeSeekable = startOfRange;
+    }
+    return hasValidRange ? minTimeSeekable : 0;
+}
+
+double MediaPlayerPrivateAVFoundationObjC::platformMaxTimeSeekable() const
 {
     NSArray *seekableRanges = [m_avPlayerItem.get() seekableTimeRanges];
@@ -676 +697 @@
         return 0;
 
-    float maxTimeSeekable = 0;
+    double maxTimeSeekable = 0;
     for (NSValue *thisRangeValue in seekableRanges) {
         CMTimeRange timeRange = [thisRangeValue CMTimeRangeValue];
@@ -682 +703 @@
             continue;
         
-        float endOfRange = narrowPrecisionToFloat(CMTimeGetSeconds(CMTimeRangeGetEnd(timeRange)));
+        double endOfRange = CMTimeGetSeconds(CMTimeRangeGetEnd(timeRange));
         if (maxTimeSeekable < endOfRange)
             maxTimeSeekable = endOfRange;
     }
-    return maxTimeSeekable;   
+    return maxTimeSeekable;
 }
 
@@ -1431 +1452 @@
     return m_languageOfPrimaryAudioTrack;
 }
-    
+
 NSArray* assetMetadataKeyNames()
 {