2009-04-18 Pierre d'Herbemont <pdherbemont@apple.com>

        Reviewed by Mark Rowe.

        <rdar://problem/6781295> video.buffered and video.seekable are not
        the same. 

        * WebCore.base.exp: Added wkQTMovieMaxTimeSeekable.

        * platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
        (WebCore::MediaPlayerPrivate::maxTimeSeekable): Return wkQTMovieMaxTimeSeekable.

        * platform/mac/WebCoreSystemInterface.h: Add wkQTMovieMaxTimeSeekable.
        * platform/mac/WebCoreSystemInterface.mm: Ditto.

2009-04-18  Pierre d'Herbemont  <pdherbemont@apple.com>

        Reviewed by Mark Rowe.

        <rdar://problem/6781295> video.buffered and video.seekable are not
        the same. 

        * WebCoreSupport/WebSystemInterface.m:
        (InitWebCoreSystemInterface): Add wkQTMovieMaxTimeSeekable.

2009-04-18  Pierre d'Herbemont  <pdherbemont@apple.com>

        Reviewed by Mark Rowe.

        <rdar://problem/6781295> video.buffered and video.seekable are not
        the same. 

        * WebKitSystemInterface.h:
        * libWebKitSystemInterfaceLeopard.a:
        * libWebKitSystemInterfaceTiger.a:



