Modified: branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.h (223119 => 223120)
--- branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.h 2017-10-10 04:12:28 UTC (rev 223119)
+++ branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.h 2017-10-10 04:12:30 UTC (rev 223120)
@@ -37,7 +37,6 @@
typedef CFTypeRef CMBufferRef;
typedef struct opaqueCMBufferQueue *CMBufferQueueRef;
-typedef struct opaqueCMBufferQueueTriggerToken *CMBufferQueueTriggerToken;
typedef struct opaqueCMSampleBuffer *CMSampleBufferRef;
typedef struct OpaqueCMTimebase* CMTimebaseRef;
typedef signed long CMItemCount;
@@ -90,7 +89,6 @@
static CMTime getPresentationTime(CMBufferRef, void* refcon);
static CMTime getDuration(CMBufferRef, void* refcon);
static CFComparisonResult compareBuffers(CMBufferRef buf1, CMBufferRef buf2, void* refcon);
- static void maybeBecomeReadyForMoreMediaDataCallback(void* refcon, CMBufferQueueTriggerToken);
void maybeBecomeReadyForMoreMediaData();
static const CMItemCount kMaximumCapacity = 120;
@@ -107,7 +105,6 @@
OSObjectPtr<dispatch_source_t> m_timerSource;
std::function<void()> m_notificationCallback;
std::function<void()> m_hasAvailableFrameCallback;
- CMBufferQueueTriggerToken m_didBecomeReadyTrigger { nullptr };
bool m_invalidated { false };
int m_framesBeingDecoded { 0 };
Modified: branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm (223119 => 223120)
--- branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-10-10 04:12:28 UTC (rev 223119)
+++ branches/safari-604-branch/Source/WebCore/platform/graphics/cocoa/WebCoreDecompressionSession.mm 2017-10-10 04:12:30 UTC (rev 223120)
@@ -85,18 +85,13 @@
}
}
-void WebCoreDecompressionSession::maybeBecomeReadyForMoreMediaDataCallback(void* refcon, CMBufferQueueTriggerToken)
-{
- WebCoreDecompressionSession* session = static_cast<WebCoreDecompressionSession*>(refcon);
- session->maybeBecomeReadyForMoreMediaData();
-}
-
void WebCoreDecompressionSession::maybeBecomeReadyForMoreMediaData()
{
- LOG(Media, "WebCoreDecompressionSession::maybeBecomeReadyForMoreMediaData(%p) - isReadyForMoreMediaData(%d), hasCallback(%d)", this, isReadyForMoreMediaData(), !!m_notificationCallback);
if (!isReadyForMoreMediaData() || !m_notificationCallback)
return;
+ LOG(Media, "WebCoreDecompressionSession::maybeBecomeReadyForMoreMediaData(%p) - isReadyForMoreMediaData(%d), hasCallback(%d)", this, isReadyForMoreMediaData(), !!m_notificationCallback);
+
if (isMainThread()) {
m_notificationCallback();
return;
@@ -148,8 +143,6 @@
#pragma pack(pop)
CMBufferQueueCreate(kCFAllocatorDefault, kMaximumCapacity, &callbacks.callbacks, &outQueue);
m_producerQueue = adoptCF(outQueue);
-
- CMBufferQueueInstallTriggerWithIntegerThreshold(m_producerQueue.get(), maybeBecomeReadyForMoreMediaDataCallback, this, kCMBufferQueueTrigger_WhenBufferCountBecomesLessThan, kLowWaterMark, &m_didBecomeReadyTrigger);
}
if (!m_consumerQueue) {
@@ -242,6 +235,8 @@
if (!shouldDecodeSample(sample, displaying)) {
++m_totalVideoFrames;
++m_droppedVideoFrames;
+ --m_framesBeingDecoded;
+ maybeBecomeReadyForMoreMediaData();
return;
}
@@ -264,6 +259,8 @@
CMVideoFormatDescriptionRef rawImageBufferDescription = nullptr;
if (status != noErr || noErr != CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, rawImageBuffer, &rawImageBufferDescription)) {
++m_corruptedVideoFrames;
+ --m_framesBeingDecoded;
+ maybeBecomeReadyForMoreMediaData();
return;
}
RetainPtr<CMVideoFormatDescriptionRef> imageBufferDescription = adoptCF(rawImageBufferDescription);
@@ -277,6 +274,8 @@
CMSampleBufferRef rawImageSampleBuffer = nullptr;
if (noErr != CMSampleBufferCreateReadyWithImageBuffer(kCFAllocatorDefault, rawImageBuffer, imageBufferDescription.get(), &imageBufferTiming, &rawImageSampleBuffer)) {
++m_corruptedVideoFrames;
+ --m_framesBeingDecoded;
+ maybeBecomeReadyForMoreMediaData();
return;
}
@@ -298,6 +297,9 @@
RetainPtr<CMSampleBufferRef> currentSample = adoptCF((CMSampleBufferRef)CMBufferQueueDequeueAndRetain(m_producerQueue.get()));
RetainPtr<CVPixelBufferRef> imageBuffer = (CVPixelBufferRef)CMSampleBufferGetImageBuffer(currentSample.get());
ASSERT(CFGetTypeID(imageBuffer.get()) == CVPixelBufferGetTypeID());
+
+ maybeBecomeReadyForMoreMediaData();
+
return imageBuffer;
}
@@ -309,6 +311,9 @@
auto time = toMediaTime(CMTimebaseGetTime(m_timebase.get()));
LOG(Media, "WebCoreDecompressionSession::automaticDequeue(%p) - purging all samples before time(%s)", this, toString(time).utf8().data());
+ MediaTime nextFireTime = MediaTime::positiveInfiniteTime();
+ bool releasedImageBuffers = false;
+
while (CMSampleBufferRef firstSample = (CMSampleBufferRef)CMBufferQueueGetHead(m_producerQueue.get())) {
MediaTime presentationTimestamp = toMediaTime(CMSampleBufferGetPresentationTimeStamp(firstSample));
MediaTime duration = toMediaTime(CMSampleBufferGetDuration(firstSample));
@@ -315,6 +320,7 @@
MediaTime presentationEndTimestamp = presentationTimestamp + duration;
if (time > presentationEndTimestamp) {
CFRelease(CMBufferQueueDequeueAndRetain(m_producerQueue.get()));
+ releasedImageBuffers = true;
continue;
}
@@ -323,12 +329,16 @@
auto end = toMediaTime(CMBufferQueueGetEndPresentationTimeStamp(m_producerQueue.get()));
LOG(Media, "WebCoreDecompressionSession::automaticDequeue(%p) - queue(%s -> %s)", this, toString(begin).utf8().data(), toString(end).utf8().data());
#endif
- CMTimebaseSetTimerDispatchSourceNextFireTime(m_timebase.get(), m_timerSource.get(), toCMTime(presentationEndTimestamp), 0);
- return;
+
+ nextFireTime = presentationEndTimestamp;
+ break;
}
+ if (releasedImageBuffers)
+ maybeBecomeReadyForMoreMediaData();
+
LOG(Media, "WebCoreDecompressionSession::automaticDequeue(%p) - queue empty", this, toString(time).utf8().data());
- CMTimebaseSetTimerDispatchSourceNextFireTime(m_timebase.get(), m_timerSource.get(), kCMTimePositiveInfinity, 0);
+ CMTimebaseSetTimerDispatchSourceNextFireTime(m_timebase.get(), m_timerSource.get(), toCMTime(nextFireTime), 0);
}
void WebCoreDecompressionSession::enqueueDecodedSample(CMSampleBufferRef sample, bool displaying)
@@ -425,6 +435,8 @@
return nullptr;
}
+ bool releasedImageBuffers = false;
+
while (CMSampleBufferRef firstSample = (CMSampleBufferRef)CMBufferQueueGetHead(m_producerQueue.get())) {
MediaTime presentationTimestamp = toMediaTime(CMSampleBufferGetPresentationTimeStamp(firstSample));
MediaTime duration = toMediaTime(CMSampleBufferGetDuration(firstSample));
@@ -433,6 +445,7 @@
return nullptr;
if (!allowEarlier && presentationEndTimestamp < time) {
CFRelease(CMBufferQueueDequeueAndRetain(m_producerQueue.get()));
+ releasedImageBuffers = true;
continue;
}
@@ -443,6 +456,8 @@
if (m_timebase)
CMTimebaseSetTimerDispatchSourceToFireImmediately(m_timebase.get(), m_timerSource.get());
+ maybeBecomeReadyForMoreMediaData();
+
LOG(Media, "WebCoreDecompressionSession::imageForTime(%p) - found sample for time(%s) in queue(%s -> %s)", this, toString(time).utf8().data(), toString(startTime).utf8().data(), toString(endTime).utf8().data());
return imageBuffer;
}
@@ -450,6 +465,9 @@
if (m_timebase)
CMTimebaseSetTimerDispatchSourceToFireImmediately(m_timebase.get(), m_timerSource.get());
+ if (releasedImageBuffers)
+ maybeBecomeReadyForMoreMediaData();
+
LOG(Media, "WebCoreDecompressionSession::imageForTime(%p) - no matching sample for time(%s) in queue(%s -> %s)", this, toString(time).utf8().data(), toString(startTime).utf8().data(), toString(endTime).utf8().data());
return nullptr;
}
