Use RotateDesktopFrame in DirectX capturer

webrtc/modules/desktop_capture/win/dxgi_output_duplicator.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/modules/desktop_capture/win/dxgi_output_duplicator.h"
 
 #include <string.h>
 
 #include <unknwn.h>
+#include <DXGI.h>
 #include <DXGIFormat.h>
 #include <Windows.h>
 
 #include <algorithm>
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/desktop_capture/win/dxgi_texture_mapping.h"
 #include "webrtc/modules/desktop_capture/win/dxgi_texture_staging.h"
 
 namespace webrtc {
 
 using Microsoft::WRL::ComPtr;
 
 namespace {
 
 // Timeout for AcquireNextFrame() call.
 const int kAcquireTimeoutMs = 10;
 
 DesktopRect RECTToDesktopRect(const RECT& rect) {
   return DesktopRect::MakeLTRB(rect.left, rect.top, rect.right, rect.bottom);
 }
 
+Rotation DXGI_MODE_ROTATIONToRotation(DXGI_MODE_ROTATION rotation) {

[Sergey Ulanov, 2016/11/28 23:12:35]

Call it DxgiRotationToRotation()?

[Hzj_jie, 2016/11/29 01:21:39]

Done.

+  switch (rotation) {
+    case DXGI_MODE_ROTATION_IDENTITY:
+    case DXGI_MODE_ROTATION_UNSPECIFIED:
+      return Rotation::CLOCK_WISE_0;
+    case DXGI_MODE_ROTATION_ROTATE90:
+      return Rotation::CLOCK_WISE_90;
+    case DXGI_MODE_ROTATION_ROTATE180:
+      return Rotation::CLOCK_WISE_180;
+    case DXGI_MODE_ROTATION_ROTATE270:
+      return Rotation::CLOCK_WISE_270;
+  }
+
+  RTC_NOTREACHED();
+  return Rotation::CLOCK_WISE_0;
+}
+
+// Translates |rect| with the reverse of |offset|
+DesktopRect ReverseTranslate(DesktopRect rect, DesktopVector offset) {
+  rect.Translate(-offset.x(), -offset.y());

[Sergey Ulanov, 2016/11/28 23:12:35]

nit: This could be expressed Translate(DesktopVector().subtract(offset)), and
then this function won't be needed. But feel free to keep it if you think it's
more readable this way.

[Hzj_jie, 2016/11/29 01:21:39]

Acknowledged.

+  return rect;
+}
+
 }  // namespace
 
 DxgiOutputDuplicator::DxgiOutputDuplicator(const D3dDevice& device,
                                            const ComPtr<IDXGIOutput1>& output,
                                            const DXGI_OUTPUT_DESC& desc)
     : device_(device),
       output_(output),
       desktop_rect_(RECTToDesktopRect(desc.DesktopCoordinates)) {
   RTC_DCHECK(output_);
   RTC_DCHECK(!desktop_rect_.is_empty());
   RTC_DCHECK(desktop_rect_.left() >= 0 && desktop_rect_.top() >= 0);
 }
 
 DxgiOutputDuplicator::DxgiOutputDuplicator(DxgiOutputDuplicator&& other) =
     default;
 
 DxgiOutputDuplicator::~DxgiOutputDuplicator() {
   if (duplication_) {
     duplication_->ReleaseFrame();
   }
   texture_.reset();
 }
 
 bool DxgiOutputDuplicator::Initialize() {
   if (DuplicateOutput()) {
+    DesktopSize unrotated_size =
+        RotateSize(desktop_rect().size(), reverse_rotation_);
     if (desc_.DesktopImageInSystemMemory) {
-      texture_.reset(new DxgiTextureMapping(desktop_rect_, duplication_.Get()));
+      texture_.reset(new DxgiTextureMapping(
+          unrotated_size, duplication_.Get()));
     } else {
-      texture_.reset(new DxgiTextureStaging(desktop_rect_, device_));
+      texture_.reset(new DxgiTextureStaging(unrotated_size, device_));
     }
     return true;
   } else {
     duplication_.Reset();
     return false;
   }
 }
 
 bool DxgiOutputDuplicator::DuplicateOutput() {
   RTC_DCHECK(!duplication_);
@@ skipping 19 matching lines @@
   if (static_cast<int>(desc_.ModeDesc.Width) != desktop_rect_.width() ||
       static_cast<int>(desc_.ModeDesc.Height) != desktop_rect_.height()) {
     LOG(LS_ERROR) << "IDXGIDuplicateOutput does not return a same size as its "
                      "IDXGIOutput1, size returned by IDXGIDuplicateOutput is "
                   << desc_.ModeDesc.Width << " x " << desc_.ModeDesc.Height
                   << ", size returned by IDXGIOutput1 is "
                   << desktop_rect_.width() << " x " << desktop_rect_.height();
     return false;
   }
 
+  rotation_ = DXGI_MODE_ROTATIONToRotation(desc_.Rotation);
+  reverse_rotation_ = ReverseRotation(rotation_);
+  unrotated_size_ = RotateSize(desktop_rect_.size(), reverse_rotation_);
+
   return true;
 }
 
 bool DxgiOutputDuplicator::ReleaseFrame() {
   RTC_DCHECK(duplication_);
   _com_error error = duplication_->ReleaseFrame();
   if (error.Error() != S_OK) {
     LOG(LS_ERROR) << "Failed to release frame from IDXGIOutputDuplication, "
                      "error"
                   << error.ErrorMessage() << ", code " << error.Error();
@@ skipping 18 matching lines @@
   memset(&frame_info, 0, sizeof(frame_info));
   ComPtr<IDXGIResource> resource;
   _com_error error = duplication_->AcquireNextFrame(
       kAcquireTimeoutMs, &frame_info, resource.GetAddressOf());
   if (error.Error() != S_OK && error.Error() != DXGI_ERROR_WAIT_TIMEOUT) {
     LOG(LS_ERROR) << "Failed to capture frame, error " << error.ErrorMessage()
                   << ", code " << error.Error();
     return false;
   }
 
-  // We need to merge updated region with the one from last frame, since current
-  // frame contains the content one frame before. Note, this is for double
-  // buffering implementation, as what we have in ScreenCapturerWinDirectx. If
-  // a consumer uses single buffering, we should clear context->updated_region
-  // after it has been merged to updated_region.
+  // We need to merge updated region with the one from context, but only spread
+  // updated region from current frame. So keeps a copy of updated region from
+  // context here.
   DesktopRegion updated_region;
   updated_region.Swap(&context->updated_region);
   if (error.Error() == S_OK &&
       frame_info.AccumulatedFrames > 0 &&
       resource) {
     DetectUpdatedRegion(frame_info, offset, &context->updated_region);
-    if (!texture_->CopyFrom(frame_info, resource.Get(),
-                            context->updated_region)) {
+    if (!texture_->CopyFrom(frame_info, resource.Get())) {
       return false;
     }
     SpreadContextChange(context);
     updated_region.AddRegion(context->updated_region);
 
     const DesktopFrame& source = texture_->AsDesktopFrame();
-    for (DesktopRegion::Iterator it(updated_region); !it.IsAtEnd();
-         it.Advance()) {
-      target->CopyPixelsFrom(
-          source, SourceRect(it.rect()).top_left(), it.rect());
+    if (rotation_ != Rotation::CLOCK_WISE_0) {
+      for (DesktopRegion::Iterator it(updated_region); !it.IsAtEnd();
+           it.Advance()) {
+        const DesktopRect source_rect =
+            RotateRect(ReverseTranslate(it.rect(), offset),
+                       desktop_rect().size(), reverse_rotation_);
+        RotateDesktopFrame(source,
+                           source_rect,

[Sergey Ulanov, 2016/11/28 23:12:35]

"git cl format" please. It will put multiple args per line.

[Hzj_jie, 2016/11/29 01:21:39]

Done.

+                           rotation_,
+                           offset,
+                           target);
+      }
+    } else {
+      for (DesktopRegion::Iterator it(updated_region); !it.IsAtEnd();
+           it.Advance()) {
+        target->CopyPixelsFrom(
+            source, ReverseTranslate(it.rect(), offset).top_left(), it.rect());
+      }
     }
     last_frame_ = target->Share();
     last_frame_offset_ = offset;
     target->mutable_updated_region()->AddRegion(updated_region);
     return texture_->Release() && ReleaseFrame();
   }
 
   if (last_frame_) {
     // No change since last frame or AcquireNextFrame() timed out, we will
     // export last frame to the target.
@@ skipping 33 matching lines @@
     DesktopRegion* updated_region) {
   RTC_DCHECK(updated_region);
   updated_region->Clear();
   if (frame_info.TotalMetadataBufferSize == 0) {
     // This should not happen, since frame_info.AccumulatedFrames > 0.
     LOG(LS_ERROR) << "frame_info.AccumulatedFrames > 0, "
                      "but TotalMetadataBufferSize == 0";
     return false;
   }
 
-  if (metadata.capacity() < frame_info.TotalMetadataBufferSize) {
-    metadata.clear();  // Avoid data copy
-    metadata.reserve(frame_info.TotalMetadataBufferSize);
+  if (metadata_.capacity() < frame_info.TotalMetadataBufferSize) {
+    metadata_.clear();  // Avoid data copy
+    metadata_.reserve(frame_info.TotalMetadataBufferSize);
   }
 
   UINT buff_size = 0;
   DXGI_OUTDUPL_MOVE_RECT* move_rects =
-      reinterpret_cast<DXGI_OUTDUPL_MOVE_RECT*>(metadata.data());
+      reinterpret_cast<DXGI_OUTDUPL_MOVE_RECT*>(metadata_.data());
   size_t move_rects_count = 0;
   _com_error error = duplication_->GetFrameMoveRects(
-      static_cast<UINT>(metadata.capacity()), move_rects, &buff_size);
+      static_cast<UINT>(metadata_.capacity()), move_rects, &buff_size);
   if (error.Error() != S_OK) {
     LOG(LS_ERROR) << "Failed to get move rectangles, error "
                   << error.ErrorMessage() << ", code " << error.Error();
     return false;
   }
   move_rects_count = buff_size / sizeof(DXGI_OUTDUPL_MOVE_RECT);
 
-  RECT* dirty_rects = reinterpret_cast<RECT*>(metadata.data() + buff_size);
+  RECT* dirty_rects = reinterpret_cast<RECT*>(metadata_.data() + buff_size);
   size_t dirty_rects_count = 0;
   error = duplication_->GetFrameDirtyRects(
-      static_cast<UINT>(metadata.capacity()) - buff_size, dirty_rects,
+      static_cast<UINT>(metadata_.capacity()) - buff_size, dirty_rects,
       &buff_size);
   if (error.Error() != S_OK) {
     LOG(LS_ERROR) << "Failed to get dirty rectangles, error "
                   << error.ErrorMessage() << ", code " << error.Error();
     return false;
   }
   dirty_rects_count = buff_size / sizeof(RECT);
 
   while (move_rects_count > 0) {
-    updated_region->AddRect(DesktopRect::MakeXYWH(
+    updated_region->AddRect(RotateRect(DesktopRect::MakeXYWH(
         move_rects->SourcePoint.x, move_rects->SourcePoint.y,
         move_rects->DestinationRect.right - move_rects->DestinationRect.left,
-        move_rects->DestinationRect.bottom - move_rects->DestinationRect.top));
-    updated_region->AddRect(DesktopRect::MakeLTRB(
+        move_rects->DestinationRect.bottom - move_rects->DestinationRect.top),
+        unrotated_size_, rotation_));
+    updated_region->AddRect(RotateRect(DesktopRect::MakeLTRB(
         move_rects->DestinationRect.left, move_rects->DestinationRect.top,
-        move_rects->DestinationRect.right, move_rects->DestinationRect.bottom));
+        move_rects->DestinationRect.right, move_rects->DestinationRect.bottom),
+        unrotated_size_, rotation_));
     move_rects++;
     move_rects_count--;
   }
 
   while (dirty_rects_count > 0) {
-    updated_region->AddRect(
+    updated_region->AddRect(RotateRect(
         DesktopRect::MakeLTRB(dirty_rects->left, dirty_rects->top,
-                              dirty_rects->right, dirty_rects->bottom));
+                              dirty_rects->right, dirty_rects->bottom),
+        unrotated_size_, rotation_));
     dirty_rects++;
     dirty_rects_count--;
   }
 
   return true;
 }
 
 void DxgiOutputDuplicator::Setup(Context* context) {
   RTC_DCHECK(context->updated_region.is_empty());
   // Always copy entire monitor during the first Duplicate() function call.
@@ skipping 11 matching lines @@
 
 void DxgiOutputDuplicator::SpreadContextChange(const Context* const source) {
   for (Context* dest : contexts_) {
     RTC_DCHECK(dest);
     if (dest != source) {
       dest->updated_region.AddRegion(source->updated_region);
     }
   }
 }
 
-DesktopRect DxgiOutputDuplicator::SourceRect(DesktopRect rect) {
-  // |texture_|->AsDesktopFrame() starts from (0, 0).
-  rect.Translate(-desktop_rect_.left(), -desktop_rect_.top());
-  return rect;
-}
-
 }  // namespace webrtc