Changeset 240000 in webkit

Timestamp:

Jan 15, 2019 1:21:02 PM (5 years ago)

Author:

youenn@apple.com

Message:

Correctly handle rotation for local video playback
​https://bugs.webkit.org/show_bug.cgi?id=193412

Reviewed by Eric Carlson.

Update AVVideoCaptureSource to compute the size given to settings after rotating the sample.
This ensures computing the size of video elements appropriately.
Also makes sure to notify observers of size change whenever rotation happens as settings() call will provide a different size.
Covered by manual testing as we do not have yet emulation of local capture with rotation.

• platform/mediastream/RealtimeMediaSource.cpp:

(WebCore::RealtimeMediaSource::setIntrinsicSize):

• platform/mediastream/mac/AVVideoCaptureSource.mm:

(WebCore::AVVideoCaptureSource::settings):
(WebCore::AVVideoCaptureSource::computeSampleRotation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mediastream/RealtimeMediaSource.cpp (modified) (1 diff)
• platform/mediastream/mac/AVVideoCaptureSource.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-01-15  Youenn Fablet  <youenn@apple.com>
+
+        Correctly handle rotation for local video playback
+        https://bugs.webkit.org/show_bug.cgi?id=193412
+
+        Reviewed by Eric Carlson.
+
+        Update AVVideoCaptureSource to compute the size given to settings after rotating the sample.
+        This ensures computing the size of video elements appropriately.
+        Also makes sure to notify observers of size change whenever rotation happens as settings() call will provide a different size.
+        Covered by manual testing as we do not have yet emulation of local capture with rotation.
+
+        * platform/mediastream/RealtimeMediaSource.cpp:
+        (WebCore::RealtimeMediaSource::setIntrinsicSize):
+        * platform/mediastream/mac/AVVideoCaptureSource.mm:
+        (WebCore::AVVideoCaptureSource::settings):
+        (WebCore::AVVideoCaptureSource::computeSampleRotation):
+
 2019-01-15  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp

@@ -891 +891 @@
         return;
 
+    auto currentSize = this->size();
     m_intrinsicSize = size;
 
-    if (m_intrinsicSize != m_size)
+    if (currentSize != this->size())
         notifySettingsDidChangeObservers({ RealtimeMediaSourceSettings::Flag::Width, RealtimeMediaSourceSettings::Flag::Height });
 }

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

@@ -261 +261 @@
 
     settings.setFrameRate(frameRate());
-    auto& size = this->size();
+
+    auto size = this->size();
+    if (m_sampleRotation == MediaSample::VideoRotation::Left || m_sampleRotation == MediaSample::VideoRotation::Right)
+        size = size.transposedSize();
+    
     settings.setWidth(size.width());
     settings.setHeight(size.height());
@@ -502 +506 @@
 {
     bool frontCamera = [device() position] == AVCaptureDevicePositionFront;
+    MediaSample::VideoRotation sampleRotation;
     switch (m_sensorOrientation - m_deviceOrientation) {
     case 0:
-        m_sampleRotation = MediaSample::VideoRotation::None;
+        sampleRotation = MediaSample::VideoRotation::None;
         break;
     case 180:
     case -180:
-        m_sampleRotation = MediaSample::VideoRotation::UpsideDown;
+        sampleRotation = MediaSample::VideoRotation::UpsideDown;
         break;
     case 90:
-        m_sampleRotation = frontCamera ? MediaSample::VideoRotation::Left : MediaSample::VideoRotation::Right;
+        sampleRotation = frontCamera ? MediaSample::VideoRotation::Left : MediaSample::VideoRotation::Right;
         break;
     case -90:
     case -270:
-        m_sampleRotation = frontCamera ? MediaSample::VideoRotation::Right : MediaSample::VideoRotation::Left;
+        sampleRotation = frontCamera ? MediaSample::VideoRotation::Right : MediaSample::VideoRotation::Left;
         break;
     default:
         ASSERT_NOT_REACHED();
-        m_sampleRotation = MediaSample::VideoRotation::None;
-    }
+        sampleRotation = MediaSample::VideoRotation::None;
+    }
+    if (sampleRotation == m_sampleRotation)
+        return;
+
+    m_sampleRotation = sampleRotation;
+    notifySettingsDidChangeObservers({ RealtimeMediaSourceSettings::Flag::Width, RealtimeMediaSourceSettings::Flag::Height });
 }