Title: [265192] trunk/Source/WebCore
- Revision
- 265192
- Author
- [email protected]
- Date
- 2020-08-03 03:09:39 -0700 (Mon, 03 Aug 2020)
Log Message
MediaRecorderPrivateWriter::appendEndOfVideoSampleDurationIfNeeded should only call requestMediaDataWhenReadyOnQueue once
https://bugs.webkit.org/show_bug.cgi?id=214972
Reviewed by Eric Carlson.
When processing a compressed sample, pass it to the writer if its ready.
Otherwise buffer it and retry passing it to the writer next time we have a sample.
When finishing a write, we call requestMediaDataWhenReadyOnQueue to finish passing samples that are still enqueued.
Covered by existing tests no longer triggering ObjC exception.
* platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h:
* platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
(WebCore::MediaRecorderPrivateWriter::appendCompressedAudioSampleBuffer):
(WebCore::MediaRecorderPrivateWriter::appendCompressedVideoSampleBufferIfPossible):
(WebCore::MediaRecorderPrivateWriter::appendCompressedVideoSampleBuffer):
(WebCore::MediaRecorderPrivateWriter::appendCompressedSampleBuffers):
(WebCore::MediaRecorderPrivateWriter::finishAppendingCompressedAudioSampleBuffers):
(WebCore::MediaRecorderPrivateWriter::finishAppendingCompressedVideoSampleBuffers):
(WebCore::MediaRecorderPrivateWriter::flushCompressedSampleBuffers):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (265191 => 265192)
--- trunk/Source/WebCore/ChangeLog 2020-08-03 06:41:45 UTC (rev 265191)
+++ trunk/Source/WebCore/ChangeLog 2020-08-03 10:09:39 UTC (rev 265192)
@@ -1,3 +1,26 @@
+2020-08-03 Youenn Fablet <[email protected]>
+
+ MediaRecorderPrivateWriter::appendEndOfVideoSampleDurationIfNeeded should only call requestMediaDataWhenReadyOnQueue once
+ https://bugs.webkit.org/show_bug.cgi?id=214972
+
+ Reviewed by Eric Carlson.
+
+ When processing a compressed sample, pass it to the writer if its ready.
+ Otherwise buffer it and retry passing it to the writer next time we have a sample.
+ When finishing a write, we call requestMediaDataWhenReadyOnQueue to finish passing samples that are still enqueued.
+
+ Covered by existing tests no longer triggering ObjC exception.
+
+ * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h:
+ * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
+ (WebCore::MediaRecorderPrivateWriter::appendCompressedAudioSampleBuffer):
+ (WebCore::MediaRecorderPrivateWriter::appendCompressedVideoSampleBufferIfPossible):
+ (WebCore::MediaRecorderPrivateWriter::appendCompressedVideoSampleBuffer):
+ (WebCore::MediaRecorderPrivateWriter::appendCompressedSampleBuffers):
+ (WebCore::MediaRecorderPrivateWriter::finishAppendingCompressedAudioSampleBuffers):
+ (WebCore::MediaRecorderPrivateWriter::finishAppendingCompressedVideoSampleBuffers):
+ (WebCore::MediaRecorderPrivateWriter::flushCompressedSampleBuffers):
+
2020-08-02 Darin Adler <[email protected]>
Remove some member functions of Range and many calls to createLiveRange
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h (265191 => 265192)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h 2020-08-03 06:41:45 UTC (rev 265191)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h 2020-08-03 10:09:39 UTC (rev 265192)
@@ -83,16 +83,18 @@
static void compressedAudioOutputBufferCallback(void*, CMBufferQueueTriggerToken);
void startAssetWriter();
+
void appendCompressedSampleBuffers();
+ bool appendCompressedAudioSampleBufferIfPossible();
+ bool appendCompressedVideoSampleBufferIfPossible();
+ void appendCompressedVideoSampleBuffer(CMSampleBufferRef);
- bool appendCompressedAudioSampleBuffer();
- bool appendCompressedVideoSampleBuffer();
-
void processNewCompressedAudioSampleBuffers();
void processNewCompressedVideoSampleBuffers();
+ void finishAppendingCompressedAudioSampleBuffers(CompletionHandler<void()>&&);
+ void finishAppendingCompressedVideoSampleBuffers(CompletionHandler<void()>&&);
void flushCompressedSampleBuffers(CompletionHandler<void()>&&);
- void appendEndOfVideoSampleDurationIfNeeded(CompletionHandler<void()>&&);
bool m_hasAudio { false };
bool m_hasVideo { false };
@@ -118,6 +120,10 @@
bool m_hasEncodedVideoSamples { false };
RetainPtr<WebAVAssetWriterDelegate> m_writerDelegate;
+ Deque<RetainPtr<CMSampleBufferRef>> m_pendingVideoSampleQueue;
+ Deque<RetainPtr<CMSampleBufferRef>> m_pendingAudioSampleQueue;
+
+ bool m_isFlushingSamples { false };
};
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm (265191 => 265192)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm 2020-08-03 06:41:45 UTC (rev 265191)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm 2020-08-03 10:09:39 UTC (rev 265192)
@@ -243,45 +243,60 @@
m_hasStartedWriting = true;
}
-bool MediaRecorderPrivateWriter::appendCompressedAudioSampleBuffer()
+bool MediaRecorderPrivateWriter::appendCompressedAudioSampleBufferIfPossible()
{
if (!m_audioCompressor)
return false;
- if (![m_audioAssetWriterInput isReadyForMoreMediaData])
- return false;
-
auto buffer = m_audioCompressor->takeOutputSampleBuffer();
if (!buffer)
return false;
+ if (m_isFlushingSamples || ![m_videoAssetWriterInput isReadyForMoreMediaData]) {
+ m_pendingAudioSampleQueue.append(WTFMove(buffer));
+ return false;
+ }
+
+ while (!m_pendingAudioSampleQueue.isEmpty() && [m_videoAssetWriterInput isReadyForMoreMediaData])
+ [m_audioAssetWriterInput.get() appendSampleBuffer:m_pendingAudioSampleQueue.takeFirst().get()];
+
[m_audioAssetWriterInput.get() appendSampleBuffer:buffer.get()];
return true;
}
-bool MediaRecorderPrivateWriter::appendCompressedVideoSampleBuffer()
+bool MediaRecorderPrivateWriter::appendCompressedVideoSampleBufferIfPossible()
{
if (!m_videoCompressor)
return false;
- if (![m_videoAssetWriterInput isReadyForMoreMediaData])
- return false;
-
auto buffer = m_videoCompressor->takeOutputSampleBuffer();
if (!buffer)
return false;
- m_lastVideoPresentationTime = CMSampleBufferGetPresentationTimeStamp(buffer.get());
- m_lastVideoDecodingTime = CMSampleBufferGetDecodeTimeStamp(buffer.get());
- m_hasEncodedVideoSamples = true;
+ if (m_isFlushingSamples || ![m_videoAssetWriterInput isReadyForMoreMediaData]) {
+ m_pendingVideoSampleQueue.append(WTFMove(buffer));
+ return false;
+ }
- [m_videoAssetWriterInput.get() appendSampleBuffer:buffer.get()];
+ while (!m_pendingVideoSampleQueue.isEmpty() && [m_videoAssetWriterInput isReadyForMoreMediaData])
+ appendCompressedVideoSampleBuffer(m_pendingVideoSampleQueue.takeFirst().get());
+
+ appendCompressedVideoSampleBuffer(buffer.get());
return true;
}
+void MediaRecorderPrivateWriter::appendCompressedVideoSampleBuffer(CMSampleBufferRef buffer)
+{
+ m_lastVideoPresentationTime = CMSampleBufferGetPresentationTimeStamp(buffer);
+ m_lastVideoDecodingTime = CMSampleBufferGetDecodeTimeStamp(buffer);
+ m_hasEncodedVideoSamples = true;
+
+ [m_videoAssetWriterInput.get() appendSampleBuffer:buffer];
+}
+
void MediaRecorderPrivateWriter::appendCompressedSampleBuffers()
{
- while (appendCompressedVideoSampleBuffer() || appendCompressedAudioSampleBuffer()) { };
+ while (appendCompressedVideoSampleBufferIfPossible() || appendCompressedAudioSampleBufferIfPossible()) { };
}
static inline void appendEndsPreviousSampleDurationMarker(AVAssetWriterInput *assetWriterInput, CMTime presentationTimeStamp, CMTime decodingTimeStamp)
@@ -301,36 +316,58 @@
RELEASE_LOG_ERROR(MediaStream, "MediaRecorderPrivateWriter appendSampleBuffer to writer input failed");
}
-void MediaRecorderPrivateWriter::appendEndOfVideoSampleDurationIfNeeded(CompletionHandler<void()>&& completionHandler)
+void MediaRecorderPrivateWriter::flushCompressedSampleBuffers(CompletionHandler<void()>&& completionHandler)
{
- if (!m_hasEncodedVideoSamples) {
- completionHandler();
- return;
+ bool hasPendingAudioSamples = !m_pendingAudioSampleQueue.isEmpty();
+ bool hasPendingVideoSamples = !m_pendingVideoSampleQueue.isEmpty();
+
+ if (m_hasEncodedVideoSamples) {
+ hasPendingVideoSamples |= ![m_videoAssetWriterInput isReadyForMoreMediaData];
+ if (!hasPendingVideoSamples)
+ appendEndsPreviousSampleDurationMarker(m_videoAssetWriterInput.get(), m_lastVideoPresentationTime, m_lastVideoDecodingTime);
}
- if ([m_videoAssetWriterInput isReadyForMoreMediaData]) {
- appendEndsPreviousSampleDurationMarker(m_videoAssetWriterInput.get(), m_lastVideoPresentationTime, m_lastVideoDecodingTime);
+
+ if (!hasPendingAudioSamples && !hasPendingVideoSamples) {
completionHandler();
return;
}
- auto block = makeBlockPtr([this, weakThis = makeWeakPtr(this), completionHandler = WTFMove(completionHandler)]() mutable {
- if (weakThis) {
+ m_isFlushingSamples = true;
+ auto block = makeBlockPtr([this, weakThis = makeWeakPtr(*this), hasPendingAudioSamples, hasPendingVideoSamples, audioSampleQueue = WTFMove(m_pendingAudioSampleQueue), videoSampleQueue = WTFMove(m_pendingVideoSampleQueue), completionHandler = WTFMove(completionHandler)]() mutable {
+ if (!weakThis) {
+ completionHandler();
+ return;
+ }
+
+ while (!audioSampleQueue.isEmpty() && [m_audioAssetWriterInput isReadyForMoreMediaData])
+ [m_audioAssetWriterInput.get() appendSampleBuffer:audioSampleQueue.takeFirst().get()];
+
+ while (!videoSampleQueue.isEmpty() && [m_videoAssetWriterInput isReadyForMoreMediaData])
+ appendCompressedVideoSampleBuffer(videoSampleQueue.takeFirst().get());
+
+ if (!audioSampleQueue.isEmpty() || !videoSampleQueue.isEmpty())
+ return;
+
+ if (hasPendingAudioSamples)
+ [m_audioAssetWriterInput markAsFinished];
+ if (hasPendingVideoSamples) {
appendEndsPreviousSampleDurationMarker(m_videoAssetWriterInput.get(), m_lastVideoPresentationTime, m_lastVideoDecodingTime);
[m_videoAssetWriterInput markAsFinished];
}
+ m_isFlushingSamples = false;
completionHandler();
});
- [m_videoAssetWriterInput requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:block.get()];
-}
-void MediaRecorderPrivateWriter::flushCompressedSampleBuffers(CompletionHandler<void()>&& completionHandler)
-{
- appendCompressedSampleBuffers();
- appendEndOfVideoSampleDurationIfNeeded(WTFMove(completionHandler));
+ if (hasPendingAudioSamples)
+ [m_audioAssetWriterInput requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:block.get()];
+ if (hasPendingVideoSamples)
+ [m_videoAssetWriterInput requestMediaDataWhenReadyOnQueue:dispatch_get_main_queue() usingBlock:block.get()];
}
void MediaRecorderPrivateWriter::clear()
{
+ m_pendingAudioSampleQueue.clear();
+ m_pendingVideoSampleQueue.clear();
if (m_writer)
m_writer.clear();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes