Changeset 181863 in webkit

Timestamp:

Mar 23, 2015, 1:31:56 PM (11 years ago)

Author:

achristensen@apple.com

Message:

[MediaFoundation] Implement seek.
​https://bugs.webkit.org/show_bug.cgi?id=142594

Reviewed by Darin Adler.

• platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:

(WebCore::MediaPlayerPrivateMediaFoundation::seeking):
(WebCore::MediaPlayerPrivateMediaFoundation::seekDouble):
(WebCore::MediaPlayerPrivateMediaFoundation::durationDouble):

• platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp (modified) (1 diff)
• platform/graphics/win/MediaPlayerPrivateMediaFoundation.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-03-23  Alex Christensen  <achristensen@webkit.org>
+
+        [MediaFoundation] Implement seek.
+        https://bugs.webkit.org/show_bug.cgi?id=142594
+
+        Reviewed by Darin Adler.
+
+        * platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp:
+        (WebCore::MediaPlayerPrivateMediaFoundation::seeking):
+        (WebCore::MediaPlayerPrivateMediaFoundation::seekDouble):
+        (WebCore::MediaPlayerPrivateMediaFoundation::durationDouble):
+        * platform/graphics/win/MediaPlayerPrivateMediaFoundation.h:
+
 2015-03-23  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.cpp

@@ -167 +167 @@
 bool MediaPlayerPrivateMediaFoundation::seeking() const
 {
-    notImplemented();
+    // We assume seeking is immediately complete.
     return false;
+}
+
+void MediaPlayerPrivateMediaFoundation::seekDouble(double time)
+{
+    const double tenMegahertz = 10000000;
+    PROPVARIANT propVariant;
+    PropVariantInit(&propVariant);
+    propVariant.vt = VT_I8;
+    propVariant.hVal.QuadPart = static_cast<__int64>(time * tenMegahertz);
+    
+    HRESULT hr = m_mediaSession->Start(&GUID_NULL, &propVariant);
+    ASSERT(SUCCEEDED(hr));
+    PropVariantClear(&propVariant);
+}
+
+double MediaPlayerPrivateMediaFoundation::durationDouble() const
+{
+    const double tenMegahertz = 10000000;
+    if (!m_mediaSource)
+        return 0;
+
+    IMFPresentationDescriptor* descriptor;
+    if (!SUCCEEDED(m_mediaSource->CreatePresentationDescriptor(&descriptor)))
+        return 0;
+    
+    UINT64 duration;
+    if (!SUCCEEDED(descriptor->GetUINT64(MF_PD_DURATION, &duration)))
+        duration = 0;
+    descriptor->Release();
+    
+    return static_cast<double>(duration) / tenMegahertz;
 }
 

trunk/Source/WebCore/platform/graphics/win/MediaPlayerPrivateMediaFoundation.h

@@ -60 +60 @@
 
     virtual bool seeking() const;
+    virtual void seekDouble(double) override;
+    virtual double durationDouble() const override;
 
     virtual bool paused() const;