Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Side by Side Diff: webrtc/modules/video_render/windows/video_render_direct3d9.cc

Issue 1413333002: system_wrappers: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased again! Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 // Own include file 11 // Own include file
12 #include "webrtc/modules/video_render/windows/video_render_direct3d9.h" 12 #include "webrtc/modules/video_render/windows/video_render_direct3d9.h"
13 13
14 // System include files 14 // System include files
15 #include <windows.h> 15 #include <windows.h>
16 16
17 // WebRtc include files 17 // WebRtc include files
18 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h" 18 #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
19 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h" 19 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
20 #include "webrtc/system_wrappers/interface/event_wrapper.h" 20 #include "webrtc/system_wrappers/include/event_wrapper.h"
21 #include "webrtc/system_wrappers/interface/trace.h" 21 #include "webrtc/system_wrappers/include/trace.h"
22 22
23 namespace webrtc { 23 namespace webrtc {
24 24
25 // A structure for our custom vertex type 25 // A structure for our custom vertex type
26 struct CUSTOMVERTEX 26 struct CUSTOMVERTEX
27 { 27 {
28 FLOAT x, y, z; 28 FLOAT x, y, z;
29 DWORD color; // The vertex color 29 DWORD color; // The vertex color
30 FLOAT u, v; 30 FLOAT u, v;
31 }; 31 };
(...skipping 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1157 "Direct3D render failed to find channel"); 1157 "Direct3D render failed to find channel");
1158 return -1; 1158 return -1;
1159 } 1159 }
1160 // Only allow one stream per channel, demuxing is 1160 // Only allow one stream per channel, demuxing is
1161 ddobj->SetStreamSettings(0, zOrder, left, top, right, bottom); 1161 ddobj->SetStreamSettings(0, zOrder, left, top, right, bottom);
1162 1162
1163 return 0; 1163 return 0;
1164 } 1164 }
1165 1165
1166 } // namespace webrtc 1166 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698