Diff
Modified: trunk/Source/WebCore/ChangeLog (290732 => 290733)
--- trunk/Source/WebCore/ChangeLog 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebCore/ChangeLog 2022-03-02 17:07:39 UTC (rev 290733)
@@ -1,3 +1,25 @@
+2022-03-02 Youenn Fablet <[email protected]>
+
+ Rename MediaSampleAVFObjC::createImageSample to MediaSampleAVFObjC::createFromPixelBuffer
+ https://bugs.webkit.org/show_bug.cgi?id=237354
+
+ Reviewed by Eric Carlson.
+
+ No change of behavior, this is a renaming.
+
+ * html/HTMLCanvasElement.cpp:
+ (WebCore::HTMLCanvasElement::toMediaSample):
+ * platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h:
+ (WebCore::MediaSampleAVFObjC::createFromPixelBuffer):
+ (WebCore::MediaSampleAVFObjC::createImageSample): Deleted.
+ * platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm:
+ (WebCore::MediaSampleAVFObjC::createFromPixelBuffer):
+ (WebCore::MediaSampleAVFObjC::createImageSample): Deleted.
+ * platform/graphics/cocoa/GraphicsContextGLCocoa.mm:
+ (WebCore::GraphicsContextGLCocoa::paintCompositedResultsToMediaSample):
+ * platform/mediastream/RealtimeVideoSource.cpp:
+ (WebCore::RealtimeVideoSource::adaptVideoSample):
+
2022-03-02 Antoine Quint <[email protected]>
[web-animations] changes to font-size should recompute keyframes
Modified: trunk/Source/WebCore/html/HTMLCanvasElement.cpp (290732 => 290733)
--- trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebCore/html/HTMLCanvasElement.cpp 2022-03-02 17:07:39 UTC (rev 290733)
@@ -798,7 +798,7 @@
return nullptr;
#if PLATFORM(COCOA)
- return MediaSampleAVFObjC::createImageSample(WTFMove(*pixelBuffer));
+ return MediaSampleAVFObjC::createFromPixelBuffer(WTFMove(*pixelBuffer));
#elif USE(GSTREAMER)
return MediaSampleGStreamer::createImageSample(WTFMove(*pixelBuffer));
#endif
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h (290732 => 290733)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.h 2022-03-02 17:07:39 UTC (rev 290733)
@@ -44,8 +44,8 @@
static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, uint64_t trackID) { return adoptRef(*new MediaSampleAVFObjC(sample, trackID)); }
static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, AtomString trackID) { return adoptRef(*new MediaSampleAVFObjC(sample, trackID)); }
static Ref<MediaSampleAVFObjC> create(CMSampleBufferRef sample, VideoRotation rotation = VideoRotation::None, bool mirrored = false) { return adoptRef(*new MediaSampleAVFObjC(sample, rotation, mirrored)); }
- static RefPtr<MediaSampleAVFObjC> createImageSample(PixelBuffer&&);
- WEBCORE_EXPORT static RefPtr<MediaSampleAVFObjC> createImageSample(RetainPtr<CVPixelBufferRef>&&, VideoRotation, bool mirrored, MediaTime presentationTime = { }, MediaTime decodingTime = { });
+ static RefPtr<MediaSampleAVFObjC> createFromPixelBuffer(PixelBuffer&&);
+ WEBCORE_EXPORT static RefPtr<MediaSampleAVFObjC> createFromPixelBuffer(RetainPtr<CVPixelBufferRef>&&, VideoRotation, bool mirrored, MediaTime presentationTime = { }, MediaTime decodingTime = { });
WEBCORE_EXPORT static void setAsDisplayImmediately(MediaSample&);
static RetainPtr<CMSampleBufferRef> cloneSampleBufferAndSetAsDisplayImmediately(CMSampleBufferRef);
Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm (290732 => 290733)
--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaSampleAVFObjC.mm 2022-03-02 17:07:39 UTC (rev 290733)
@@ -75,7 +75,7 @@
MediaSampleAVFObjC::~MediaSampleAVFObjC() = default;
-RefPtr<MediaSampleAVFObjC> MediaSampleAVFObjC::createImageSample(PixelBuffer&& pixelBuffer)
+RefPtr<MediaSampleAVFObjC> MediaSampleAVFObjC::createFromPixelBuffer(PixelBuffer&& pixelBuffer)
{
auto size = pixelBuffer.size();
auto width = size.width();
@@ -98,10 +98,10 @@
return nullptr;
}
ASSERT_UNUSED(status, !status);
- return createImageSample(WTFMove(cvPixelBuffer), VideoRotation::None, false);
+ return createFromPixelBuffer(WTFMove(cvPixelBuffer), VideoRotation::None, false);
}
-RefPtr<MediaSampleAVFObjC> MediaSampleAVFObjC::createImageSample(RetainPtr<CVPixelBufferRef>&& pixelBuffer, VideoRotation rotation, bool mirrored, MediaTime presentationTime, MediaTime decodingTime)
+RefPtr<MediaSampleAVFObjC> MediaSampleAVFObjC::createFromPixelBuffer(RetainPtr<CVPixelBufferRef>&& pixelBuffer, VideoRotation rotation, bool mirrored, MediaTime presentationTime, MediaTime decodingTime)
{
CMVideoFormatDescriptionRef formatDescriptionRaw = nullptr;
auto status = PAL::CMVideoFormatDescriptionCreateForImageBuffer(kCFAllocatorDefault, pixelBuffer.get(), &formatDescriptionRaw);
Modified: trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm (290732 => 290733)
--- trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebCore/platform/graphics/cocoa/GraphicsContextGLCocoa.mm 2022-03-02 17:07:39 UTC (rev 290733)
@@ -768,7 +768,7 @@
return nullptr;
if (m_resourceOwner)
setOwnershipIdentityForCVPixelBuffer(mediaSamplePixelBuffer.get(), m_resourceOwner);
- return MediaSampleAVFObjC::createImageSample(WTFMove(mediaSamplePixelBuffer), MediaSampleAVFObjC::VideoRotation::None, false);
+ return MediaSampleAVFObjC::createFromPixelBuffer(WTFMove(mediaSamplePixelBuffer), MediaSampleAVFObjC::VideoRotation::None, false);
}
#endif
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp (290732 => 290733)
--- trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp 2022-03-02 17:07:39 UTC (rev 290733)
@@ -172,7 +172,7 @@
{
if (sample.platformSample().type != PlatformSample::CMSampleBufferType) {
// FIXME: Support more efficiently downsampling of remote video frames by downsampling in GPUProcess.
- auto newSample = MediaSampleAVFObjC::createImageSample(sample.pixelBuffer(), sample.videoRotation(), sample.videoMirrored(), sample.presentationTime(), { });
+ auto newSample = MediaSampleAVFObjC::createFromPixelBuffer(sample.pixelBuffer(), sample.videoRotation(), sample.videoMirrored(), sample.presentationTime(), { });
if (!newSample)
return nullptr;
return adaptVideoSample(*newSample);
Modified: trunk/Source/WebKit/ChangeLog (290732 => 290733)
--- trunk/Source/WebKit/ChangeLog 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebKit/ChangeLog 2022-03-02 17:07:39 UTC (rev 290733)
@@ -1,3 +1,19 @@
+2022-03-02 Youenn Fablet <[email protected]>
+
+ Rename MediaSampleAVFObjC::createImageSample to MediaSampleAVFObjC::createFromPixelBuffer
+ https://bugs.webkit.org/show_bug.cgi?id=237354
+
+ Reviewed by Eric Carlson.
+
+ * GPUProcess/webrtc/LibWebRTCCodecsProxy.mm:
+ (WebKit::LibWebRTCCodecsProxy::createDecoderCallback):
+ * UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp:
+ (WebKit::UserMediaCaptureManagerProxy::SourceProxy::rotateVideoFrameIfNeeded):
+ * WebProcess/GPU/webrtc/SharedVideoFrame.cpp:
+ (WebKit::SharedVideoFrameReader::read):
+ * WebProcess/cocoa/RemoteCaptureSampleManager.cpp:
+ (WebKit::RemoteCaptureSampleManager::RemoteVideo::videoSampleAvailable):
+
2022-03-02 Kimmo Kinnunen <[email protected]>
IPC_TESTING_API MessageArgumentDescriptions.cpp is slow to compile
Modified: trunk/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm (290732 => 290733)
--- trunk/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebKit/GPUProcess/webrtc/LibWebRTCCodecsProxy.mm 2022-03-02 17:07:39 UTC (rev 290733)
@@ -98,7 +98,7 @@
if (useRemoteFrames)
videoFrameObjectHeap = m_videoFrameObjectHeap.ptr();
return [identifier, connection = m_connection, resourceOwner = m_resourceOwner, videoFrameObjectHeap = WTFMove(videoFrameObjectHeap)] (CVPixelBufferRef pixelBuffer, uint32_t timeStampNs, uint32_t timeStamp) mutable {
- auto sample = WebCore::MediaSampleAVFObjC::createImageSample(pixelBuffer, WebCore::MediaSample::VideoRotation::None, false, MediaTime(timeStampNs, 1), { });
+ auto sample = WebCore::MediaSampleAVFObjC::createFromPixelBuffer(pixelBuffer, WebCore::MediaSample::VideoRotation::None, false, MediaTime(timeStampNs, 1), { });
if (!sample)
return;
if (resourceOwner)
Modified: trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp (290732 => 290733)
--- trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebKit/UIProcess/Cocoa/UserMediaCaptureManagerProxy.cpp 2022-03-02 17:07:39 UTC (rev 290733)
@@ -190,7 +190,7 @@
{
if (m_shouldApplyRotation && sample.videoRotation() != MediaSample::VideoRotation::None) {
auto pixelBuffer = rotatePixelBuffer(sample);
- return MediaSampleAVFObjC::createImageSample(WTFMove(pixelBuffer), MediaSample::VideoRotation::None, sample.videoMirrored(), sample.presentationTime(), sample.decodeTime());
+ return MediaSampleAVFObjC::createFromPixelBuffer(WTFMove(pixelBuffer), MediaSample::VideoRotation::None, sample.videoMirrored(), sample.presentationTime(), sample.decodeTime());
}
return &sample;
}
Modified: trunk/Source/WebKit/WebProcess/GPU/webrtc/SharedVideoFrame.cpp (290732 => 290733)
--- trunk/Source/WebKit/WebProcess/GPU/webrtc/SharedVideoFrame.cpp 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebKit/WebProcess/GPU/webrtc/SharedVideoFrame.cpp 2022-03-02 17:07:39 UTC (rev 290733)
@@ -202,7 +202,7 @@
if (!pixelBuffer)
return nullptr;
- return MediaSampleAVFObjC::createImageSample(WTFMove(pixelBuffer), sharedVideoFrame.rotation, sharedVideoFrame.mirrored, sharedVideoFrame.time);
+ return MediaSampleAVFObjC::createFromPixelBuffer(WTFMove(pixelBuffer), sharedVideoFrame.rotation, sharedVideoFrame.mirrored, sharedVideoFrame.time);
}
CVPixelBufferPoolRef SharedVideoFrameReader::pixelBufferPool(const SharedVideoFrameInfo& info)
Modified: trunk/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp (290732 => 290733)
--- trunk/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp 2022-03-02 16:59:40 UTC (rev 290732)
+++ trunk/Source/WebKit/WebProcess/cocoa/RemoteCaptureSampleManager.cpp 2022-03-02 17:07:39 UTC (rev 290733)
@@ -266,7 +266,7 @@
return;
}
- auto videoFrame = MediaSampleAVFObjC::createImageSample(WTFMove(pixelBuffer), remoteSample.rotation(), remoteSample.mirrored(), remoteSample.time());
+ auto videoFrame = MediaSampleAVFObjC::createFromPixelBuffer(WTFMove(pixelBuffer), remoteSample.rotation(), remoteSample.mirrored(), remoteSample.time());
if (!videoFrame) {
ASSERT_NOT_REACHED();
return;
