Changeset 267366 in webkit

Timestamp:

Sep 21, 2020, 1:57:17 PM (6 years ago)

Author:

youenn@apple.com

Message:

[iOS] MediaRecorder incorrect screen orientation handling
​https://bugs.webkit.org/show_bug.cgi?id=198912
<rdar://problem/51802521>

Reviewed by Eric Carlson.

Source/WebCore:

Update MediaRecorderPrivateWriterCocoa to pass a MediaSample down to handle rotation.
Set AVAssetWriterInput transform according the first MediaSample rotation value.

Test: http/wpt/mediarecorder/video-rotation.html

• platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp:

(WebCore::MediaRecorderPrivateAVFImpl::videoSampleAvailable):

• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h:
• platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:

(WebCore::MediaRecorderPrivateWriter::appendVideoSampleBuffer):

Source/WebKit:

• GPUProcess/webrtc/RemoteMediaRecorder.cpp:

(WebKit::RemoteMediaRecorder::videoSampleAvailable):

LayoutTests:

• http/wpt/mediarecorder/video-rotation-expected.txt: Added.
• http/wpt/mediarecorder/video-rotation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/wpt/mediarecorder/video-rotation-expected.txt (added)
• LayoutTests/http/wpt/mediarecorder/video-rotation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp (modified) (1 diff)
• Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h (modified) (3 diffs)
• Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm (modified) (1 diff)
• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-09-21  Youenn Fablet  <youenn@apple.com>
+
+        [iOS] MediaRecorder incorrect screen orientation handling
+        https://bugs.webkit.org/show_bug.cgi?id=198912
+        <rdar://problem/51802521>
+
+        Reviewed by Eric Carlson.
+
+        * http/wpt/mediarecorder/video-rotation-expected.txt: Added.
+        * http/wpt/mediarecorder/video-rotation.html: Added.
+
 2020-09-20  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-21  Youenn Fablet  <youenn@apple.com>
+
+        [iOS] MediaRecorder incorrect screen orientation handling
+        https://bugs.webkit.org/show_bug.cgi?id=198912
+        <rdar://problem/51802521>
+
+        Reviewed by Eric Carlson.
+
+        Update MediaRecorderPrivateWriterCocoa to pass a MediaSample down to handle rotation.
+        Set AVAssetWriterInput transform according the first MediaSample rotation value.
+
+        Test: http/wpt/mediarecorder/video-rotation.html
+
+        * platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp:
+        (WebCore::MediaRecorderPrivateAVFImpl::videoSampleAvailable):
+        * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h:
+        * platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm:
+        (WebCore::MediaRecorderPrivateWriter::appendVideoSampleBuffer):
+
 2020-09-21  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/WebCore/platform/mediarecorder/MediaRecorderPrivateAVFImpl.cpp

@@ -71 +71 @@
 void MediaRecorderPrivateAVFImpl::videoSampleAvailable(MediaSample& sampleBuffer)
 {
-    m_writer->appendVideoSampleBuffer(sampleBuffer.platformSample().sample.cmSampleBuffer);
+    m_writer->appendVideoSampleBuffer(sampleBuffer);
 }
 

trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.h

@@ -57 +57 @@
 class AudioSampleBufferCompressor;
 class AudioStreamDescription;
+class MediaSample;
 class MediaStreamTrackPrivate;
 class PlatformAudioData;
@@ -67 +68 @@
     ~MediaRecorderPrivateWriter();
 
-    void appendVideoSampleBuffer(CMSampleBufferRef);
+    void appendVideoSampleBuffer(MediaSample&);
     void appendAudioSampleBuffer(const PlatformAudioData&, const AudioStreamDescription&, const WTF::MediaTime&, size_t);
     void stopRecording();
@@ -130 +131 @@
     bool m_isFlushingSamples { false };
     bool m_shouldStopAfterFlushingSamples { false };
+    bool m_firstVideoFrame { false };
 };
 

trunk/Source/WebCore/platform/mediarecorder/cocoa/MediaRecorderPrivateWriterCocoa.mm

@@ -422 +422 @@
 }
 
-void MediaRecorderPrivateWriter::appendVideoSampleBuffer(CMSampleBufferRef sampleBuffer)
-{
+void MediaRecorderPrivateWriter::appendVideoSampleBuffer(MediaSample& sample)
+{
+    if (!m_firstVideoFrame) {
+        m_firstVideoFrame = true;
+        if (sample.videoRotation() != MediaSample::VideoRotation::None || sample.videoMirrored()) {
+            auto videoTransform = CGAffineTransformMakeRotation(static_cast<int>(sample.videoRotation()) * M_PI / 180);
+            if (sample.videoMirrored())
+                videoTransform = CGAffineTransformScale(videoTransform, -1, 1);
+            m_videoAssetWriterInput.get().transform = videoTransform;
+        }
+    }
     // FIXME: We should not set the timestamps if they are already set.
-    if (auto bufferWithCurrentTime = copySampleBufferWithCurrentTimeStamp(sampleBuffer))
+    if (auto bufferWithCurrentTime = copySampleBufferWithCurrentTimeStamp(sample.platformSample().sample.cmSampleBuffer))
         m_videoCompressor->addSampleBuffer(bufferWithCurrentTime.get());
 }

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-21  Youenn Fablet  <youenn@apple.com>
+
+        [iOS] MediaRecorder incorrect screen orientation handling
+        https://bugs.webkit.org/show_bug.cgi?id=198912
+        <rdar://problem/51802521>
+
+        Reviewed by Eric Carlson.
+
+        * GPUProcess/webrtc/RemoteMediaRecorder.cpp:
+        (WebKit::RemoteMediaRecorder::videoSampleAvailable):
+
 2020-09-21  Keith Miller  <keith_miller@apple.com>
 

trunk/Source/WebKit/GPUProcess/webrtc/RemoteMediaRecorder.cpp

@@ -119 +119 @@
     }
 
-    m_writer->appendVideoSampleBuffer(sampleBuffer->platformSample().sample.cmSampleBuffer);
+    m_writer->appendVideoSampleBuffer(*sampleBuffer);
 }