DirectX based screen capturer logic

webrtc/modules/desktop_capture/desktop_frame.cc

 /*
  *  Copyright (c) 2013 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/desktop_frame.h"
 
-#include <assert.h>
+#include <utility>
+
 #include <string.h>
 
+#include "webrtc/base/checks.h"
+
 namespace webrtc {
 
 DesktopFrame::DesktopFrame(DesktopSize size,
                            int stride,
                            uint8_t* data,
                            SharedMemory* shared_memory)
-    : size_(size),
+    : data_(data),
+      shared_memory_(shared_memory),
+      size_(size),
       stride_(stride),
-      data_(data),
-      shared_memory_(shared_memory),
       capture_time_ms_(0) {
 }
 
 DesktopFrame::~DesktopFrame() {}
 
 void DesktopFrame::CopyPixelsFrom(uint8_t* src_buffer, int src_stride,
                                   const DesktopRect& dest_rect) {
-  assert(DesktopRect::MakeSize(size()).ContainsRect(dest_rect));
+  RTC_CHECK(DesktopRect::MakeSize(size()).ContainsRect(dest_rect));
 
   uint8_t* dest = GetFrameDataAtPos(dest_rect.top_left());
   for (int y = 0; y < dest_rect.height(); ++y) {
     memcpy(dest, src_buffer, DesktopFrame::kBytesPerPixel * dest_rect.width());
     src_buffer += src_stride;
     dest += stride();
   }
 }
 
 void DesktopFrame::CopyPixelsFrom(const DesktopFrame& src_frame,
                                   const DesktopVector& src_pos,
                                   const DesktopRect& dest_rect) {
-  assert(DesktopRect::MakeSize(src_frame.size()).ContainsRect(
+  RTC_CHECK(DesktopRect::MakeSize(src_frame.size()).ContainsRect(
       DesktopRect::MakeOriginSize(src_pos, dest_rect.size())));
 
   CopyPixelsFrom(src_frame.GetFrameDataAtPos(src_pos),
                  src_frame.stride(), dest_rect);
 }
 
 uint8_t* DesktopFrame::GetFrameDataAtPos(const DesktopVector& pos) const {
   return data() + stride() * pos.y() + DesktopFrame::kBytesPerPixel * pos.x();
 }
 
@@ skipping 17 matching lines @@
   result->set_dpi(frame.dpi());
   result->set_capture_time_ms(frame.capture_time_ms());
   *result->mutable_updated_region() = frame.updated_region();
   return result;
 }
 
 // static
 std::unique_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(
     DesktopSize size,
     SharedMemoryFactory* shared_memory_factory) {
-  size_t buffer_size =
-      size.width() * size.height() * DesktopFrame::kBytesPerPixel;
-  std::unique_ptr<SharedMemory> shared_memory;
-  shared_memory = shared_memory_factory->CreateSharedMemory(buffer_size);
+  size_t buffer_size = size.height() * size.width() * kBytesPerPixel;
+  std::unique_ptr<SharedMemory> shared_memory = rtc::ScopedToUnique(

[Sergey Ulanov, 2016/05/13 19:38:10]

Don't need ScopedToUnique() anymore

[Hzj_jie, 2016/05/16 18:17:28]

Done.

+      shared_memory_factory->CreateSharedMemory(buffer_size));
   if (!shared_memory)
     return nullptr;
 
+  return Create(size, std::move(shared_memory));
+}
+
+// static
+std::unique_ptr<DesktopFrame> SharedMemoryDesktopFrame::Create(
+    DesktopSize size,
+    std::unique_ptr<SharedMemory> shared_memory) {
+  if (!shared_memory)

[Sergey Ulanov, 2016/05/13 19:38:10]

Don't need this - this function is not supposed to be called with null
shared_memory. DCHECK() would be more appropriate.

[Hzj_jie, 2016/05/16 18:17:28]

Done.

+    return nullptr;
+
+  int stride = size.width() * kBytesPerPixel;
   return std::unique_ptr<DesktopFrame>(new SharedMemoryDesktopFrame(
-      size, size.width() * DesktopFrame::kBytesPerPixel,
-      std::move(shared_memory)));
+      size, stride, shared_memory.release()));
 }
 
 SharedMemoryDesktopFrame::SharedMemoryDesktopFrame(DesktopSize size,
                                                    int stride,
                                                    SharedMemory* shared_memory)
     : DesktopFrame(size,
                    stride,
                    reinterpret_cast<uint8_t*>(shared_memory->data()),
                    shared_memory) {}
 
-SharedMemoryDesktopFrame::SharedMemoryDesktopFrame(
-    DesktopSize size,
-    int stride,
-    std::unique_ptr<SharedMemory> shared_memory)
-    : DesktopFrame(size,
-                   stride,
-                   reinterpret_cast<uint8_t*>(shared_memory->data()),
-                   shared_memory.release()) {}
-
 SharedMemoryDesktopFrame::~SharedMemoryDesktopFrame() {
   delete shared_memory_;
 }
 
 }  // namespace webrtc