git-svn-id: svn://svn.chromium.org/blink/trunk@42642 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 0961059e
...@@ -2,6 +2,22 @@ ...@@ -2,6 +2,22 @@
Reviewed by Mark Rowe. Reviewed by Mark Rowe.
<rdar://problem/6781295> video.buffered and video.seekable are not
the same. video.buffered should return only what is buffered and
not what is seekable
* WebCore.base.exp: Added wkQTMovieMaxTimeSeekable.
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore::MediaPlayerPrivate::maxTimeSeekable): Return wkQTMovieMaxTimeSeekable.
* platform/mac/WebCoreSystemInterface.h: Add wkQTMovieMaxTimeSeekable.
* platform/mac/WebCoreSystemInterface.mm: Ditto.
2009-04-18 Pierre d'Herbemont <pdherbemont@apple.com>
Reviewed by Adele Peterson.
<rdar://problem/6747241> work around QTKit no longer reaching <rdar://problem/6747241> work around QTKit no longer reaching
QTMovieLoadStateComplete QTMovieLoadStateComplete
...@@ -984,6 +984,7 @@ _wkQTIncludeOnlyModernMediaFileTypes ...@@ -984,6 +984,7 @@ _wkQTIncludeOnlyModernMediaFileTypes
_wkQTMovieDataRate _wkQTMovieDataRate
_wkQTMovieMaxTimeLoaded _wkQTMovieMaxTimeLoaded
_wkQTMovieMaxTimeLoadedChangeNotification _wkQTMovieMaxTimeLoadedChangeNotification
_wkQTMovieMaxTimeSeekable
_wkQTMovieViewSetDrawSynchronously _wkQTMovieViewSetDrawSynchronously
_wkSetCGFontRenderingMode _wkSetCGFontRenderingMode
_wkSetDragImage _wkSetDragImage
......
...@@ -611,8 +611,14 @@ float MediaPlayerPrivate::maxTimeBuffered() const ...@@ -611,8 +611,14 @@ float MediaPlayerPrivate::maxTimeBuffered() const
float MediaPlayerPrivate::maxTimeSeekable() const float MediaPlayerPrivate::maxTimeSeekable() const
{ {
if (!metaDataAvailable())
return 0;
// infinite duration means live stream // infinite duration means live stream
return isinf(duration()) ? 0 : maxTimeLoaded(); if (isinf(duration()))
return 0;
return wkQTMovieMaxTimeSeekable(m_qtMovie.get());
} }
float MediaPlayerPrivate::maxTimeLoaded() const float MediaPlayerPrivate::maxTimeLoaded() const
......
...@@ -121,6 +121,7 @@ extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void); ...@@ -121,6 +121,7 @@ extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
extern int (*wkQTMovieDataRate)(QTMovie*); extern int (*wkQTMovieDataRate)(QTMovie*);
extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*); extern float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
extern NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void); extern NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
extern float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL); extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*); extern void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
extern void (*wkSetDragImage)(NSImage*, NSPoint offset); extern void (*wkSetDragImage)(NSImage*, NSPoint offset);
......
...@@ -55,6 +55,7 @@ unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void); ...@@ -55,6 +55,7 @@ unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
int (*wkQTMovieDataRate)(QTMovie*); int (*wkQTMovieDataRate)(QTMovie*);
float (*wkQTMovieMaxTimeLoaded)(QTMovie*); float (*wkQTMovieMaxTimeLoaded)(QTMovie*);
NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void); NSString *(*wkQTMovieMaxTimeLoadedChangeNotification)(void);
float (*wkQTMovieMaxTimeSeekable)(QTMovie*);
void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL); void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*); void (*wkSetCGFontRenderingMode)(CGContextRef, NSFont*);
void (*wkSetDragImage)(NSImage*, NSPoint offset); void (*wkSetDragImage)(NSImage*, NSPoint offset);
......
...@@ -2,6 +2,17 @@ ...@@ -2,6 +2,17 @@
Reviewed by Mark Rowe. Reviewed by Mark Rowe.
<rdar://problem/6781295> video.buffered and video.seekable are not
the same. video.buffered should return only what is buffered and
not what is seekable
* WebCoreSupport/WebSystemInterface.m:
(InitWebCoreSystemInterface): Add wkQTMovieMaxTimeSeekable.
2009-04-18 Pierre d'Herbemont <pdherbemont@apple.com>
Reviewed by Adele Peterson.
<rdar://problem/6747241> work around QTKit no longer reaching <rdar://problem/6747241> work around QTKit no longer reaching
QTMovieLoadStateComplete QTMovieLoadStateComplete
......
...@@ -76,6 +76,7 @@ void InitWebCoreSystemInterface(void) ...@@ -76,6 +76,7 @@ void InitWebCoreSystemInterface(void)
INIT(QTMovieDataRate); INIT(QTMovieDataRate);
INIT(QTMovieMaxTimeLoaded); INIT(QTMovieMaxTimeLoaded);
INIT(QTMovieMaxTimeLoadedChangeNotification); INIT(QTMovieMaxTimeLoadedChangeNotification);
INIT(QTMovieMaxTimeSeekable);
INIT(QTMovieViewSetDrawSynchronously); INIT(QTMovieViewSetDrawSynchronously);
#ifndef BUILDING_ON_TIGER #ifndef BUILDING_ON_TIGER
......
2009-04-18 Pierre d'Herbemont <pdherbemont@apple.com> 2009-04-18 Pierre d'Herbemont <pdherbemont@apple.com>
Reviewed by Mark Rowe. Reviewed by Mark Rowe.
<rdar://problem/6781295> video.buffered and video.seekable are not
the same. video.buffered should return only what is buffered and
not what is seekable
* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLeopard.a:
* libWebKitSystemInterfaceTiger.a:
2009-04-18 Pierre d'Herbemont <pdherbemont@apple.com>
Reviewed by Adele Peterson.
<rdar://problem/6747241> work around QTKit no longer reaching <rdar://problem/6747241> work around QTKit no longer reaching
QTMovieLoadStateComplete QTMovieLoadStateComplete
......
...@@ -182,6 +182,7 @@ BOOL WKAppVersionCheckLessThan(NSString *, int, double); ...@@ -182,6 +182,7 @@ BOOL WKAppVersionCheckLessThan(NSString *, int, double);
unsigned WKQTIncludeOnlyModernMediaFileTypes(void); unsigned WKQTIncludeOnlyModernMediaFileTypes(void);
int WKQTMovieDataRate(QTMovie* movie); int WKQTMovieDataRate(QTMovie* movie);
float WKQTMovieMaxTimeLoaded(QTMovie* movie); float WKQTMovieMaxTimeLoaded(QTMovie* movie);
float WKQTMovieMaxTimeSeekable(QTMovie* movie);
NSString *WKQTMovieMaxTimeLoadedChangeNotification(void); NSString *WKQTMovieMaxTimeLoadedChangeNotification(void);
void WKQTMovieViewSetDrawSynchronously(QTMovieView* view, BOOL sync); void WKQTMovieViewSetDrawSynchronously(QTMovieView* view, BOOL sync);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment