Changeset 245033 in webkit

Timestamp:

May 7, 2019 2:07:00 PM (5 years ago)

Author:

youenn@apple.com

Message:

Video stream freeze on front camera orientation changing
​https://bugs.webkit.org/show_bug.cgi?id=197227
<rdar://problem/50175498>

Reviewed by Eric Carlson.

Source/WebCore:

Use m_currentRotationSessionAngle instead of m_currentRotation to create or not a new rotation session.
Covered by updated test.

• platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h:
• platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm:

(WebCore::RealtimeOutgoingVideoSourceCocoa::rotatePixelBuffer):

LayoutTests:

• webrtc/video-rotation-expected.txt:
• webrtc/video-rotation.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/webrtc/video-rotation-expected.txt (modified) (1 diff)
• LayoutTests/webrtc/video-rotation.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h (modified) (1 diff)
• Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2019-05-07  Youenn Fablet  <youenn@apple.com>
+
+        Video stream freeze on front camera orientation changing
+        https://bugs.webkit.org/show_bug.cgi?id=197227
+        <rdar://problem/50175498>
+
+        Reviewed by Eric Carlson.
+
+        * webrtc/video-rotation-expected.txt:
+        * webrtc/video-rotation.html:
+
 2019-05-07  Brent Fulgham  <bfulgham@apple.com>
 

trunk/LayoutTests/webrtc/video-rotation-expected.txt

@@ -4 +4 @@
 PASS Track is enabled, video should not be black 
 PASS Track is enabled and rotated, video should not be black and should change size 
+PASS Track is enabled and rotated again, video should not be black and should change size 
 

trunk/LayoutTests/webrtc/video-rotation.html

@@ -87 +87 @@
     });
 }, "Track is enabled and rotated, video should not be black and should change size");
+
+promise_test((test) => {
+    if (window.internals)
+        window.internals.setCameraMediaStreamTrackOrientation(track, 180);
+
+    return checkVideoBlack(false, "canvas1").then(() => {
+        return waitForVideoSize(video, 320, 240);
+    });
+}, "Track is enabled and rotated again, video should not be black and should change size");
         </script>
     </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-05-07  Youenn Fablet  <youenn@apple.com>
+
+        Video stream freeze on front camera orientation changing
+        https://bugs.webkit.org/show_bug.cgi?id=197227
+        <rdar://problem/50175498>
+
+        Reviewed by Eric Carlson.
+
+        Use m_currentRotationSessionAngle instead of m_currentRotation to create or not a new rotation session.
+        Covered by updated test.
+
+        * platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h:
+        * platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm:
+        (WebCore::RealtimeOutgoingVideoSourceCocoa::rotatePixelBuffer):
+
 2019-05-07  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.h

@@ -55 +55 @@
     RetainPtr<VTImageRotationSessionRef> m_rotationSession;
     RetainPtr<CVPixelBufferPoolRef> m_rotationPool;
-    webrtc::VideoRotation m_currentRotationAngle { webrtc::kVideoRotation_0 };
+    webrtc::VideoRotation m_currentRotationSessionAngle { webrtc::kVideoRotation_0 };
     size_t m_rotatedWidth { 0 };
     size_t m_rotatedHeight { 0 };

trunk/Source/WebCore/platform/mediastream/mac/RealtimeOutgoingVideoSourceCocoa.mm

@@ -72 +72 @@
         return pixelBuffer;
 
-    if (!m_rotationSession || rotation != m_currentRotation) {
+    if (!m_rotationSession || rotation != m_currentRotationSessionAngle) {
         VTImageRotationSessionRef rawRotationSession = nullptr;
         auto status = VTImageRotationSessionCreate(kCFAllocatorDefault, rotation, &rawRotationSession);
@@ -81 +81 @@
 
         m_rotationSession = adoptCF(rawRotationSession);
-        m_currentRotation = rotation;
+        m_currentRotationSessionAngle = rotation;
 
         VTImageRotationSessionSetProperty(rawRotationSession, kVTImageRotationPropertyKey_EnableHighSpeedTransfer, kCFBooleanTrue);