OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include "webrtc/modules/desktop_capture/desktop_frame_win.h" | 11 #include "webrtc/modules/desktop_capture/desktop_frame_win.h" |
12 | 12 |
13 #include <utility> | 13 #include <utility> |
14 | 14 |
15 #include "webrtc/system_wrappers/include/logging.h" | 15 #include "webrtc/system_wrappers/include/logging.h" |
16 | 16 |
17 namespace webrtc { | 17 namespace webrtc { |
18 | 18 |
19 DesktopFrameWin::DesktopFrameWin(DesktopSize size, | 19 DesktopFrameWin::DesktopFrameWin(DesktopSize size, |
20 int stride, | 20 int stride, |
21 uint8_t* data, | 21 uint8_t* data, |
22 rtc::scoped_ptr<SharedMemory> shared_memory, | 22 std::unique_ptr<SharedMemory> shared_memory, |
23 HBITMAP bitmap) | 23 HBITMAP bitmap) |
24 : DesktopFrame(size, stride, data, shared_memory.get()), | 24 : DesktopFrame(size, stride, data, shared_memory.get()), |
25 bitmap_(bitmap), | 25 bitmap_(bitmap), |
26 owned_shared_memory_(std::move(shared_memory)) {} | 26 owned_shared_memory_(std::move(shared_memory)) {} |
27 | 27 |
28 DesktopFrameWin::~DesktopFrameWin() { | 28 DesktopFrameWin::~DesktopFrameWin() { |
29 DeleteObject(bitmap_); | 29 DeleteObject(bitmap_); |
30 } | 30 } |
31 | 31 |
32 // static | 32 // static |
33 DesktopFrameWin* DesktopFrameWin::Create( | 33 DesktopFrameWin* DesktopFrameWin::Create( |
34 DesktopSize size, | 34 DesktopSize size, |
35 SharedMemoryFactory* shared_memory_factory, | 35 SharedMemoryFactory* shared_memory_factory, |
36 HDC hdc) { | 36 HDC hdc) { |
37 int bytes_per_row = size.width() * kBytesPerPixel; | 37 int bytes_per_row = size.width() * kBytesPerPixel; |
38 int buffer_size = bytes_per_row * size.height(); | 38 int buffer_size = bytes_per_row * size.height(); |
39 | 39 |
40 // Describe a device independent bitmap (DIB) that is the size of the desktop. | 40 // Describe a device independent bitmap (DIB) that is the size of the desktop. |
41 BITMAPINFO bmi = {}; | 41 BITMAPINFO bmi = {}; |
42 bmi.bmiHeader.biHeight = -size.height(); | 42 bmi.bmiHeader.biHeight = -size.height(); |
43 bmi.bmiHeader.biWidth = size.width(); | 43 bmi.bmiHeader.biWidth = size.width(); |
44 bmi.bmiHeader.biPlanes = 1; | 44 bmi.bmiHeader.biPlanes = 1; |
45 bmi.bmiHeader.biBitCount = DesktopFrameWin::kBytesPerPixel * 8; | 45 bmi.bmiHeader.biBitCount = DesktopFrameWin::kBytesPerPixel * 8; |
46 bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); | 46 bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader); |
47 bmi.bmiHeader.biSizeImage = bytes_per_row * size.height(); | 47 bmi.bmiHeader.biSizeImage = bytes_per_row * size.height(); |
48 | 48 |
49 rtc::scoped_ptr<SharedMemory> shared_memory; | 49 std::unique_ptr<SharedMemory> shared_memory; |
50 HANDLE section_handle = nullptr; | 50 HANDLE section_handle = nullptr; |
51 if (shared_memory_factory) { | 51 if (shared_memory_factory) { |
52 shared_memory = shared_memory_factory->CreateSharedMemory(buffer_size); | 52 shared_memory = rtc::ScopedToUnique( |
| 53 shared_memory_factory->CreateSharedMemory(buffer_size)); |
53 if (shared_memory) | 54 if (shared_memory) |
54 section_handle = shared_memory->handle(); | 55 section_handle = shared_memory->handle(); |
55 } | 56 } |
56 void* data = nullptr; | 57 void* data = nullptr; |
57 HBITMAP bitmap = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &data, | 58 HBITMAP bitmap = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &data, |
58 section_handle, 0); | 59 section_handle, 0); |
59 if (!bitmap) { | 60 if (!bitmap) { |
60 LOG(LS_WARNING) << "Failed to allocate new window frame " << GetLastError(); | 61 LOG(LS_WARNING) << "Failed to allocate new window frame " << GetLastError(); |
61 return nullptr; | 62 return nullptr; |
62 } | 63 } |
63 | 64 |
64 return new DesktopFrameWin(size, bytes_per_row, | 65 return new DesktopFrameWin(size, bytes_per_row, |
65 reinterpret_cast<uint8_t*>(data), | 66 reinterpret_cast<uint8_t*>(data), |
66 std::move(shared_memory), bitmap); | 67 std::move(shared_memory), bitmap); |
67 } | 68 } |
68 | 69 |
69 } // namespace webrtc | 70 } // namespace webrtc |
OLD | NEW |