+2013-11-13 Jer Noble <jer.noble@apple.com>
+
+ Unreviewed build failure; update MediaPlayerPrivateAVFFoundationCF::seekToTime after r159208.
+
+ After r159208, seekToTime takes tolerance parameters.
+
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.cpp:
+ (WebCore::MediaPlayerPrivateAVFoundationCF::seekToTime):
+ (WebCore::AVFWrapper::seekToTime):
+ * platform/graphics/avfoundation/cf/MediaPlayerPrivateAVFoundationCF.h:
+
2013-11-14 Beth Dakin <bdakin@apple.com>
Add a new mode where fixed elements don't constrain their positions during a
void checkPlayability();
void beginLoadingMetadata();
- void seekToTime(float);
+ void seekToTime(double, double, double);
void updateVideoLayerGravity();
void setCurrentTrack(InbandTextTrackPrivateAVF*);
return 0;
}
-void MediaPlayerPrivateAVFoundationCF::seekToTime(double time)
+void MediaPlayerPrivateAVFoundationCF::seekToTime(double time, double negativeTolerance, double positiveTolerance)
{
if (!m_avfWrapper)
return;
// seekToTime generates several event callbacks, update afterwards.
setDelayCallbacks(true);
- m_avfWrapper->seekToTime(time);
+ m_avfWrapper->seekToTime(time, negativeTolerance, positiveTolerance);
setDelayCallbacks(false);
}
self->m_owner->scheduleMainThreadNotification(MediaPlayerPrivateAVFoundation::Notification::SeekCompleted, static_cast<bool>(finished));
}
-void AVFWrapper::seekToTime(float time)
+void AVFWrapper::seekToTime(double time, double negativeTolerance, double positiveTolerance)
{
ASSERT(avPlayerItem());
- AVCFPlayerItemSeekToTimeWithToleranceAndCompletionCallback(avPlayerItem(), CMTimeMakeWithSeconds(time, 600),
- kCMTimeZero, kCMTimeZero, &seekCompletedCallback, callbackContext());
+ CMTime cmTime = CMTimeMakeWithSeconds(time, 600);
+ CMTime cmBefore = CMTimeMakeWithSeconds(negativeTolerance, 600);
+ CMTime cmAfter = CMTimeMakeWithSeconds(positiveTolerance, 600);
+ AVCFPlayerItemSeekToTimeWithToleranceAndCompletionCallback(avPlayerItem(), cmTime, cmBefore, cmAfter, &seekCompletedCallback, callbackContext());
}
#if HAVE(AVFOUNDATION_MEDIA_SELECTION_GROUP) && HAVE(AVFOUNDATION_LEGIBLE_OUTPUT_SUPPORT)
virtual void checkPlayability();
virtual void updateRate();
virtual float rate() const;
- virtual void seekToTime(double time);
+ virtual void seekToTime(double time, double negativeTolerance, double positiveTolerance);
virtual unsigned totalBytes() const;
virtual PassRefPtr<TimeRanges> platformBufferedTimeRanges() const;
virtual double platformMinTimeSeekable() const;