Diff
Modified: trunk/Source/WebCore/ChangeLog (286648 => 286649)
--- trunk/Source/WebCore/ChangeLog 2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebCore/ChangeLog 2021-12-08 10:08:35 UTC (rev 286649)
@@ -1,3 +1,17 @@
+2021-12-08 Myles C. Maxfield <[email protected]>
+
+ [MacCatalyst] Various build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=233995
+
+ Unreviewed.
+
+ No new tests because there is no behavior change.
+
+ * Modules/speech/cocoa/SpeechRecognizerCocoa.mm:
+ (WebCore::SpeechRecognizer::dataCaptured):
+ * platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm:
+ (WebCore::AudioSampleBufferCompressor::processSampleBuffersUntilLowWaterTime):
+
2021-12-08 Philippe Normand <[email protected]>
[GStreamer] Enable mediaSourceInlinePainting
Modified: trunk/Source/WebCore/Modules/speech/cocoa/SpeechRecognizerCocoa.mm (286648 => 286649)
--- trunk/Source/WebCore/Modules/speech/cocoa/SpeechRecognizerCocoa.mm 2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebCore/Modules/speech/cocoa/SpeechRecognizerCocoa.mm 2021-12-08 10:08:35 UTC (rev 286649)
@@ -34,6 +34,7 @@
#import "WebSpeechRecognizerTaskMock.h"
#import <Speech/Speech.h>
#import <pal/avfoundation/MediaTimeAVFoundation.h>
+#import <pal/cf/CoreMediaSoftLink.h>
namespace WebCore {
@@ -41,7 +42,7 @@
{
auto buffer = createAudioSampleBuffer(data, description, m_currentAudioSampleTime, sampleCount);
[m_task audioSamplesAvailable:buffer.get()];
- m_currentAudioSampleTime = CMTimeAdd(m_currentAudioSampleTime, PAL::toCMTime(MediaTime(sampleCount, description.sampleRate())));
+ m_currentAudioSampleTime = PAL::CMTimeAdd(m_currentAudioSampleTime, PAL::toCMTime(MediaTime(sampleCount, description.sampleRate())));
}
bool SpeechRecognizer::startRecognition(bool mockSpeechRecognitionEnabled, SpeechRecognitionConnectionClientIdentifier identifier, const String& localeIdentifier, bool continuous, bool interimResults, uint64_t alternatives)
Modified: trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm (286648 => 286649)
--- trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm 2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebCore/platform/mediarecorder/cocoa/AudioSampleBufferCompressor.mm 2021-12-08 10:08:35 UTC (rev 286649)
@@ -491,10 +491,10 @@
}
CMTime nativeDuration = CMSampleBufferGetDuration(buffer.get());
- m_currentNativePresentationTimeStamp = CMTimeAdd(m_currentNativePresentationTimeStamp, nativeDuration);
+ m_currentNativePresentationTimeStamp = PAL::CMTimeAdd(m_currentNativePresentationTimeStamp, nativeDuration);
CMTime outputDuration = CMSampleBufferGetOutputDuration(buffer.get());
- m_currentOutputPresentationTimeStamp = CMTimeAdd(m_currentOutputPresentationTimeStamp, outputDuration);
+ m_currentOutputPresentationTimeStamp = PAL::CMTimeAdd(m_currentOutputPresentationTimeStamp, outputDuration);
error = CMBufferQueueEnqueue(m_outputBufferQueue.get(), buffer.get());
if (error) {
Modified: trunk/Source/WebKit/ChangeLog (286648 => 286649)
--- trunk/Source/WebKit/ChangeLog 2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebKit/ChangeLog 2021-12-08 10:08:35 UTC (rev 286649)
@@ -1,3 +1,13 @@
+2021-12-08 Myles C. Maxfield <[email protected]>
+
+ [MacCatalyst] Various build fixes
+ https://bugs.webkit.org/show_bug.cgi?id=233995
+
+ Unreviewed.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::mediaRelatedMachServices):
+
2021-12-07 Aditya Keerthi <[email protected]>
[iOS] Add initial support for find-in-page SPI
Modified: trunk/Source/WebKit/UIProcess/WebPageProxy.cpp (286648 => 286649)
--- trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-12-08 09:54:25 UTC (rev 286648)
+++ trunk/Source/WebKit/UIProcess/WebPageProxy.cpp 2021-12-08 10:08:35 UTC (rev 286649)
@@ -8131,7 +8131,7 @@
"com.apple.audio.audiohald"_s, "com.apple.audio.SandboxHelper"_s, "com.apple.coremedia.endpointstream.xpc"_s, "com.apple.coremedia.endpointplaybacksession.xpc"_s,
"com.apple.coremedia.endpointremotecontrolsession.xpc"_s, "com.apple.coremedia.videodecoder"_s,
"com.apple.coremedia.videoencoder"_s, "com.apple.lskdd"_s, "com.apple.trustd.agent"_s,
-#if __MAC_OS_X_VERSION_MIN_REQUIRED > 120000
+#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED > 120000
"com.apple.coremedia.samplebufferconsumer.xpc"_s,
#endif
#endif
