Index: webrtc/test/win/d3d_renderer.cc |
diff --git a/webrtc/test/win/d3d_renderer.cc b/webrtc/test/win/d3d_renderer.cc |
index 7c344ba0b3b0d165864e5d1c1c139884a06b4791..b942d31023a9571669f79c349276b448e884d9df 100644 |
--- a/webrtc/test/win/d3d_renderer.cc |
+++ b/webrtc/test/win/d3d_renderer.cc |
@@ -33,11 +33,11 @@ VideoRenderer* VideoRenderer::CreatePlatformRenderer(const char* window_title, |
D3dRenderer::D3dRenderer(size_t width, size_t height) |
: width_(width), |
height_(height), |
- hwnd_(NULL), |
- d3d_(NULL), |
- d3d_device_(NULL), |
- texture_(NULL), |
- vertex_buffer_(NULL) { |
+ hwnd_(nullptr), |
+ d3d_(nullptr), |
+ d3d_device_(nullptr), |
+ texture_(nullptr), |
+ vertex_buffer_(nullptr) { |
RTC_DCHECK_GT(width, 0); |
RTC_DCHECK_GT(height, 0); |
} |
@@ -55,38 +55,30 @@ LRESULT WINAPI D3dRenderer::WindowProc(HWND hwnd, UINT msg, WPARAM wparam, |
} |
void D3dRenderer::Destroy() { |
- texture_ = NULL; |
- vertex_buffer_ = NULL; |
- d3d_device_ = NULL; |
- d3d_ = NULL; |
+ texture_ = nullptr; |
+ vertex_buffer_ = nullptr; |
+ d3d_device_ = nullptr; |
+ d3d_ = nullptr; |
- if (hwnd_ != NULL) { |
+ if (hwnd_ != nullptr) { |
DestroyWindow(hwnd_); |
RTC_DCHECK(!IsWindow(hwnd_)); |
- hwnd_ = NULL; |
+ hwnd_ = nullptr; |
} |
} |
bool D3dRenderer::Init(const char* window_title) { |
- hwnd_ = CreateWindowA(kD3DClassName, |
- window_title, |
- WS_OVERLAPPEDWINDOW, |
- 0, |
- 0, |
- static_cast<int>(width_), |
- static_cast<int>(height_), |
- NULL, |
- NULL, |
- NULL, |
- NULL); |
- |
- if (hwnd_ == NULL) { |
+ hwnd_ = CreateWindowA(kD3DClassName, window_title, WS_OVERLAPPEDWINDOW, 0, 0, |
+ static_cast<int>(width_), static_cast<int>(height_), |
+ nullptr, nullptr, nullptr, nullptr); |
+ |
+ if (hwnd_ == nullptr) { |
Destroy(); |
return false; |
} |
d3d_ = Direct3DCreate9(D3D_SDK_VERSION); |
- if (d3d_ == NULL) { |
+ if (d3d_ == nullptr) { |
Destroy(); |
return false; |
} |
@@ -112,11 +104,8 @@ bool D3dRenderer::Init(const char* window_title) { |
IDirect3DVertexBuffer9* vertex_buffer; |
const int kRectVertices = 4; |
if (d3d_device_->CreateVertexBuffer(kRectVertices * sizeof(D3dCustomVertex), |
- 0, |
- D3DFVF_CUSTOMVERTEX, |
- D3DPOOL_MANAGED, |
- &vertex_buffer, |
- NULL) != D3D_OK) { |
+ 0, D3DFVF_CUSTOMVERTEX, D3DPOOL_MANAGED, |
+ &vertex_buffer, nullptr) != D3D_OK) { |
Destroy(); |
return false; |
} |
@@ -128,7 +117,7 @@ bool D3dRenderer::Init(const char* window_title) { |
Resize(width_, height_); |
ShowWindow(hwnd_, SW_SHOWNOACTIVATE); |
- d3d_device_->Present(NULL, NULL, NULL, NULL); |
+ d3d_device_->Present(nullptr, nullptr, nullptr, nullptr); |
return true; |
} |
@@ -142,7 +131,7 @@ D3dRenderer* D3dRenderer::Create(const char* window_title, |
wc.style = CS_HREDRAW | CS_VREDRAW; |
wc.lpfnWndProc = WindowProc; |
- wc.hCursor = LoadCursor(NULL, IDC_ARROW); |
+ wc.hCursor = LoadCursor(nullptr, IDC_ARROW); |
wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOW); |
wc.lpszClassName = kD3DClassName; |
@@ -154,7 +143,7 @@ D3dRenderer* D3dRenderer::Create(const char* window_title, |
D3dRenderer* d3d_renderer = new D3dRenderer(width, height); |
if (!d3d_renderer->Init(window_title)) { |
delete d3d_renderer; |
- return NULL; |
+ return nullptr; |
} |
return d3d_renderer; |
@@ -166,13 +155,8 @@ void D3dRenderer::Resize(size_t width, size_t height) { |
IDirect3DTexture9* texture; |
d3d_device_->CreateTexture(static_cast<UINT>(width_), |
- static_cast<UINT>(height_), |
- 1, |
- 0, |
- D3DFMT_A8R8G8B8, |
- D3DPOOL_MANAGED, |
- &texture, |
- NULL); |
+ static_cast<UINT>(height_), 1, 0, D3DFMT_A8R8G8B8, |
+ D3DPOOL_MANAGED, &texture, nullptr); |
texture_ = texture; |
texture->Release(); |
@@ -200,7 +184,7 @@ void D3dRenderer::OnFrame(const webrtc::VideoFrame& frame) { |
} |
D3DLOCKED_RECT lock_rect; |
- if (texture_->LockRect(0, &lock_rect, NULL, 0) != D3D_OK) |
+ if (texture_->LockRect(0, &lock_rect, nullptr, 0) != D3D_OK) |
return; |
ConvertFromI420(frame, kARGB, 0, static_cast<uint8_t*>(lock_rect.pBits)); |
@@ -213,7 +197,7 @@ void D3dRenderer::OnFrame(const webrtc::VideoFrame& frame) { |
d3d_device_->DrawPrimitive(D3DPT_TRIANGLESTRIP, 0, 2); |
d3d_device_->EndScene(); |
- d3d_device_->Present(NULL, NULL, NULL, NULL); |
+ d3d_device_->Present(nullptr, nullptr, nullptr, nullptr); |
} |
} // namespace test |
} // namespace webrtc |